Fixed issue 13, and added test case to detect the problem.

snapframework · Dec 6, 2011 · 7f4e7be · 7f4e7be
1 parent 9a69bc7
commit 7f4e7be
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/src/Text/Templating/Heist/Internal.hs b/src/Text/Templating/Heist/Internal.hs
@@ -374,7 +374,8 @@ parseAtt bs = do
     return $ T.concat chunks
   where
     cvt (Literal x) = return x
-    cvt (Ident x)   = getAttributeSplice x
+    cvt (Ident x)   =
+        localParamNode (const $ X.Element x [] []) $ getAttributeSplice x
 
 
 ------------------------------------------------------------------------------

diff --git a/test/suite/Text/Templating/Heist/Tests.hs b/test/suite/Text/Templating/Heist/Tests.hs
@@ -64,6 +64,7 @@ tests = [ testProperty "heist/simpleBind"            simpleBindTest
         , testCase     "heist/apply"                 applyTest
         , testCase     "heist/ignore"                ignoreTest
         , testCase     "heist/lookupTemplateContext" lookupTemplateTest
+        , testCase     "heist/attrSpliceContext"     attrSpliceContext
         ]
 
 
@@ -137,7 +138,7 @@ loadTest = do
     ets <- loadT "templates"
     either (error "Error loading templates")
            (\ts -> do let tm = _templateMap ts
-                      H.assertBool "loadTest size" $ Map.size tm == 21
+                      H.assertBool "loadTest size" $ Map.size tm == 23
            ) ets
 
 
@@ -268,6 +269,12 @@ bindParam :: H.Assertion
 bindParam = renderTest "bind_param" "<li>Hi there world</li>"
 
 
+------------------------------------------------------------------------------
+-- | Handling of <content> and bound parameters in a bonud tag.
+attrSpliceContext :: H.Assertion
+attrSpliceContext = renderTest "attrsubtest2" "<a href='asdf'>link</a>"
+
+
 ------------------------------------------------------------------------------
 -- | Markdown test on supplied text
 markdownTextTest :: H.Assertion

diff --git a/test/templates/attrsubtest1.tpl b/test/templates/attrsubtest1.tpl
@@ -0,0 +1 @@
+<content />
diff --git a/test/templates/attrsubtest2.tpl b/test/templates/attrsubtest2.tpl
@@ -0,0 +1 @@
+<bind tag="randName284">asdf</bind><apply template="attrsubtest1"><a href="${randName284}">link</a></apply>