web-routes-wai 0.22.3 → 0.23.0

raw patch · 2 files changed

+8/−9 lines, 2 filesdep ~textdep ~wai

Dependency ranges changed: text, wai

Files

• Web/Routes/Wai.hs +5/−6
• web-routes-wai.cabal +3/−3

@@ -45,7 +45,7 @@  -- | function to convert a routing function into an Application by -- leveraging 'PathInfo' to do the url conversion-handleWai :: (PathInfo url) => +handleWai :: (PathInfo url) =>              S.ByteString -- ^ approot           -> ((url -> [(Text, Maybe Text)] -> Text) -> url -> Application) -- ^ routing function           -> Application@@ -57,16 +57,15 @@ handleWaiRouteT_ :: (url -> [(Text, Maybe Text)] -> Text) -- ^ function to convert a 'url' + params into path info + query string                  -> (S.ByteString -> Either String url)         -- ^ function to parse path info into 'url'                  -> S.ByteString                                -- ^ app root-                 -> (url -> Request -> RouteT url (ResourceT IO) Response) -- ^ routing function+                 -> (url -> Request -> RouteT url IO Response) -- ^ routing function                  -> Application handleWaiRouteT_  toPathInfo fromPathInfo approot handler =    handleWai_ toPathInfo fromPathInfo approot (\toPathInfo' url request -> unRouteT (handler url request) toPathInfo') - -- | convert a 'RouteT' based routing function into an 'Application' using 'PathInfo' to do the url conversion-handleWaiRouteT :: (PathInfo url) => +handleWaiRouteT :: (PathInfo url) =>                    S.ByteString  -- ^ app root-                -> (url -> Request -> RouteT url (ResourceT IO) Response) -- ^ routing function+                -> (url -> Request -> RouteT url IO Response) -- ^ routing function                 -> Application handleWaiRouteT approot handler = handleWaiRouteT_ toPathInfoParams fromPathInfo approot handler @@ -74,7 +73,7 @@ waiSite :: Site url Application -- ^ Site         -> S.ByteString               -- ^ approot, e.g. http://www.example.org/app         -> Application-waiSite site approot = handleWai_ formatURL (parsePathSegments site . decodePathInfo) approot (handleSite site) +waiSite site approot = handleWai_ formatURL (parsePathSegments site . decodePathInfo) approot (handleSite site)     where       formatURL url params =           let (paths, moreParams) = formatPathSegments site url

@@ -1,5 +1,5 @@ Name:             web-routes-wai-Version:          0.22.3+Version:          0.23.0 License:          BSD3 License-File:     LICENSE Author:           jeremy@seereason.com@@ -17,8 +17,8 @@                           conduit     >= 0.2 && < 1.1,                           http-types  >= 0.6 && < 0.9,                           resourcet   == 0.4.*,-                          text        == 0.11.*,-                          wai         >= 1.1 && < 1.5,+                          text        >= 0.11 && < 1.1,+                          wai         >= 2.0 && < 2.1,                           web-routes  == 0.27.*         Exposed-Modules:  Web.Routes.Wai