wai-extra 2.0.3.3 → 2.1.0

raw patch · 6 files changed

+14/−37 lines, 6 filesdep ~fast-loggerdep ~resourcetdep ~wai

Dependency ranges changed: fast-logger, resourcet, wai

Files

• Network/Wai/Middleware/Autohead.hs +5/−4
• Network/Wai/Middleware/RequestLogger.hs +1/−2
• Network/Wai/Middleware/RequestLogger/Internal.hs +0/−22
• Network/Wai/Parse.hs +1/−1
• test/WaiExtraTest.hs +3/−4
• wai-extra.cabal +4/−4

@@ -11,9 +11,10 @@ autohead app req     | requestMethod req == "HEAD" = do         res <- app req { requestMethod = "GET" }-        case res of-            ResponseFile s hs _ _ -> return $ ResponseBuilder s hs mempty-            ResponseBuilder s hs _ -> return $ ResponseBuilder s hs mempty-            ResponseSource s hs _ -> return $ ResponseBuilder s hs mempty+        let go (ResponseFile s hs _ _) = ResponseBuilder s hs mempty+            go (ResponseBuilder s hs _) = ResponseBuilder s hs mempty+            go (ResponseSource s hs _) = ResponseBuilder s hs mempty+            go (ResponseRaw raw r) = ResponseRaw raw (go r)+        return (go res)     | otherwise = app req 

@@ -28,7 +28,6 @@ import System.Log.FastLogger import Network.HTTP.Types as H import Data.Maybe (fromMaybe)-import Control.Monad.Trans.Resource (withInternalState) import Data.Monoid (mconcat)  import Network.Wai.Parse (sinkRequestBody, lbsBackEnd, fileName, Param, File, getRequestBodyType)@@ -234,7 +233,7 @@     liftIO $ cb $ mconcat $ map toLogStr $ addColor (requestMethod req) ++         [ " "         , rawPathInfo req-        , " | "+        , " :: "         , accept         , paramsToBS  "GET " getParams         , paramsToBS "POST " postParams

@@ -4,7 +4,6 @@ -- https://github.com/yesodweb/wai/issues/192 module Network.Wai.Middleware.RequestLogger.Internal     ( module Network.Wai.Middleware.RequestLogger.Internal-    , logToByteString     ) where  import Data.ByteString (ByteString)@@ -12,31 +11,10 @@ import Control.Concurrent (forkIO, threadDelay) import Control.Monad (forever) -#if MIN_VERSION_fast_logger(2, 1, 0) import System.Log.FastLogger (LogStr, fromLogStr)  logToByteString :: LogStr -> ByteString logToByteString = fromLogStr--#else--import System.Log.FastLogger (LogStr, logStrBuilder)--#if MIN_VERSION_bytestring(0, 10, 2)-import Data.ByteString.Builder (toLazyByteString, Builder)-import qualified Data.ByteString.Lazy as L--toByteString :: Builder -> ByteString-toByteString = L.toStrict . toLazyByteString--#else-import Blaze.ByteString.Builder (toByteString)-#endif--logToByteString :: LogStr -> ByteString-logToByteString = toByteString . logStrBuilder--#endif  getDateGetter :: IO () -- ^ flusher               -> IO (IO ByteString)

@@ -51,7 +51,7 @@ import Data.Either (partitionEithers) import Control.Monad (when, unless) import Control.Monad.Trans.Class (lift)-import Control.Monad.Trans.Resource (allocate, release, register, InternalState, withInternalState, runInternalState)+import Control.Monad.Trans.Resource (allocate, release, register, InternalState, runInternalState) import Data.Conduit.Internal (Pipe (NeedInput, HaveOutput), (>+>), withUpstream, injectLeftovers, ConduitM (..)) import Data.Void (Void) 

@@ -4,7 +4,6 @@ import Test.Hspec import Test.HUnit hiding (Test) import Data.Monoid (mappend, mempty)-import Blaze.ByteString.Builder (toByteString)  import Network.Wai import Network.Wai.Test@@ -19,7 +18,7 @@ import qualified Data.Text.Encoding as TE import Control.Arrow import Control.Applicative-import Control.Monad.Trans.Resource (getInternalState, withInternalState, runResourceT)+import Control.Monad.Trans.Resource (withInternalState, runResourceT)  import Network.Wai.Middleware.Jsonp import Network.Wai.Middleware.Gzip@@ -546,8 +545,8 @@   where     params = [("foo", "bar"), ("baz", "bin")]     -- FIXME change back once we include post parameter output in logging postOutput = T.pack $ "POST \nAccept: \nPOST " ++ (show params)-    postOutput = T.pack $ "POST / | \nStatus: 200 OK. /\n"-    getOutput params' = T.pack $ "GET /location | \nGET " ++ show params' ++ "\nStatus: 200 OK. /location\n"+    postOutput = T.pack $ "POST / :: \nStatus: 200 OK. /\n"+    getOutput params' = T.pack $ "GET /location :: \nGET " ++ show params' ++ "\nStatus: 200 OK. /location\n"      debugApp output' req = do         iactual <- liftIO $ I.newIORef mempty

@@ -1,5 +1,5 @@ Name:                wai-extra-Version:             2.0.3.3+Version:             2.1.0 Synopsis:            Provides some basic WAI handlers and middleware. Description:         The goal here is to provide common features without many dependencies. License:             MIT@@ -22,7 +22,7 @@ Library   Build-Depends:     base                      >= 4 && < 5                    , bytestring                >= 0.9.1.4-                   , wai                       >= 2.0      && < 2.1+                   , wai                       >= 2.1      && < 2.2                    , old-locale                >= 1.0.0.2  && < 1.1                    , time                      >= 1.1.4                    , network                   >= 2.2.1.5@@ -33,13 +33,13 @@                    , text                      >= 0.7                    , case-insensitive          >= 0.2                    , data-default-                   , fast-logger               >= 2.0      && < 2.2+                   , fast-logger               >= 2.1      && < 2.2                    , wai-logger                >= 2.0      && < 2.2                    , conduit                   >= 1.0      && < 1.1                    , zlib-conduit              >= 0.5      && < 1.1                    , blaze-builder-conduit     >= 0.5      && < 1.1                    , ansi-terminal-                   , resourcet                 >= 0.3      && < 0.5+                   , resourcet                 >= 0.4.6    && < 0.5                    , void                      >= 0.5                    , stringsearch              >= 0.3      && < 0.4                    , containers