89b673a · typeable/wai

git.iko.soy/typeable/wai

on master help sign in

Removed debug middleware

89b673aMichael Snoyman15 years ago

wai-extra/Network/Wai/Middleware/Debug.hsdeleted−17

compare with master

unifiedsplit

@@ -1,17 +0,0 @@

1−module Network.Wai.Middleware.Debug

2− {-# DEPRECATED "functionality has been moved to the better named Network.Wai.Middleware.RequestLogger. Network.Wai.Middleware.Debug will be removed." #-}

3− ( debug

4− , debugHandle

5− ) where

6−

7−import Network.Wai.Middleware.RequestLogger (logStdoutDevLT, logHandleDevLT)

8−import Network.Wai (Middleware)

9−import qualified Data.Text.Lazy as LT

10−

11−-- | Deprecated. Use module Network.Wai.Middleware.RequestLogger

12−debug :: Middleware

13−debug = logStdoutDevLT

14−

15−-- | Deprecated. Use module Network.Wai.Middleware.RequestLogger

16−debugHandle :: (LT.Text -> IO ()) -> Middleware

17−debugHandle = logHandleDevLT

wai-extra/test/WaiExtraTest.hs+10−5

@@ -13,6 +13,7 @@ import qualified Data.ByteString.Char8 as S8

13import qualified Data.ByteString.Lazy.Char8 as L8

14import qualified Data.ByteString.Lazy as L

15import qualified Data.Text.Lazy as T

16+import qualified Data.Text.Encoding as TE

16import Control.Arrow

17import Control.Arrow

18import Network.Wai.Middleware.Jsonp

19import Network.Wai.Middleware.Jsonp

@@ -21,7 +22,7 @@ import Network.Wai.Middleware.Vhost

21import Network.Wai.Middleware.Autohead

22import Network.Wai.Middleware.Autohead

22import Network.Wai.Middleware.MethodOverride

23import Network.Wai.Middleware.MethodOverride

23import Network.Wai.Middleware.AcceptOverride

24import Network.Wai.Middleware.AcceptOverride

24−import Network.Wai.Middleware.Debug (debugHandle)

25+import Network.Wai.Middleware.RequestLogger (logHandle)

25import Codec.Compression.GZip (decompress)

26import Codec.Compression.GZip (decompress)

27import qualified Data.Conduit as C

28import qualified Data.Conduit as C

@@ -169,7 +170,7 @@ toRequest :: S8.ByteString -> S8.ByteString -> SRequest

169toRequest ctype content = SRequest defaultRequest

170toRequest ctype content = SRequest defaultRequest

170 { requestHeaders = [("Content-Type", ctype)]

171 { requestHeaders = [("Content-Type", ctype)]

171 , requestMethod = "POST"

172 , requestMethod = "POST"

172− , rawPathInfo = ""

173+ , rawPathInfo = "/"

173 , rawQueryString = ""

174 , rawQueryString = ""

174 , queryString = []

175 , queryString = []

175 } (L.fromChunks [content])

176 } (L.fromChunks [content])

@@ -423,10 +424,14 @@ caseDebugRequestBody = do

423 }

424 }

424 where

425 where

425 params = [("foo", "bar"), ("baz", "bin")]

426 params = [("foo", "bar"), ("baz", "bin")]

426− postOutput = T.pack $ "POST \nAccept: \nPOST " ++ (show params)

427+ -- FIXME change back once we include post parameter output in logging postOutput = T.pack $ "POST \nAccept: \nPOST " ++ (show params)

428+ postOutput = T.pack $ "POST / Accept: "

427− getOutput _qs = T.pack $ "GET /location" ++ "\nAccept: \nGET " ++ (show params) -- \nAccept: \n" ++ (show params)

429+ -- FIXME getOutput _qs = T.pack $ "GET /location" ++ "\nAccept: \nGET " ++ (show params) -- \nAccept: \n" ++ (show params)

430+ getOutput _qs = T.pack $ "GET /location?foo=bar&baz=bin Accept: "

428

431

429− debugApp output = debugHandle (\t -> liftIO $ assertEqual "debug" output t) $ \_req -> do

432+ debugApp output' = logHandle (\t -> liftIO $ assertEqual "debug" output t) $ \_req -> do

430 return $ responseLBS status200 [ ] ""

433 return $ responseLBS status200 [ ] ""

434+ where

435+ output = TE.encodeUtf8 $ T.toStrict output'

431 {-debugApp = debug $ \req -> do-}

436 {-debugApp = debug $ \req -> do-}

432 {-return $ responseLBS status200 [ ] ""-}

437 {-return $ responseLBS status200 [ ] ""-}

wai-extra/wai-extra.cabal−1

@@ -43,7 +43,6 @@ Library

43 Network.Wai.Middleware.AcceptOverride

44 Network.Wai.Middleware.Autohead

45 Network.Wai.Middleware.CleanPath

46− Network.Wai.Middleware.Debug

47 Network.Wai.Middleware.RequestLogger

46 Network.Wai.Middleware.RequestLogger

48 Network.Wai.Middleware.Gzip

47 Network.Wai.Middleware.Gzip

49 Network.Wai.Middleware.Jsonp

48 Network.Wai.Middleware.Jsonp