git.iko.soy/typeable/mandrill
on master help sign in
Merge pull request #10 from fanjam/fromjson
ce48008Alfredo Di Napoli
mandrill.cabal+1−1
compare with master
unifiedsplit
@@ -1,5 +1,5 @@
1name: mandrill
1name: mandrill
2−version: 0.1.1.0
2+version: 0.2.0.0
3synopsis: Library for interfacing with the Mandrill JSON API
3synopsis: Library for interfacing with the Mandrill JSON API
4description: Pure Haskell client for the Mandrill JSON API
4description: Pure Haskell client for the Mandrill JSON API
5license: MIT
5license: MIT
src/Network/API/Mandrill/Types.hs+1−1
@@ -135,7 +135,7 @@ instance ToJSON MandrillHtml where
135 toJSON (MandrillHtml h) = String . TL.toStrict . Blaze.renderHtml $ h
135 toJSON (MandrillHtml h) = String . TL.toStrict . Blaze.renderHtml $ h
136
136
137instance FromJSON MandrillHtml where
137instance FromJSON MandrillHtml where
138− parseJSON (String h) = return $ MandrillHtml (Blaze.toHtml h)
138+ parseJSON (String h) = return $ MandrillHtml (Blaze.preEscapedToHtml h)
139 parseJSON v = typeMismatch "Expecting a String for MandrillHtml" v
139 parseJSON v = typeMismatch "Expecting a String for MandrillHtml" v
140
140
141instance Arbitrary MandrillHtml where
141instance Arbitrary MandrillHtml where