diff --git a/CHANGELOG.md b/CHANGELOG.md --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## Stache 2.0.1 + +* Now interpolation with escaping also escapes single quotes as `'`. + ## Stache 2.0.0 * Uses Megaparsec 7. In particular, the parser now returns diff --git a/Text/Mustache/Render.hs b/Text/Mustache/Render.hs --- a/Text/Mustache/Render.hs +++ b/Text/Mustache/Render.hs @@ -295,6 +295,7 @@ escapeHtml :: Text -> Text escapeHtml txt = foldr (uncurry T.replace) txt [ ("\"", """) + , ("'", "'") , ("<", "<") , (">", ">") , ("&", "&") ] diff --git a/stache.cabal b/stache.cabal --- a/stache.cabal +++ b/stache.cabal @@ -1,5 +1,5 @@ name: stache -version: 2.0.0 +version: 2.0.1 cabal-version: 1.18 tested-with: GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.3 license: BSD3 diff --git a/tests/Text/Mustache/RenderSpec.hs b/tests/Text/Mustache/RenderSpec.hs --- a/tests/Text/Mustache/RenderSpec.hs +++ b/tests/Text/Mustache/RenderSpec.hs @@ -29,8 +29,8 @@ r [TextBlock "a text block"] Null `shouldBe` "a text block" it "renders escaped variables correctly" $ r [EscapedVar (key "foo")] - (object ["foo" .= ("&\"something\"" :: Text)]) - `shouldBe` "<html>&"something"</html>" + (object ["foo" .= ("&\"'something'\"" :: Text)]) + `shouldBe` "<html>&"'something'"</html>" it "renders unescaped variables “as is”" $ r [UnescapedVar (key "foo")] (object ["foo" .= ("&\"something\"" :: Text)])