happstack-heist 7.1.2 → 7.2.0

raw patch · 2 files changed

+7/−7 lines, 2 filesdep ~heist

Dependency ranges changed: heist

Files

• Happstack/Server/Heist.hs +5/−5
• happstack-heist.cabal +2/−2

@@ -17,7 +17,7 @@ -- > import qualified Data.Text    as T -- > import Happstack.Server       (dir, nullConf, nullDir, simpleHTTP, seeOther, toResponse) -- > import Happstack.Server.Heist (heistServe, initHeistCompiled)--- > import Heist                  (getParamNode)+-- > import Heist                  ((##), getParamNode, noSplices) -- > import Heist.Compiled         (Splice, yieldRuntimeText) -- > import qualified Text.XmlHtml as X -- >@@ -36,7 +36,7 @@ -- > main :: IO () -- > main = -- >   do heistState <- do--- >        r <- initHeistCompiled [(T.pack "fact", factSplice)] [] "."+-- >        r <- initHeistCompiled (T.pack "fact" ## factSplice) noSplices "." -- >        case r of -- >          (Left e) -> error $ unlines e -- >          (Right heistState) -> return $ heistState@@ -83,13 +83,13 @@ import Data.Text                               (Text) import Happstack.Server                        (Happstack, Response, ServerMonad, askRq, nullDir, rqPaths, toResponseBS) import Happstack.Server.FileServe.BuildingBlocks (combineSafe)-import Heist                                   (AttrSplice, HeistConfig(..), HeistState, defaultLoadTimeSplices, initHeist, loadTemplates)+import Heist                                   (AttrSplice, HeistConfig(..), HeistState, Splices, defaultLoadTimeSplices, initHeist, loadTemplates) import Heist.Compiled                          (Splice, renderTemplate) import System.FilePath                         (joinPath)  initHeistCompiled :: (MonadIO m, Monad n) =>-                     [(Text, Splice n)]     -- ^ compiled splices-                  -> [(Text, AttrSplice n)] -- ^ attribute splices+                     Splices (Splice n)     -- ^ compiled splices+                  -> Splices (AttrSplice n) -- ^ attribute splices                   -> FilePath               -- ^ path to template directory                   -> m (Either [String] (HeistState n)) initHeistCompiled splices attrSplices templateDir =

@@ -1,5 +1,5 @@ Name:                happstack-heist-Version:             7.1.2+Version:             7.2.0 Synopsis:            Support for using Heist templates in Happstack Description:         Happstack is a web application framework. Heist is an XML templating solution. This package makes it easy to use Heist templates with Happstack. Homepage:            http://www.happstack.com/@@ -25,6 +25,6 @@                        either           == 3.4.*,                        filepath,                        happstack-server >= 7.0 && < 7.4,-                       heist            >= 0.12 && < 0.13,+                       heist            >= 0.13 && < 0.14,                        mtl              == 2.*,                        text             >= 0.10 && < 0.12