Merge pull request #10 from fanjam/fromjson
Don't escape input to MandrillHtml's FromJSON.
commitce48008a125c61f7c6762921a9952b0d5b6c5ad3
authorAlfredo Di Napoli <alfredo.dinapoli@gmail.com>
dateTue 23 Dec 2014, 08:37 (12 years ago)
parentd05237b6b29447
mandrill.cabal+1−1
@@ -1,5 +1,5 @@
11name: mandrill
2−version: 0.1.1.0
2+version: 0.2.0.0
33synopsis: Library for interfacing with the Mandrill JSON API
44description: Pure Haskell client for the Mandrill JSON API
55license: MIT
src/Network/API/Mandrill/Types.hs+1−1
@@ -135,7 +135,7 @@ instance ToJSON MandrillHtml where
135135 toJSON (MandrillHtml h) = String . TL.toStrict . Blaze.renderHtml $ h
136136
137137instance FromJSON MandrillHtml where
138− parseJSON (String h) = return $ MandrillHtml (Blaze.toHtml h)
138+ parseJSON (String h) = return $ MandrillHtml (Blaze.preEscapedToHtml h)
139139 parseJSON v = typeMismatch "Expecting a String for MandrillHtml" v
140140
141141instance Arbitrary MandrillHtml where