shakespeare 0.11 → 1.0.0

raw patch · 4 files changed

+9/−10 lines, 4 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

Text/Shakespeare.hs +4/−1
Text/Shakespeare/Base.hs +1/−0
shakespeare.cabal +4/−4
test.hs +0/−5

Text/Shakespeare.hs view

@@ -208,6 +208,9 @@         parseChar' comments ignores =             many1 (noneOf ([varChar, urlChar, intChar] ++ comments ++ ignores)) +pack' :: String -> TS.Text+pack' = TS.pack+{-# NOINLINE pack' #-}  contentsToShakespeare :: ShakespeareSettings -> [Content] -> Q Exp contentsToShakespeare rs a = do@@ -225,7 +228,7 @@       where         contentToBuilder :: Name -> Content -> Q Exp         contentToBuilder _ (ContentRaw s') = do-            ts <- [|fromText . TS.pack|]+            ts <- [|fromText . pack'|]             return $ wrap rs `AppE` (ts `AppE` LitE (StringL s'))         contentToBuilder _ (ContentVar d) =             return $ wrap rs `AppE` (toBuilder rs `AppE` derefToExp [] d)

Text/Shakespeare/Base.hs view

@@ -100,6 +100,7 @@         _ <- char ')'         return $ DerefIdent $ Ident x     derefInfix x = try $ do+        () <- fail "Infix operator handling is currently disabled"         _ <- many1 $ oneOf " \t"         op <- many1 (satisfy $ \c -> isSymbol c || c `elem` "-") <?> "operator"         -- special handling for $, which we don't deal with

shakespeare.cabal view

@@ -1,5 +1,5 @@ name:            shakespeare-version:         0.11+version:         1.0.0 license:         BSD3 license-file:    LICENSE author:          Michael Snoyman <michael@snoyman.com>@@ -14,13 +14,13 @@     .     Packages that use this: shakespeare-js, shakespeare-css, shakespeare-text, hamlet, and xml-hamlet     .-    Please see the documentation at <http://docs.yesodweb.com/book/hamlet/> for more details.+    Please see the documentation at <http://www.yesodweb.com/book/shakespearean-templates> for more details.  category:        Web, Yesod stability:       Stable cabal-version:   >= 1.8 build-type:      Simple-homepage:        http://www.yesodweb.com/book/templates+homepage:        http://www.yesodweb.com/book/shakespearean-templates  library     build-depends:   base             >= 4       && < 5@@ -46,7 +46,7 @@     type: exitcode-stdio-1.0      ghc-options:   -Wall-    build-depends: shakespeare      >= 0.10.3  && < 0.11+    build-depends: shakespeare                  , base             >= 4       && < 5                  , parsec           >= 2       && < 4                  , HUnit

− test.hs

@@ -1,5 +0,0 @@-import Test.Hspec.Monadic-import ShakespeareBaseTest (specs)--main :: IO ()-main = hspecX $ specs