packages feed

shakespeare 1.0.5.1 → 1.2.0

raw patch · 3 files changed

+7/−6 lines, 3 files

Files

Text/Shakespeare.hs view
@@ -362,7 +362,7 @@             ts <- [|fromText . pack'|]             return $ wrap rs `AppE` (ts `AppE` LitE (StringL s'))         contentToBuilder _ (ContentVar d) =-            return $ wrap rs `AppE` (toBuilder rs `AppE` derefToExp [] d)+            return $ (toBuilder rs `AppE` derefToExp [] d)         contentToBuilder r (ContentUrl d) = do             ts <- [|fromText|]             return $ wrap rs `AppE` (ts `AppE` (VarE r `AppE` derefToExp [] d `AppE` ListE []))@@ -439,7 +439,8 @@         return $ TupE [d', c' `AppE` derefToExp [] d]       where         c :: VarType -> Q Exp-        c VTPlain = [|EPlain . $(return $ toBuilder settings)|]+        c VTPlain = [|EPlain . $(return $+          InfixE (Just $ unwrap settings) (VarE '(.)) (Just $ toBuilder settings))|]         c VTUrl = [|EUrl|]         c VTUrlParam = [|EUrlParam|]         c VTMixin = [|\x -> EMixin $ \r -> $(return $ unwrap settings) $ x r|]
shakespeare.cabal view
@@ -1,5 +1,5 @@ name:            shakespeare-version:         1.0.5.1+version:         1.2.0 license:         MIT license-file:    LICENSE author:          Michael Snoyman <michael@snoyman.com>
test/ShakespeareBaseTest.hs view
@@ -8,7 +8,7 @@ import Text.Shakespeare.Base (parseVarString, parseUrlString, parseIntString) import Text.Shakespeare (preFilter, defaultShakespeareSettings, ShakespeareSettings(..), PreConvert(..), PreConversion(..)) import Language.Haskell.TH.Syntax (Exp (VarE))-import Data.Text.Lazy.Builder (fromString, toLazyText)+import Data.Text.Lazy.Builder (fromString, toLazyText, fromLazyText) import Data.Text.Lazy (pack)  -- run :: Text.Parsec.Prim.Parsec Text.Parsec.Pos.SourceName () c -> Text.Parsec.Pos.SourceName -> c@@ -44,9 +44,9 @@   it "reload" $ do     let helper input = $(do             shakespeareFileReload defaultShakespeareSettings-                { toBuilder = VarE 'fromString+                { toBuilder = VarE 'pack                 , wrap = VarE 'toLazyText-                , unwrap = VarE 'undefined+                , unwrap = VarE 'fromLazyText                 } "test/reload.txt") undefined     helper "here1" `shouldBe` pack "here1\n"     helper "here2" `shouldBe` pack "here2\n"