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

Some convenience re-exports

Browse Source
This commit is contained in:
Michael Snoyman 2013-03-15 05:54:09 +02:00
parent cd2f0ed610
commit 8b9f8ea024
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
yesod-core/Yesod/Core.hs
View File

@ -64,6 +64,7 @@ module Yesod.Core
, module Yesod.Core.Json , module Yesod.Core.Json
, module Text.Shakespeare.I18N , module Text.Shakespeare.I18N
, module Yesod.Core.Internal.Util , module Yesod.Core.Internal.Util
, lift
) where ) where
import Yesod.Core.Content import Yesod.Core.Content
@ -77,6 +78,7 @@ import Text.Shakespeare.I18N
import Yesod.Core.Internal.Util (formatW3 , formatRFC1123 , formatRFC822) import Yesod.Core.Internal.Util (formatW3 , formatRFC1123 , formatRFC822)
import Control.Monad.Logger import Control.Monad.Logger
import Control.Monad.Trans.Class (lift)
import Yesod.Core.Internal.Session import Yesod.Core.Internal.Session
import Yesod.Core.Class.Yesod import Yesod.Core.Class.Yesod
import Yesod.Core.Class.Dispatch import Yesod.Core.Class.Dispatch

3
yesod-core/Yesod/Core/Json.hs
View File

@ -12,6 +12,7 @@ module Yesod.Core.Json
-- * Produce JSON values -- * Produce JSON values
, J.Value (..) , J.Value (..)
, array , array
, object
, (.=) , (.=)
-- * Convenience functions -- * Convenience functions
@ -28,7 +29,7 @@ import Yesod.Routes.Class
import Control.Monad (join) import Control.Monad (join)
import qualified Data.Aeson as J import qualified Data.Aeson as J
import qualified Data.Aeson.Parser as JP import qualified Data.Aeson.Parser as JP
import Data.Aeson ((.=)) import Data.Aeson ((.=), object)
import Data.Conduit.Attoparsec (sinkParser) import Data.Conduit.Attoparsec (sinkParser)
import Data.Text (pack) import Data.Text (pack)
import qualified Data.Vector as V import qualified Data.Vector as V

6
yesod-static/Yesod/Static.hs
View File

@ -58,7 +58,7 @@ import Yesod.Core.Types
import Data.List (intercalate) import Data.List (intercalate)
import Language.Haskell.TH import Language.Haskell.TH
import Language.Haskell.TH.Syntax import Language.Haskell.TH.Syntax as TH
import Crypto.Conduit (hashFile, sinkHash) import Crypto.Conduit (hashFile, sinkHash)
import Crypto.Hash.MD5 (MD5) import Crypto.Hash.MD5 (MD5)
@ -299,12 +299,12 @@ mkStaticFilesList fp fs routeConName makeHash = do
| isDigit (head name') -> '_' : name' | isDigit (head name') -> '_' : name'
| isLower (head name') -> name' | isLower (head name') -> name'
| otherwise -> '_' : name' | otherwise -> '_' : name'
f' <- [|map pack $(lift f)|] f' <- [|map pack $(TH.lift f)|]
let route = mkName routeConName let route = mkName routeConName
pack' <- [|pack|] pack' <- [|pack|]
qs <- if makeHash qs <- if makeHash
then do hash <- qRunIO $ base64md5File $ pathFromRawPieces fp f then do hash <- qRunIO $ base64md5File $ pathFromRawPieces fp f
[|[(pack "etag", pack $(lift hash))]|] [|[(pack "etag", pack $(TH.lift hash))]|]
else return $ ListE [] else return $ ListE []
return return
[ SigD routeName $ ConT route [ SigD routeName $ ConT route