yogsototh/hakyll
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add Trim_ data constructors. Add If test for Trim

Browse source
This commit is contained in:
samgd 2016-07-22 16:39:22 +02:00
parent 94cbdc1b1e
commit 02dd1cf236
No known key found for this signature in database
GPG key ID: E69F2FF86041ADB3
2 changed files with 25 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/Hakyll/Web/Template/Internal.hs
View file

@ -64,6 +64,8 @@ data TemplateElement
| If TemplateExpr Template (Maybe Template) -- expr, then, else
| For TemplateExpr Template (Maybe Template) -- expr, body, separator
| Partial TemplateExpr -- filename
| TrimL
| TrimR
deriving (Show, Eq, Typeable)
@ -71,10 +73,12 @@ data TemplateElement
instance Binary TemplateElement where
put (Chunk string) = putWord8 0 >> put string
put (Expr e) = putWord8 1 >> put e
put (Escaped) = putWord8 2
put (If e t f ) = putWord8 3 >> put e >> put t >> put f
put Escaped = putWord8 2
put (If e t f) = putWord8 3 >> put e >> put t >> put f
put (For e b s) = putWord8 4 >> put e >> put b >> put s
put (Partial e) = putWord8 5 >> put e
put TrimL = putWord8 6
put TrimR = putWord8 7
get = getWord8 >>= \tag -> case tag of
0 -> Chunk <$> get
@ -83,8 +87,9 @@ instance Binary TemplateElement where
3 -> If <$> get <*> get <*> get
4 -> For <$> get <*> get <*> get
5 -> Partial <$> get
_ -> error $
"Hakyll.Web.Template.Internal: Error reading cached template"
6 -> pure TrimL
7 -> pure TrimR
_ -> error "Hakyll.Web.Template.Internal: Error reading cached template"
--------------------------------------------------------------------------------
@ -114,8 +119,7 @@ instance Binary TemplateExpr where
0 -> Ident <$> get
1 -> Call <$> get <*> get
2 -> StringLiteral <$> get
_ -> error $
"Hakyll.Web.Tamplte.Internal: Error reading cached template"
_ -> error "Hakyll.Web.Template.Internal: Error reading cached template"
--------------------------------------------------------------------------------

15
tests/Hakyll/Web/Template/Tests.hs
View file

@ -39,6 +39,21 @@ tests = testGroup "Hakyll.Core.Template.Tests" $ concat
(Template [Chunk "foo"])
Nothing]
@=? readTemplate "$if(a(\"bar\"))$foo$endif$"
-- 'If' 'Trim_' test.
, Template
[ TrimL
, If (Ident (TemplateKey "body"))
(Template [ TrimR
, Expr (Ident (TemplateKey "body"))
])
(Just (Template [ TrimL
, TrimR
, Expr (Ident (TemplateKey "body"))
]))
, TrimL
, TrimR
]
@=? readTemplate "$-if(body)-$\n$body$\n$-else-$\n$body$\n$-endif-$"
]
]