wai-middleware-content-type 0.5.1 → 0.5.2

raw patch · 5 files changed

+6/−10 lines, 5 filesdep ~pandoc

Dependency ranges changed: pandoc

Files

• src/Network/Wai/Middleware/ContentType.hs +0/−3
• src/Network/Wai/Middleware/ContentType/ByteString.hs +0/−1
• src/Network/Wai/Middleware/ContentType/Pandoc.hs +3/−2
• src/Network/Wai/Middleware/ContentType/Types.hs +1/−2
• wai-middleware-content-type.cabal +2/−2

@@ -48,12 +48,9 @@                          pathInfo) import Network.Wai.Logger (withStdoutLogger) import qualified Data.HashMap.Lazy as HM-import qualified Data.HashSet  as HS import Data.Monoid-import Control.Monad import Control.Monad.Trans.Control.Aligned (MonadBaseControl (..)) import Data.Singleton.Class (Extractable (..))-import Debug.Trace (traceShow)   

@@ -6,7 +6,6 @@  import qualified Data.ByteString.Lazy                    as LBS import qualified Data.HashMap.Lazy                       as HM-import           Control.Monad.Reader (ask) import           Control.Monad.IO.Class (MonadIO (..))  

@@ -34,5 +34,6 @@ -- * Data Only  markdownOnly :: P.Pandoc -> Status -> ResponseHeaders -> Response-markdownOnly p =-  textOnly (LT.pack $ P.writeMarkdown P.def p)+markdownOnly p = case P.runPure (P.writeMarkdown P.def p) of+  Left e -> error (show e)+  Right x -> textOnly (LT.fromStrict x)

@@ -63,13 +63,11 @@ import           Control.Monad.Writer hiding (tell) import           Control.Monad.Reader import           Control.Monad.Logger-import           Control.Monad.Morph  import           GHC.Generics import           Network.HTTP.Types (Status, ResponseHeaders) import           Network.HTTP.Media (mapAccept) import           Network.Wai.Trans (Response)-import           Network.Wai.Logger (ApacheLogger)   -- | Version of 'Control.Monad.Writer.tell' for 'Control.Monad.State.StateT'@@ -180,6 +178,7 @@  instance MonadReader r m => MonadReader r (FileExtListenerT m) where   ask = FileExtListenerT $ ReaderT $ \_ -> ask+  local f (FileExtListenerT (ReaderT g)) = FileExtListenerT $ ReaderT $ \x -> local f (g x)  instance Monad m => Monoid (FileExtListenerT m ()) where   mempty = FileExtListenerT $ put mempty

@@ -1,5 +1,5 @@ Name:                   wai-middleware-content-type-Version:                0.5.1+Version:                0.5.2 Author:                 Athan Clark <athan.clark@gmail.com> Maintainer:             Athan Clark <athan.clark@gmail.com> License:                BSD3@@ -49,7 +49,7 @@                       , monad-control-aligned                       , monad-logger                       , mtl-                      , pandoc+                      , pandoc >= 2.0                       , resourcet                       , shakespeare                       , text