haskell/yesod
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resource Int to Integer

Browse Source
This commit is contained in:
Michael Snoyman 2010-02-03 07:04:55 +02:00
parent a95704d164
commit 0e96af34be
3 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Test/Errors.hs
View File

@ -1,17 +1,14 @@
{-# LANGUAGE QuasiQuotes #-} {-# LANGUAGE QuasiQuotes #-}
{-# LANGUAGE EmptyDataDecls #-}
module Test.Errors (testSuite) where module Test.Errors (testSuite) where
import Yesod import Yesod
import Yesod.Helpers.Auth import Yesod.Helpers.Auth
import Network.Wai
import Data.Default
import Data.List
import Test.Framework (testGroup, Test) import Test.Framework (testGroup, Test)
import Test.Framework.Providers.HUnit import Test.Framework.Providers.HUnit
import Test.HUnit hiding (Test) import Test.HUnit hiding (Test)
import qualified Data.ByteString.Char8 as B8
data Errors = Errors data Errors
instance Yesod Errors where instance Yesod Errors where
resources = [$mkResources| resources = [$mkResources|
/denied: /denied:

6
Test/QuasiResource.hs
View File

@ -31,11 +31,11 @@ pageDelete :: String -> Handler MyYesod (Html, HtmlObject)
pageDelete s = addHead $ toHtmlObject ["pageDelete", s] pageDelete s = addHead $ toHtmlObject ["pageDelete", s]
pageUpdate :: String -> Handler MyYesod ChooseRep pageUpdate :: String -> Handler MyYesod ChooseRep
pageUpdate s = return $ chooseRep $ addHead' $ toHtmlObject ["pageUpdate", s] pageUpdate s = return $ chooseRep $ addHead' $ toHtmlObject ["pageUpdate", s]
userInfo :: Int -> Handler MyYesod (Html, HtmlObject) userInfo :: Integer -> Handler MyYesod (Html, HtmlObject)
userInfo i = addHead $ toHtmlObject ["userInfo", show i] userInfo i = addHead $ toHtmlObject ["userInfo", show i]
userVariable :: Int -> String -> Handler MyYesod (Html, HtmlObject) userVariable :: Integer -> String -> Handler MyYesod (Html, HtmlObject)
userVariable i s = addHead $ toHtmlObject ["userVariable", show i, s] userVariable i s = addHead $ toHtmlObject ["userVariable", show i, s]
userPage :: Int -> [String] -> Handler MyYesod (Html, HtmlObject) userPage :: Integer -> [String] -> Handler MyYesod (Html, HtmlObject)
userPage i p = addHead $ toHtmlObject ["userPage", show i, show p] userPage i p = addHead $ toHtmlObject ["userPage", show i, show p]
instance Show (Verb -> Handler MyYesod ChooseRep) where instance Show (Verb -> Handler MyYesod ChooseRep) where

4
Yesod/Resource.hs
View File

@ -291,7 +291,7 @@ rpnodesTH ns = do
data UrlParam = SlurpParam { slurpParam :: [String] } data UrlParam = SlurpParam { slurpParam :: [String] }
| StringParam { stringParam :: String } | StringParam { stringParam :: String }
| IntParam { intParam :: Int } | IntParam { intParam :: Integer }
getUrlParam :: RP -> Resource -> Int -> UrlParam getUrlParam :: RP -> Resource -> Int -> UrlParam
getUrlParam rp = (!!) . paramsFromMatchingPattern rp getUrlParam rp = (!!) . paramsFromMatchingPattern rp
@ -302,7 +302,7 @@ getUrlParamSlurp rp r = slurpParam . getUrlParam rp r
getUrlParamString :: RP -> Resource -> Int -> String getUrlParamString :: RP -> Resource -> Int -> String
getUrlParamString rp r = stringParam . getUrlParam rp r getUrlParamString rp r = stringParam . getUrlParam rp r
getUrlParamInt :: RP -> Resource -> Int -> Int getUrlParamInt :: RP -> Resource -> Int -> Integer
getUrlParamInt rp r = intParam . getUrlParam rp r getUrlParamInt rp r = intParam . getUrlParam rp r
applyUrlParams :: RP -> Exp -> Exp -> Q Exp applyUrlParams :: RP -> Exp -> Exp -> Q Exp