Merge pull request #28 from tfausak/escape-apostrophes

Escape apostrophes
JustusAdam · Mar 30, 2017 · 53a93a0 · 53a93a0
2 parents cf228c7 + 4a6d6ab
commit 53a93a0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/Text/Mustache/Internal.hs b/src/Text/Mustache/Internal.hs
@@ -34,6 +34,7 @@ escapeXML = concatMap $ \x -> IntMap.findWithDefault [x] (ord x) mp
 xmlEntities :: [(String, String)]
 xmlEntities =
   [ ("quot", "\"")
+  , ("#39", "'")
   , ("amp" , "&")
   , ("lt"  , "<")
   , ("gt"  , ">")

diff --git a/test/unit/Spec.hs b/test/unit/Spec.hs
@@ -116,14 +116,14 @@ substituteSpec =
     it "substitutes a html escaped value for a variable" $
       substitute
         (toTemplate [Variable escaped (NamedData ["name"])])
-        (object ["name" ~> ("<tag>" :: T.Text)])
-      `shouldBe` "&lt;tag&gt;"
+        (object ["name" ~> ("\" ' < > &" :: T.Text)])
+      `shouldBe` "&quot; &#39; &lt; &gt; &amp;"
 
     it "substitutes raw value for an unescaped variable" $
       substitute
         (toTemplate [Variable unescaped (NamedData ["name"])])
-        (object ["name" ~> ("<tag>" :: T.Text)])
-      `shouldBe` "<tag>"
+        (object ["name" ~> ("\" ' < > &" :: T.Text)])
+      `shouldBe` "\" ' < > &"
 
     it "substitutes a section when the key is present (and an empty object)" $
       substitute