mandrill 0.5.3.4 → 0.5.3.5
raw patch · 8 files changed
+16/−17 lines, 8 filesdep +microlens-thdep −lens
Dependencies added: microlens-th
Dependencies removed: lens
Files
- mandrill.cabal +2/−2
- src/Network/API/Mandrill.hs +7/−6
- src/Network/API/Mandrill/Inbound.hs +1/−1
- src/Network/API/Mandrill/Messages/Types.hs +1/−1
- src/Network/API/Mandrill/Senders.hs +1/−1
- src/Network/API/Mandrill/Types.hs +2/−4
- src/Network/API/Mandrill/Users/Types.hs +1/−1
- src/Network/API/Mandrill/Webhooks.hs +1/−1
mandrill.cabal view
@@ -1,5 +1,5 @@ name: mandrill-version: 0.5.3.4+version: 0.5.3.5 synopsis: Library for interfacing with the Mandrill JSON API description: Pure Haskell client for the Mandrill JSON API license: MIT@@ -42,7 +42,7 @@ , http-client >= 0.3.0 , http-client-tls >= 0.2.0.0 , aeson >= 0.7.0.3 && < 1.4.0.0- , lens >= 4.0+ , microlens-th >= 0.4.0.0 , blaze-html >= 0.5.0.0 , QuickCheck >= 2.6 && < 3.0 , mtl < 3.0
src/Network/API/Mandrill.hs view
@@ -20,7 +20,6 @@ -- $exampleusage ) where -import Control.Lens import Control.Monad.Reader import qualified Data.Aeson as JSON import qualified Data.HashMap.Strict as H@@ -107,7 +106,7 @@ -- ^ The HTML body -> MandrillMessage newHtmlMessage f t subj html = let body = mkMandrillHtml html in- ((mmsg_html .~ body) . (mmsg_subject .~ subj)) $ (emptyMessage f t)+ (emptyMessage f t) { _mmsg_html = body, _mmsg_subject = subj } -------------------------------------------------------------------------------- -- | Create a new template message (no HTML).@@ -118,7 +117,7 @@ -> T.Text -- ^ Subject -> MandrillMessage-newTemplateMessage f t subj = (mmsg_subject .~ subj) $ (emptyMessage f t)+newTemplateMessage f t subj = (emptyMessage f t) { _mmsg_subject = subj } -------------------------------------------------------------------------------- -- | Create a new textual message. By default Mandrill doesn't require you@@ -134,9 +133,11 @@ -- ^ The body, as normal text. -> MandrillMessage newTextMessage f t subj txt = let body = unsafeMkMandrillHtml txt in- ((mmsg_html .~ body) .- (mmsg_text .~ Just txt) .- (mmsg_subject .~ subj)) (emptyMessage f t)+ (emptyMessage f t) {+ _mmsg_html = body+ , _mmsg_text = Just txt+ , _mmsg_subject = subj+ } --------------------------------------------------------------------------------
src/Network/API/Mandrill/Inbound.hs view
@@ -1,11 +1,11 @@ {-# LANGUAGE TemplateHaskell #-} module Network.API.Mandrill.Inbound where-import Control.Lens import Data.Aeson (FromJSON, ToJSON, parseJSON, toJSON) import Data.Aeson.TH (defaultOptions, deriveJSON) import Data.Aeson.Types (fieldLabelModifier) import Data.Text (Text)+import Lens.Micro.TH (makeLenses) import Network.API.Mandrill.HTTP (toMandrillResponse) import Network.API.Mandrill.Settings import Network.API.Mandrill.Types
src/Network/API/Mandrill/Messages/Types.hs view
@@ -5,12 +5,12 @@ import Data.Char import Data.Time import qualified Data.Text as T-import Control.Lens import Control.Monad import Data.Monoid import Data.Aeson import Data.Aeson.Types import Data.Aeson.TH+import Lens.Micro.TH (makeLenses) import Network.API.Mandrill.Types
src/Network/API/Mandrill/Senders.hs view
@@ -1,12 +1,12 @@ {-# LANGUAGE TemplateHaskell #-} module Network.API.Mandrill.Senders where-import Control.Lens import Data.Aeson (FromJSON, ToJSON, parseJSON, toJSON) import Data.Aeson.TH (defaultOptions, deriveJSON) import Data.Aeson.Types (Value (..), fieldLabelModifier) import Data.Text (Text) import Data.Text.Encoding (decodeUtf8, encodeUtf8)+import Lens.Micro.TH (makeLenses) import Network.API.Mandrill.HTTP (toMandrillResponse) import Network.API.Mandrill.Settings import Network.API.Mandrill.Types
src/Network/API/Mandrill/Types.hs view
@@ -13,6 +13,7 @@ import Data.Char import Data.Maybe import Data.Time+import Lens.Micro.TH (makeLenses) import Network.API.Mandrill.Utils import Test.QuickCheck import Text.Email.Validate@@ -21,7 +22,6 @@ #else import System.Locale (TimeLocale, defaultTimeLocale) #endif-import Control.Lens import Data.Aeson import Data.Aeson.TH import Data.Aeson.Types@@ -158,11 +158,9 @@ mkMandrillHtml :: Blaze.Html -> MandrillHtml mkMandrillHtml = MandrillHtml -instance Semigroup MandrillHtml where- (MandrillHtml m1) <> (MandrillHtml m2) = MandrillHtml (m1 <> m2)- instance Monoid MandrillHtml where mempty = MandrillHtml mempty+ mappend (MandrillHtml m1) (MandrillHtml m2) = MandrillHtml (m1 <> m2) instance Show MandrillHtml where show (MandrillHtml h) = show $ Blaze.renderHtml h
src/Network/API/Mandrill/Users/Types.hs view
@@ -5,12 +5,12 @@ import Data.Char import Data.Time import qualified Data.Text as T-import Control.Lens import Control.Monad import Data.Monoid import Data.Aeson import Data.Aeson.Types import Data.Aeson.TH+import Lens.Micro.TH (makeLenses) import Network.API.Mandrill.Types
src/Network/API/Mandrill/Webhooks.hs view
@@ -2,7 +2,6 @@ {-# LANGUAGE TemplateHaskell #-} module Network.API.Mandrill.Webhooks where import Control.Applicative (pure)-import Control.Lens import Control.Monad (mzero) import Data.Aeson (FromJSON, ToJSON, parseJSON, toJSON)@@ -12,6 +11,7 @@ import Data.Set (Set) import Data.Text (Text) import qualified Data.Text as T+import Lens.Micro.TH (makeLenses) import Network.API.Mandrill.HTTP (toMandrillResponse) import Network.API.Mandrill.Settings import Network.API.Mandrill.Types