From 30e1739bf8bedef064f0457142bb9ada5af2db7b Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Fri, 21 May 2010 13:46:53 +0300 Subject: [PATCH] web-routes-quasi 0.3 --- Yesod/Dispatch.hs | 4 ++++ Yesod/Helpers/Auth.hs | 20 ++++++++++---------- Yesod/Helpers/Static.hs | 2 +- yesod.cabal | 2 +- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/Yesod/Dispatch.hs b/Yesod/Dispatch.hs index 1c6f7a02..4e24c049 100644 --- a/Yesod/Dispatch.hs +++ b/Yesod/Dispatch.hs @@ -9,6 +9,10 @@ module Yesod.Dispatch -- ** More fine-grained , mkYesodData , mkYesodDispatch + -- ** Path pieces + , SinglePiece (..) + , MultiPiece (..) + , Strings -- * Convert to WAI , toWaiApp , basicHandler diff --git a/Yesod/Helpers/Auth.hs b/Yesod/Helpers/Auth.hs index 00f71fb0..0829bd7f 100644 --- a/Yesod/Helpers/Auth.hs +++ b/Yesod/Helpers/Auth.hs @@ -138,17 +138,17 @@ maybeCreds = do _ -> Nothing mkYesodSub "Auth" [''YesodAuth] [$parseRoutes| -/check Check GET -/logout Logout GET -/openid OpenIdR GET -/openid/forward OpenIdForward GET -/openid/complete OpenIdComplete GET -/login/rpxnow RpxnowR +/check Check GET +/logout Logout GET +/openid OpenIdR GET +/openid/forward OpenIdForward GET +/openid/complete OpenIdComplete GET +/login/rpxnow RpxnowR -/register EmailRegisterR GET POST -/verify/#/$ EmailVerifyR GET -/login EmailLoginR GET POST -/set-password EmailPasswordR GET POST +/register EmailRegisterR GET POST +/verify/#EmailId/#String EmailVerifyR GET +/login EmailLoginR GET POST +/set-password EmailPasswordR GET POST |] testOpenId :: GHandler Auth master () diff --git a/Yesod/Helpers/Static.hs b/Yesod/Helpers/Static.hs index e08815dc..86951052 100644 --- a/Yesod/Helpers/Static.hs +++ b/Yesod/Helpers/Static.hs @@ -53,7 +53,7 @@ import Test.HUnit hiding (Test) data Static = Static (FilePath -> IO (Maybe (Either FilePath Content))) $(mkYesodSub "Static" [] [$parseRoutes| -* StaticRoute GET +*Strings StaticRoute GET |]) -- | Lookup files in a specific directory. diff --git a/yesod.cabal b/yesod.cabal index a7d64dd6..8590ad14 100644 --- a/yesod.cabal +++ b/yesod.cabal @@ -41,7 +41,7 @@ library convertible-text >= 0.3.0 && < 0.4, template-haskell >= 2.4 && < 2.5, web-routes >= 0.22 && < 0.23, - web-routes-quasi >= 0.2 && < 0.3, + web-routes-quasi >= 0.3 && < 0.4, hamlet >= 0.2.2 && < 0.3, transformers >= 0.1 && < 0.3, clientsession >= 0.4.0 && < 0.5,