721b2a2 · typeable/wai

git.iko.soy/typeable/wai

Added vault to wai

commit721b2a283e65f4d4a80df18a1deeaf99a02af06c authorMichael Snoyman <michael@snoyman.com> dateTue 27 Dec 2011, 14:36 (15 years ago) parent63fac2b

6 files changed+13−2

compare with master

unifiedsplit

wai-app-static/test/WaiAppStaticTest.hs+3 wai-extra/Network/Wai/Handler/CGI.hs+2−1 wai-test/Network/Wai/Test.hs+2 wai/Network/Wai.hs+3 wai/wai.cabal+1 warp/Network/Wai/Handler/Warp.hs+2−1

wai-app-static/test/WaiAppStaticTest.hs+3

@@ -24,6 +24,7 @@ import Network.Wai.Test

2424import Network.Socket.Internal as Sock

2525import qualified Network.HTTP.Types as H

2626import Control.Monad.IO.Class (liftIO)

27+import Data.Monoid (mempty)

2728

2829defRequest :: Request

2930defRequest = Request {

@@ -38,6 +39,8 @@ defRequest = Request {

3839, serverPort = 80

3940, isSecure = False

4041, remoteHost = Sock.SockAddrInet 1 2

42+, vault = mempty

43+, requestBody = error "requestBody"

4144}

4245

4346setRawPathInfo :: Request -> S8.ByteString -> Request

wai-extra/Network/Wai/Handler/CGI.hs+2−1

@@ -19,7 +19,7 @@ import Control.Arrow ((***))

1919import Data.Char (toLower)

2020import qualified System.IO

2121import qualified Data.String as String

22−import Data.Monoid (mconcat)

22+import Data.Monoid (mconcat, mempty)

2323import Blaze.ByteString.Builder (fromByteString, toLazyByteString)

2424import Blaze.ByteString.Builder.Char8 (fromChar, fromString)

2525import Data.Conduit.Blaze (builderToByteString)

@@ -109,6 +109,7 @@ runGeneric vars inputH outputH xsendfile app = do

109109 , remoteHost = addr

110110 , httpVersion = H.http11 -- FIXME

111111 , requestBody = input

112+ , vault = mempty

112113 }

113114 -- FIXME worry about exception?

114115 res <- app env

wai-test/Network/Wai/Test.hs+2

@@ -34,6 +34,7 @@ import Data.CaseInsensitive (CI)

3434import qualified Data.ByteString as S

3535import qualified Data.Conduit as C

3636import qualified Data.Conduit.List as CL

37+import Data.Monoid (mempty)

3738

3839type Session = ReaderT Application (StateT ClientState IO)

3940

@@ -74,6 +75,7 @@ defaultRequest = Request

7475 , pathInfo = []

7576 , queryString = []

7677 , requestBody = error "requestBody of defaultRequest"

78+ , vault = mempty

7779 }

7880

7981srequest :: SRequest -> Session SResponse

wai/Network/Wai.hs+3

@@ -60,6 +60,7 @@ import qualified Network.HTTP.Types as H

6060import Data.Text (Text)

6161import Data.ByteString.Lazy.Char8 () -- makes it easier to use responseLBS

6262import Blaze.ByteString.Builder (fromByteString)

63+import Data.Vault (Vault)

6364

6465-- | Information on the request sent by the client. This abstracts away the

6566-- details of the underlying implementation.

@@ -95,6 +96,8 @@ data Request = Request

9596 -- | Parsed query string information

9697 , queryString :: H.Query

9798 , requestBody :: C.BufferedSource IO B.ByteString

99+ -- | A location for arbitrary data to be shared by applications and middleware.

100+ , vault :: Vault

98101 }

99102 deriving (Typeable)

100103

wai/wai.cabal+1

@@ -25,5 +25,6 @@ Library

2525 , http-types >= 0.6 && < 0.7

2626 , text >= 0.7 && < 0.12

2727 , transformers >= 0.2.2 && < 0.3

28+ , vault >= 0.1 && < 0.2

2829 Exposed-modules: Network.Wai

2930 ghc-options: -Wall

warp/Network/Wai/Handler/Warp.hs+2−1

@@ -96,7 +96,7 @@ import Blaze.ByteString.Builder.HTTP

9696import Blaze.ByteString.Builder

9797 (copyByteString, Builder, toLazyByteString, toByteStringIO)

9898import Blaze.ByteString.Builder.Char8 (fromChar, fromShow)

99−import Data.Monoid (mappend)

99+import Data.Monoid (mappend, mempty)

100100import Network.Sendfile

101101

102102import qualified System.PosixCompat.Files as P

@@ -285,6 +285,7 @@ parseRequest' port (firstLine:otherLines) remoteHost' src = do

285285 , isSecure = False

286286 , remoteHost = remoteHost'

287287 , requestBody = rbody

288+ , vault = mempty

288289 }

289290

290291