diff --git a/README.md b/README.md --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Wai Routes (wai-routes-0.4.0) +Wai Routes (wai-routes-0.4.1) ============================== [![Build Status](https://travis-ci.org/ajnsit/wai-routes.png)](https://travis-ci.org/ajnsit/wai-routes) @@ -81,5 +81,5 @@ * 0.3.3 : Better exports from the Network.Wai.Middleware.Routes module * 0.3.4 : Added 'liftResourceT' to lift a ResourceT into HandlerM * 0.4.0 : Wai 2 compatibility. Replaced 'liftResourceT' with 'lift' - +* 0.4.1 : showRoute now returns "/" instead of "" diff --git a/src/Network/Wai/Middleware/Routes/Routes.hs b/src/Network/Wai/Middleware/Routes/Routes.hs --- a/src/Network/Wai/Middleware/Routes/Routes.hs +++ b/src/Network/Wai/Middleware/Routes/Routes.hs @@ -147,6 +147,8 @@ showRoute = uncurry encodePathInfo . second (map $ second Just) . renderRoute where encodePathInfo :: [Text] -> [(Text, Maybe Text)] -> Text + -- Slightly hackish: Convert "" into "/" + encodePathInfo [] = encodePathInfo [""] encodePathInfo segments = decodeUtf8 . toByteString . encodePath segments . queryTextToQuery -- | Read a route from Text diff --git a/wai-routes.cabal b/wai-routes.cabal --- a/wai-routes.cabal +++ b/wai-routes.cabal @@ -1,85 +1,88 @@ -Name: wai-routes -Version: 0.4.0 -Synopsis: Typesafe URLs for Wai applications. -Homepage: https://github.com/ajnsit/wai-routes -License: MIT -License-file: LICENSE -Author: Anupam Jain -Maintainer: ajnsit@gmail.com -Build-Type: Simple -Cabal-Version: >=1.6 -stability: Experimental -Category: Network -Extra-source-files: README.md, examples/Example.hs -Description: - Provides easy to use typesafe URLs for Wai Applications. - . - Sample usage follows (See examples/Example.hs in the source bundle for the full code) - - . - @ - {-# LANGUAGE OverloadedStrings, TypeFamilies #-} - . - import Network.Wai - import Network.Wai.Middleware.Routes - . - import Data.IORef - . - -- The Site Argument - data MyRoute = MyRoute (IORef DB) - . - -- Generate Routes - mkRoute "MyRoute" [parseRoutes| - / UsersR GET - /user/#Int UserR: - / UserRootR GET - /delete UserDeleteR POST - |] - . - -- Define Handlers - -- All Users Page - getUsersR :: Handler MyRoute - getUsersR (MyRoute dbref) request = ... - -- Single User Page - getUserRootR :: Int -> Handler MyRoute - getUserRootR userid (MyRoute dbref) request = ... - -- Delete Single User - postUserDeleteR :: Int -> Handler MyRoute - postUserDeleteR userid (MyRoute dbref) request = ... - . - -- Define Application using RouteM Monad - myApp = do - db <- liftIO $ newIORef mydb - route (MyRoute db) - setDefaultAction $ staticApp $ defaultFileServerSettings "static" - . - -- Run the application - main :: IO () - main = toWaiApp myApp >>= run 8080 - @ +name : wai-routes +version : 0.4.1 +cabal-version : >=1.10 +build-type : Simple +license : MIT +license-file : LICENSE +maintainer : ajnsit@gmail.com +stability : Experimental +homepage : https://github.com/ajnsit/wai-routes +synopsis : Typesafe URLs for Wai applications. +description : Provides easy to use typesafe URLs for Wai Applications. + . + Sample usage follows (See examples/Example.hs in the source bundle for the full code) - + . + @ + {-# LANGUAGE OverloadedStrings, TypeFamilies #-} + . + import Network.Wai + import Network.Wai.Middleware.Routes + . + import Data.IORef + . + -- The Site Argument + data MyRoute = MyRoute (IORef DB) + . + -- Generate Routes + mkRoute "MyRoute" [parseRoutes| + / UsersR GET + /user/#Int UserR: + / UserRootR GET + /delete UserDeleteR POST + |] + . + -- Define Handlers + -- All Users Page + getUsersR :: Handler MyRoute + getUsersR (MyRoute dbref) request = ... + -- Single User Page + getUserRootR :: Int -> Handler MyRoute + getUserRootR userid (MyRoute dbref) request = ... + -- Delete Single User + postUserDeleteR :: Int -> Handler MyRoute + postUserDeleteR userid (MyRoute dbref) request = ... + . + -- Define Application using RouteM Monad + myApp = do + db <- liftIO $ newIORef mydb + route (MyRoute db) + setDefaultAction $ staticApp $ defaultFileServerSettings "static" + . + -- Run the application + main :: IO () + main = toWaiApp myApp >>= run 8080 + @ +category : Network +author : Anupam Jain +data-dir : "" +extra-source-files : README.md examples/Example.hs source-repository head - type: git - location: http://github.com/ajnsit/wai-routes + type : git + location : http://github.com/ajnsit/wai-routes source-repository this - type: git - location: http://github.com/ajnsit/wai-routes/tree/v0.4.0 - tag: v0.4.0 + type : git + location : http://github.com/ajnsit/wai-routes/tree/v0.4.1 + tag : v0.4.1 -Library - hs-source-dirs: src - Build-Depends: base >= 3 && < 5 - , wai >= 2 && < 2.1 - , text >= 0.11.3 && < 0.12 - , bytestring >= 0.10.0 && < 0.10.1 - , http-types >= 0.8.3 && < 0.8.4 - , blaze-builder >= 0.3.3 && < 0.3.4 - , template-haskell >= 2.8.0 && < 2.8.1 - , yesod-routes >= 1.2.0 && < 1.2.1 - , mtl - exposed-modules: Network.Wai.Middleware.Routes - , Network.Wai.Middleware.Routes.Routes - , Network.Wai.Middleware.Routes.Monad - , Network.Wai.Middleware.Routes.Handler - , Network.Wai.Middleware.Routes.ContentTypes +library + build-depends : base >= 4.6.0.1 && < 4.7 + , wai >= 2.0.0 && < 2.1 + , text >= 0.11.3.1 && < 0.12 + , bytestring >= 0.10.0.2 && < 0.11 + , http-types >= 0.8.3 && < 0.9 + , blaze-builder >= 0.3.3.2 && < 0.4 + , template-haskell >= 2.8.0.0 && < 2.9 + , yesod-routes >= 1.2.0.6 && < 1.3 + , mtl >= 2.1.2 && < 2.2 + exposed-modules: Network.Wai.Middleware.Routes + Network.Wai.Middleware.Routes.Routes + Network.Wai.Middleware.Routes.Monad + Network.Wai.Middleware.Routes.Handler + Network.Wai.Middleware.Routes.ContentTypes + exposed : True + buildable : True + hs-source-dirs : src + default-language : Haskell2010