From 0e96af34be098028eb79ef18dd81727ebe35fe00 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 3 Feb 2010 07:04:55 +0200 Subject: [PATCH] Resource Int to Integer --- Test/Errors.hs | 7 ++----- Test/QuasiResource.hs | 6 +++--- Yesod/Resource.hs | 4 ++-- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/Test/Errors.hs b/Test/Errors.hs index f673d839..7dfbac61 100644 --- a/Test/Errors.hs +++ b/Test/Errors.hs @@ -1,17 +1,14 @@ {-# LANGUAGE QuasiQuotes #-} +{-# LANGUAGE EmptyDataDecls #-} module Test.Errors (testSuite) where import Yesod import Yesod.Helpers.Auth -import Network.Wai -import Data.Default -import Data.List import Test.Framework (testGroup, Test) import Test.Framework.Providers.HUnit import Test.HUnit hiding (Test) -import qualified Data.ByteString.Char8 as B8 -data Errors = Errors +data Errors instance Yesod Errors where resources = [$mkResources| /denied: diff --git a/Test/QuasiResource.hs b/Test/QuasiResource.hs index 97dbc3fd..56d9af56 100644 --- a/Test/QuasiResource.hs +++ b/Test/QuasiResource.hs @@ -31,11 +31,11 @@ pageDelete :: String -> Handler MyYesod (Html, HtmlObject) pageDelete s = addHead $ toHtmlObject ["pageDelete", s] pageUpdate :: String -> Handler MyYesod ChooseRep 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] -userVariable :: Int -> String -> Handler MyYesod (Html, HtmlObject) +userVariable :: Integer -> String -> Handler MyYesod (Html, HtmlObject) 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] instance Show (Verb -> Handler MyYesod ChooseRep) where diff --git a/Yesod/Resource.hs b/Yesod/Resource.hs index 7d79e192..4e8ae0e6 100644 --- a/Yesod/Resource.hs +++ b/Yesod/Resource.hs @@ -291,7 +291,7 @@ rpnodesTH ns = do data UrlParam = SlurpParam { slurpParam :: [String] } | StringParam { stringParam :: String } - | IntParam { intParam :: Int } + | IntParam { intParam :: Integer } getUrlParam :: RP -> Resource -> Int -> UrlParam getUrlParam rp = (!!) . paramsFromMatchingPattern rp @@ -302,7 +302,7 @@ getUrlParamSlurp rp r = slurpParam . getUrlParam rp r getUrlParamString :: RP -> Resource -> Int -> String getUrlParamString rp r = stringParam . getUrlParam rp r -getUrlParamInt :: RP -> Resource -> Int -> Int +getUrlParamInt :: RP -> Resource -> Int -> Integer getUrlParamInt rp r = intParam . getUrlParam rp r applyUrlParams :: RP -> Exp -> Exp -> Q Exp