webcrank-wai 0.1 → 0.2

raw patch · 2 files changed

+28/−23 lines, 2 filesdep ~bytestringdep ~exceptionsdep ~lensPVP ok

version bump matches the API change (PVP)

Dependency ranges changed: bytestring, exceptions, lens, mtl, unix-compat, unordered-containers, wai, wai-lens, webcrank, webcrank-dispatch

API changes (from Hackage documentation)

Files

• src/Webcrank/Wai.hs +16/−11
• webcrank-wai.cabal +12/−12

@@ -22,11 +22,13 @@ import Control.Lens import Control.Monad.Catch import Control.Monad.RWS-import qualified Data.ByteString.Lazy as LBS+import Data.ByteString (ByteString)+import qualified Data.ByteString as B+import qualified Data.ByteString.Lazy as LB import qualified Data.HashMap.Strict as HashMap import Data.Maybe import Data.Traversable-import Network.Wai hiding (pathInfo, requestHeaders)+import Network.Wai hiding (rawPathInfo, pathInfo, requestHeaders) import Network.Wai.Lens import System.PosixCompat.Time @@ -79,18 +81,20 @@ dispatch   :: (Applicative m, MonadIO m, MonadCatch m)   => (forall a. m a -> IO a) -- ^ run+  -> ByteString -- ^ base uri   -> Dispatcher (WaiResource m)   -> Application-dispatch f d rq = f . dispatch' d rq+dispatch f u d rq = f . dispatch' d u rq  dispatch'   :: (Applicative m, MonadIO m, MonadCatch m)   => Dispatcher (WaiResource m)+  -> ByteString -- ^ base uri   -> Request   -> (Response -> IO ResponseReceived)   -> m ResponseReceived-dispatch' d rq respond = maybe (sendNotFound respond) run disp where-  run r = handleRequest r rq respond+dispatch' d u rq respond = maybe (sendNotFound respond) run disp where+  run r = handleRequest r u rq respond   disp = W.dispatch d (rq ^. pathInfo)  sendNotFound@@ -110,24 +114,25 @@ handleRequest   :: (Applicative m, MonadCatch m, MonadIO m)   => WaiResource m+  -> ByteString -- ^ base uri   -> Request   -> (Response -> IO ResponseReceived)   -> m ResponseReceived-handleRequest r rq respond = do+handleRequest r u rq respond = do   now <- liftIO epochTime-  let rd = WaiData (newResourceData api r) rq (epochTimeToHTTPDate now)+  let rd = WaiData (newResourceData (api u) r) rq (epochTimeToHTTPDate now)   res <- API.handleRequest (flip runWaiCrankT rd)   liftIO $ respond $ waiRes res  waiRes :: (Status, HeadersMap, Maybe Body) -> Response-waiRes (s, hs, b) = responseLBS s (hdrs hs) (fromMaybe LBS.empty b) where+waiRes (s, hs, b) = responseLBS s (hdrs hs) (fromMaybe LB.empty b) where   hdrs = join . fmap sequenceA . HashMap.toList -api :: (Applicative m, Monad m) => WaiServerAPI m-api = ServerAPI+api :: (Applicative m, Monad m) => ByteString -> WaiServerAPI m+api baseUri = ServerAPI   { srvGetRequestMethod = requestMethod <$> view request   , srvGetRequestHeader = \h ->       preview (request . headers . value h)-  , srvGetRequestURI = undefined+  , srvGetRequestURI = view $ request . rawPathInfo . to (B.takeWhile (/= 63) . (baseUri <>))   , srvGetRequestTime = view requestDate   }

@@ -1,5 +1,5 @@ name:               webcrank-wai-version:            0.1+version:            0.2 license:            BSD3 license-file:       LICENSE author:             Richard Wallace <rwallace@thewallacepack.net>@@ -38,15 +38,15 @@    ghc-options:      -Wall -  build-depends:    base                            >= 4.6 && < 5-                  , bytestring-                  , exceptions-                  , lens-                  , mtl-                  , unix-compat-                  , unordered-containers-                  , wai-                  , wai-lens-                  , webcrank-                  , webcrank-dispatch+  build-depends:    base                            >=4.6 && < 5+                  , bytestring                      >=0.9.1.10 && <0.11+                  , exceptions                      >=0.1.1 && <1+                  , lens                            >=4.5 && <5+                  , mtl                             >=2.0.1 && <2.3+                  , unix-compat                     >=0.2+                  , unordered-containers            ==0.2.*+                  , wai                             >=3.0 && <4+                  , wai-lens                        >=0.1+                  , webcrank                        >=0.1+                  , webcrank-dispatch               >=0.1