git.iko.soy/typeable/mandrill
on 0690253 help sign in
20 files changed+132−517
since splitsnapshots
unifiedsplit
.gitignore−1 .travis.yml+4−4 README.md−48 mandrill-nightly.yml−10 mandrill.cabal+5−8 src/Network/API/Mandrill.hs+19−20 src/Network/API/Mandrill/HTTP.hs+9−9 src/Network/API/Mandrill/Inbound.hs−78 src/Network/API/Mandrill/Messages.hs+4−4 src/Network/API/Mandrill/Messages/Types.hs+1−1 src/Network/API/Mandrill/Senders.hs−45 src/Network/API/Mandrill/Settings.hs+7−17 src/Network/API/Mandrill/Types.hs+61−74 src/Network/API/Mandrill/Users/Types.hs+1−1 src/Network/API/Mandrill/Webhooks.hs−70 stack.yaml+1−1 test/Main.hs+7−13 test/Online.hs+7−25 test/RawData.hs+4−49 test/Tests.hs+2−39
.gitignore−1
@@ -3,4 +3,3 @@ dist
33cabal.sandbox.config
44shell.nix
55.stack-work
6−tags
.travis.yml+4−4
@@ -5,17 +5,17 @@ notifications:
55 email: false
66
77env:
8+ - GHCVER=7.6.2 CABALVER=1.16
89 - GHCVER=7.6.3 CABALVER=1.16
910 - GHCVER=7.8.2 CABALVER=1.18
1011 - GHCVER=7.8.3 CABALVER=1.18
12+ - GHCVER=7.10.1 CABALVER=1.22
1113 - GHCVER=7.10.2 CABALVER=1.22
12− - GHCVER=8.0.1 CABALVER=1.22
13− - GHCVER=head CABALVER=1.22
14+ - GHCVER=head CABALVER=1.20
1415
1516matrix:
1617 allow_failures:
17− - env: GHCVER=8.0.1 CABALVER=1.22
18− - env: GHCVER=head CABALVER=1.22
18+ - env: GHCVER=head CABALVER=1.20
1919
2020before_install:
2121 - travis_retry sudo add-apt-repository -y ppa:hvr/ghc
README.md−48
@@ -8,46 +8,6 @@ the [Mandrill](http://mandrillapp.com) transactional email service.
88
99# Changelog
1010
11−## Version 0.5.3.5
12−
13−* Replaced dependency on lens with microlens (Courtesy of @tom-bop)
14−
15−## Version 0.5.3.3
16−
17−* Relaxed upper bound on Aeson (see: fpco/stackage/issues/3337)
18−
19−## Version 0.5.3.2
20−
21−* Relaxed upper bound on Aeson (see: fpco/stackage/issues/2449)
22−
23−## Version 0.5.3.1
24−
25−* Relaxed upper bound on Aeson (see: fpco/stackage/issues/2177 )
26−
27−## Version 0.5.3.0
28−
29−* Added support for webhooks (thanks to @mwotton).
30−
31−## Version 0.5.2.3
32−
33−* Added support for aeson-1.0.0.0 by relaxing its upper bound.
34−
35−## Version 0.5.2.2
36−
37−* Added support for QuickCheck-2.9 by relaxing its upper bound.
38−
39−## Version 0.5.2.1
40−
41−* Added `Functor`, `Foldable` and `Traversable` instances to `MandrillResponse` (Courtesy of @dredozubov)
42−
43−## Version 0.5.2.0
44−
45−* Added inbound calls (Courtesy of @mwotton)
46−
47−## Version 0.5.1.0
48−
49−* Relaxed the constraint on `aeson` to allow `0.11.0.0`.
50−
5111## Version 0.5.0.0
5212
5313* Changed the `MandrillHeaders` type synonym from `Value` to `Object`.
@@ -105,17 +65,9 @@ main = do
10565 + ~~ping.json~~ (as **doesn't return valid json!**)
10666 + ping2.json
10767 + senders.json
108−
10968 - [Messages call](https://mandrillapp.com/api/docs/messages.JSON.html)
11069 + send.json
11170
112− - [Senders call](https://mandrillapp.com/api/docs/senders.JSON.html)
113− + verify-domain.json
114−
115− - [Inbound call](https://mandrillapp.com/api/docs/inbound.JSON.html)
116− + add-route.json
117− + add-domain.json
118−
11971# Testing online API
12072
12173To test the online API, first build the package with tests enabled:
mandrill-nightly.ymldeleted−10
@@ -1,10 +0,0 @@
1−flags:
2− semigroups:
3− bytestring-builder: false
4−packages:
5−- '.'
6−extra-deps:
7− - aeson-1.3.0.0
8− - text-1.2.3.0
9− - semigroups-0.18.2
10−resolver: lts-9.1
mandrill.cabal+5−8
@@ -1,5 +1,5 @@
11name: mandrill
2−version: 0.5.3.5
2+version: 0.5.0.0
33synopsis: Library for interfacing with the Mandrill JSON API
44description: Pure Haskell client for the Mandrill JSON API
55license: MIT
@@ -8,7 +8,7 @@ author: Alfredo Di Napoli
88maintainer: alfredo.dinapoli@gmail.com
99category: Network
1010build-type: Simple
11−tested-with: GHC == 7.4, GHC == 7.6, GHC == 7.8, GHC == 7.10.2
11+tested-with: GHC == 7.4, GHC == 7.6, GHC == 7.8
1212cabal-version: >=1.10
1313
1414source-repository head
@@ -25,9 +25,6 @@ library
2525 Network.API.Mandrill.Users.Types
2626 Network.API.Mandrill.Messages
2727 Network.API.Mandrill.Messages.Types
28− Network.API.Mandrill.Inbound
29− Network.API.Mandrill.Webhooks
30− Network.API.Mandrill.Senders
3128 other-modules:
3229 Network.API.Mandrill.Utils
3330 Network.API.Mandrill.HTTP
@@ -41,10 +38,10 @@ library
4138 , http-types >= 0.8.0
4239 , http-client >= 0.3.0
4340 , http-client-tls >= 0.2.0.0
44− , aeson >= 0.7.0.3 && < 1.5.0.0
45− , microlens-th >= 0.4.0.0
41+ , aeson >= 0.7.0.3 && < 0.11.0.0
42+ , lens >= 4.0
4643 , blaze-html >= 0.5.0.0
47− , QuickCheck >= 2.6 && < 3.0
44+ , QuickCheck >= 2.6 && < 2.9
4845 , mtl < 3.0
4946 , time
5047 , email-validate >= 1.0.0
src/Network/API/Mandrill.hs+19−20
@@ -20,18 +20,19 @@ module Network.API.Mandrill (
2020 -- $exampleusage
2121 ) where
2222
23−import Control.Monad.Reader
24−import qualified Data.Aeson as JSON
25−import qualified Data.HashMap.Strict as H
26−import Data.Monoid
27−import qualified Data.Text as T
28−import Data.Time
29−import Network.API.Mandrill.Messages as M
30−import Network.API.Mandrill.Messages.Types as M
31−import Network.API.Mandrill.Trans as M
32−import Network.API.Mandrill.Types as M
33−import Text.Blaze.Html
34−import Text.Email.Validate
23+import Control.Monad.Reader
24+import Control.Lens
25+import Data.Time
26+import Text.Blaze.Html
27+import Network.API.Mandrill.Types as M
28+import Network.API.Mandrill.Messages as M
29+import Network.API.Mandrill.Messages.Types as M
30+import Network.API.Mandrill.Trans as M
31+import Data.Monoid
32+import Text.Email.Validate
33+import qualified Data.Text as T
34+import qualified Data.Aeson as JSON
35+import qualified Data.HashMap.Strict as H
3536
3637{- $exampleusage
3738
@@ -106,7 +107,7 @@ newHtmlMessage :: EmailAddress
106107 -- ^ The HTML body
107108 -> MandrillMessage
108109newHtmlMessage f t subj html = let body = mkMandrillHtml html in
109− (emptyMessage f t) { _mmsg_html = body, _mmsg_subject = subj }
110+ ((mmsg_html .~ body) . (mmsg_subject .~ subj)) $ (emptyMessage f t)
110111
111112--------------------------------------------------------------------------------
112113-- | Create a new template message (no HTML).
@@ -117,7 +118,7 @@ newTemplateMessage :: EmailAddress
117118 -> T.Text
118119 -- ^ Subject
119120 -> MandrillMessage
120−newTemplateMessage f t subj = (emptyMessage f t) { _mmsg_subject = subj }
121+newTemplateMessage f t subj = (mmsg_subject .~ subj) $ (emptyMessage f t)
121122
122123--------------------------------------------------------------------------------
123124-- | Create a new textual message. By default Mandrill doesn't require you
@@ -133,11 +134,9 @@ newTextMessage :: EmailAddress
133134 -- ^ The body, as normal text.
134135 -> MandrillMessage
135136newTextMessage f t subj txt = let body = unsafeMkMandrillHtml txt in
136− (emptyMessage f t) {
137− _mmsg_html = body
138− , _mmsg_text = Just txt
139− , _mmsg_subject = subj
140− }
137+ ((mmsg_html .~ body) .
138+ (mmsg_text .~ Just txt) .
139+ (mmsg_subject .~ subj)) (emptyMessage f t)
141140
142141
143142--------------------------------------------------------------------------------
@@ -145,7 +144,7 @@ newTextMessage f t subj txt = let body = unsafeMkMandrillHtml txt in
145144-- 'MandrillMessage' and this function will send an email inside a
146145-- 'MandrillT' transformer. You are not forced to use the 'MandrillT' context
147146-- though. Have a look at "Network.API.Mandrill.Messages" for an IO-based,
148−-- low level function for sending email.
147+-- low lever function for sending email.
149148sendEmail :: MonadIO m
150149 => MandrillMessage
151150 -> MandrillT m (MandrillResponse [MessagesResponse])
src/Network/API/Mandrill/HTTP.hs+9−9
@@ -1,15 +1,15 @@
11{-# LANGUAGE OverloadedStrings #-}
22module Network.API.Mandrill.HTTP where
33
4−import Control.Applicative
5−import Data.Aeson
6−import Data.Monoid
7−import qualified Data.Text as T
8−import Network.API.Mandrill.Settings
9−import Network.API.Mandrill.Types
10−import Network.HTTP.Client
11−import Network.HTTP.Client.TLS
12−import Network.HTTP.Types
4+import Network.API.Mandrill.Settings
5+import Network.API.Mandrill.Types
6+import qualified Data.Text as T
7+import Data.Monoid
8+import Data.Aeson
9+import Control.Applicative
10+import Network.HTTP.Types
11+import Network.HTTP.Client
12+import Network.HTTP.Client.TLS
1313
1414toMandrillResponse :: (MandrillEndpoint ep, FromJSON a, ToJSON rq)
1515 => ep
src/Network/API/Mandrill/Inbound.hsdeleted−78
@@ -1,78 +0,0 @@
1−{-# LANGUAGE TemplateHaskell #-}
2−module Network.API.Mandrill.Inbound where
3−import Data.Aeson (FromJSON, ToJSON, parseJSON,
4− toJSON)
5−import Data.Aeson.TH (defaultOptions, deriveJSON)
6−import Data.Aeson.Types (fieldLabelModifier)
7−import Data.Text (Text)
8−import Lens.Micro.TH (makeLenses)
9−import Network.API.Mandrill.HTTP (toMandrillResponse)
10−import Network.API.Mandrill.Settings
11−import Network.API.Mandrill.Types
12−import Network.HTTP.Client (Manager)
13−
14−data DomainAddRq =
15− DomainAddRq
16− { _darq_key :: MandrillKey
17− , _darq_domain :: Text
18− } deriving Show
19−
20−makeLenses ''DomainAddRq
21−deriveJSON defaultOptions { fieldLabelModifier = drop 6 } ''DomainAddRq
22−
23−data DomainAddResponse =
24− DomainAddResponse
25− { _dares_domain :: Text
26− , _dares_created_at :: MandrillDate
27− , _dares_valid_mx :: Bool
28− } deriving Show
29−
30−
31−
32−makeLenses ''DomainAddResponse
33−deriveJSON defaultOptions { fieldLabelModifier = drop 7 } ''DomainAddResponse
34−
35−data RouteAddResponse =
36− RouteAddResponse
37− { _rares_id :: Text
38− , _rares_pattern :: Text
39− , _rares_url :: Text
40− } deriving Show
41−
42−
43−
44−makeLenses ''RouteAddResponse
45−deriveJSON defaultOptions { fieldLabelModifier = drop 7 } ''RouteAddResponse
46−
47−data RouteAddRq =
48− RouteAddRq
49− { _rarq_key :: Text
50− , _rarq_domain :: Text
51− , _rarq_pattern :: Text
52− , _rarq_url :: Text
53− } deriving Show
54−
55−makeLenses ''RouteAddRq
56−deriveJSON defaultOptions { fieldLabelModifier = drop 6 } ''RouteAddRq
57−
58−addDomain :: MandrillKey
59− -- ^ The API key
60− -> Text
61− -- ^ The domain to add
62− -> Maybe Manager
63− -> IO (MandrillResponse DomainAddResponse)
64−addDomain k dom = toMandrillResponse DomainsAdd (DomainAddRq k dom)
65−
66−
67−
68−addRoute :: MandrillKey
69− -- ^ The API key
70− -> Text
71− -- ^ The domain to add
72− -> Text
73− -- ^ the pattern including wildcards
74− -> Text
75− -- ^ URL to forward to
76− -> Maybe Manager
77− -> IO (MandrillResponse RouteAddResponse)
78−addRoute k dom pattern forward = toMandrillResponse RoutesAdd (RouteAddRq k dom pattern forward)
src/Network/API/Mandrill/Messages.hs+4−4
@@ -1,13 +1,13 @@
11
22module Network.API.Mandrill.Messages where
33
4−import qualified Data.Text as T
5−import Data.Time
6−import Network.API.Mandrill.HTTP
4+import Network.API.Mandrill.Types
75import Network.API.Mandrill.Messages.Types
86import Network.API.Mandrill.Settings
9−import Network.API.Mandrill.Types
7+import Network.API.Mandrill.HTTP
108import Network.HTTP.Client
9+import Data.Time
10+import qualified Data.Text as T
1111
1212--------------------------------------------------------------------------------
1313-- | Send a new transactional message through Mandrill
src/Network/API/Mandrill/Messages/Types.hs+1−1
@@ -5,12 +5,12 @@ module Network.API.Mandrill.Messages.Types where
55import Data.Char
66import Data.Time
77import qualified Data.Text as T
8+import Control.Lens
89import Control.Monad
910import Data.Monoid
1011import Data.Aeson
1112import Data.Aeson.Types
1213import Data.Aeson.TH
13−import Lens.Micro.TH (makeLenses)
1414
1515import Network.API.Mandrill.Types
1616
src/Network/API/Mandrill/Senders.hsdeleted−45
@@ -1,45 +0,0 @@
1−{-# LANGUAGE TemplateHaskell #-}
2−module Network.API.Mandrill.Senders where
3−import Data.Aeson (FromJSON, ToJSON, parseJSON,
4− toJSON)
5−import Data.Aeson.TH (defaultOptions, deriveJSON)
6−import Data.Aeson.Types (Value (..), fieldLabelModifier)
7−import Data.Text (Text)
8−import Data.Text.Encoding (decodeUtf8, encodeUtf8)
9−import Lens.Micro.TH (makeLenses)
10−import Network.API.Mandrill.HTTP (toMandrillResponse)
11−import Network.API.Mandrill.Settings
12−import Network.API.Mandrill.Types
13−import Network.HTTP.Client (Manager)
14−import qualified Text.Email.Validate as TEV
15−
16−data VerifyDomainRq =
17− VerifyDomainRq
18− { _vdrq_key :: MandrillKey
19− , _vdrq_domain :: Text
20− , _vdrq_mailbox :: Text
21− } deriving Show
22−
23−makeLenses ''VerifyDomainRq
24−deriveJSON defaultOptions { fieldLabelModifier = drop 6 } ''VerifyDomainRq
25−
26−data VerifyDomainResponse =
27− VerifyDomainResponse
28− { _vdres_status :: Text
29− , _vdres_domain :: Text
30− , _vdres_email :: MandrillEmail
31− } deriving Show
32−
33−makeLenses ''VerifyDomainResponse
34−deriveJSON defaultOptions { fieldLabelModifier = drop 7 } ''VerifyDomainResponse
35−
36−
37−verifyDomain :: MandrillKey
38− -- ^ The API key
39− -> TEV.EmailAddress
40− -- ^ Email address to use for verification
41− -> Maybe Manager
42− -> IO (MandrillResponse VerifyDomainResponse)
43−verifyDomain k email =
44− toMandrillResponse VerifyDomain
45− (VerifyDomainRq k (decodeUtf8 $ TEV.domainPart email) (decodeUtf8 $ TEV.localPart email))
src/Network/API/Mandrill/Settings.hs+7−17
@@ -15,26 +15,16 @@ data MandrillCalls =
1515 -- Messages API
1616 | MessagesSend
1717 | MessagesSendTemplate
18− | MessagesSearch
19− -- Inbound API
20− | RoutesAdd
21− | DomainsAdd
22− -- Senders API
23− | VerifyDomain
24−
25− deriving Show
18+ | MessagesSearch deriving Show
2619
2720class MandrillEndpoint ep where
2821 toUrl :: ep -> T.Text
2922
3023instance MandrillEndpoint MandrillCalls where
31− toUrl UsersInfo = "users/info.json"
32− toUrl UsersPing = "users/ping.json"
33− toUrl UsersPing2 = "users/ping2.json"
34− toUrl UsersSenders = "users/senders.json"
35− toUrl MessagesSend = "messages/send.json"
24+ toUrl UsersInfo = "users/info.json"
25+ toUrl UsersPing = "users/ping.json"
26+ toUrl UsersPing2 = "users/ping2.json"
27+ toUrl UsersSenders = "users/senders.json"
28+ toUrl MessagesSend = "messages/send.json"
3629 toUrl MessagesSendTemplate = "messages/send-template.json"
37− toUrl MessagesSearch = "messages/search.json"
38− toUrl DomainsAdd = "inbound/add-domain.json"
39− toUrl RoutesAdd = "inbound/add-route.json"
40− toUrl VerifyDomain = "senders/verify-domain.json"
30+ toUrl MessagesSearch = "messages/search.json"
src/Network/API/Mandrill/Types.hs+61−74
@@ -1,44 +1,36 @@
1−{-# LANGUAGE CPP #-}
2−{-# LANGUAGE DeriveFoldable #-}
3−{-# LANGUAGE DeriveFunctor #-}
4−{-# LANGUAGE DeriveTraversable #-}
5−{-# LANGUAGE OverloadedStrings #-}
6−{-# LANGUAGE RankNTypes #-}
1+{-# LANGUAGE TemplateHaskell #-}
2+{-# LANGUAGE CPP #-}
3+{-# LANGUAGE RankNTypes #-}
74{-# LANGUAGE ScopedTypeVariables #-}
8−{-# LANGUAGE TemplateHaskell #-}
5+{-# LANGUAGE OverloadedStrings #-}
96module Network.API.Mandrill.Types where
107
11−import Control.Applicative
12−import Control.Monad (mzero)
13−import Data.Char
14−import Data.Maybe
15−import Data.Time
16−import Lens.Micro.TH (makeLenses)
178import Network.API.Mandrill.Utils
189import Test.QuickCheck
1910import Text.Email.Validate
11+import Data.Char
12+import Data.Maybe
13+import Data.Time
14+import Control.Applicative
2015#if MIN_VERSION_time(1,5,0)
21−import Data.Time.Format (TimeLocale, defaultTimeLocale)
16+import Data.Time.Format (TimeLocale, defaultTimeLocale)
2217#else
23−import System.Locale (TimeLocale, defaultTimeLocale)
18+import System.Locale (TimeLocale, defaultTimeLocale)
2419#endif
20+import qualified Data.ByteString as B
21+import qualified Data.ByteString.Base64 as Base64
22+import qualified Data.HashMap.Strict as H
23+import qualified Data.Text as T
24+import qualified Data.Text.Encoding as TL
25+import qualified Data.Text.Lazy as TL
26+import Control.Lens
27+import Data.Monoid
2528import Data.Aeson
26−import Data.Aeson.TH
2729import Data.Aeson.Types
28−import qualified Data.ByteString as B
29−import qualified Data.ByteString.Base64 as Base64
30−#if !MIN_VERSION_base(4,8,0)
31−import Data.Foldable
32−import Data.Traversable
33−#endif
34−import qualified Data.HashMap.Strict as H
35−import Data.Monoid
36−import qualified Data.Text as T
37−import qualified Data.Text.Encoding as TL
38−import qualified Data.Text.Lazy as TL
39−import qualified Text.Blaze.Html as Blaze
30+import Data.Aeson.TH
31+import qualified Text.Blaze.Html as Blaze
4032import qualified Text.Blaze.Html.Renderer.Text as Blaze
41−import qualified Text.Email.Validate as TEV
33+
4234
4335timeParse :: ParseTime t => TimeLocale -> String -> String -> Maybe t
4436#if MIN_VERSION_time(1,5,0)
@@ -49,11 +41,11 @@ timeParse = parseTime
4941
5042--------------------------------------------------------------------------------
5143data MandrillError = MandrillError {
52− _merr_status :: !T.Text
53− , _merr_code :: !Int
54− , _merr_name :: !T.Text
44+ _merr_status :: !T.Text
45+ , _merr_code :: !Int
46+ , _merr_name :: !T.Text
5547 , _merr_message :: !T.Text
56− } deriving (Show, Eq)
48+ } deriving Show
5749
5850makeLenses ''MandrillError
5951deriveJSON defaultOptions { fieldLabelModifier = drop 6 } ''MandrillError
@@ -91,7 +83,7 @@ deriveJSON defaultOptions {
9183-- which can be either a success or a failure.
9284data MandrillResponse k =
9385 MandrillSuccess k
94− | MandrillFailure MandrillError deriving (Show, Eq, Functor, Foldable, Traversable)
86+ | MandrillFailure MandrillError deriving Show
9587
9688instance FromJSON k => FromJSON (MandrillResponse k) where
9789 parseJSON v = case (parseMaybe parseJSON v) :: Maybe k of
@@ -127,9 +119,9 @@ instance FromJSON MandrillEmail where
127119data MandrillRecipient = MandrillRecipient {
128120 _mrec_email :: MandrillEmail
129121 -- ^ The email address of the recipient
130− , _mrec_name :: Maybe T.Text
122+ , _mrec_name :: Maybe T.Text
131123 -- ^ The optional display name to use for the recipient
132− , _mrec_type :: Maybe MandrillRecipientTag
124+ , _mrec_type :: Maybe MandrillRecipientTag
133125 -- ^ The header type to use for the recipient.
134126 -- defaults to "to" if not provided
135127 } deriving Show
@@ -158,11 +150,6 @@ unsafeMkMandrillHtml = MandrillHtml . Blaze.preEscapedToHtml
158150mkMandrillHtml :: Blaze.Html -> MandrillHtml
159151mkMandrillHtml = MandrillHtml
160152
161−#if MIN_VERSION_base(4,11,0)
162−instance Semigroup MandrillHtml where
163− MandrillHtml m1 <> MandrillHtml m2 = MandrillHtml (m1 <> m2)
164−#endif
165−
166153instance Monoid MandrillHtml where
167154 mempty = MandrillHtml mempty
168155 mappend (MandrillHtml m1) (MandrillHtml m2) = MandrillHtml (m1 <> m2)
@@ -209,7 +196,7 @@ deriveJSON defaultOptions { fieldLabelModifier = drop 6 } ''MandrillMergeVars
209196
210197--------------------------------------------------------------------------------
211198data MandrillMetadata = MandrillMetadata {
212− _mmdt_rcpt :: !T.Text
199+ _mmdt_rcpt :: !T.Text
213200 , _mmdt_values :: Object
214201 } deriving Show
215202
@@ -234,8 +221,8 @@ instance FromJSON Base64ByteString where
234221
235222--------------------------------------------------------------------------------
236223data MandrillWebContent = MandrillWebContent {
237− _mwct_type :: !T.Text
238− , _mwct_name :: !T.Text
224+ _mwct_type :: !T.Text
225+ , _mwct_name :: !T.Text
239226 -- ^ [for images] the Content ID of the image
240227 -- - use <img src="cid:THIS_VALUE"> to reference the image
241228 -- in your HTML content
@@ -248,67 +235,67 @@ deriveJSON defaultOptions { fieldLabelModifier = drop 6 } ''MandrillWebContent
248235--------------------------------------------------------------------------------
249236-- | The information on the message to send
250237data MandrillMessage = MandrillMessage {
251− _mmsg_html :: MandrillHtml
238+ _mmsg_html :: MandrillHtml
252239 -- ^ The full HTML content to be sent
253− , _mmsg_text :: Maybe T.Text
240+ , _mmsg_text :: Maybe T.Text
254241 -- ^ Optional full text content to be sent
255− , _mmsg_subject :: !T.Text
242+ , _mmsg_subject :: !T.Text
256243 -- ^ The message subject
257− , _mmsg_from_email :: MandrillEmail
244+ , _mmsg_from_email :: MandrillEmail
258245 -- ^ The sender email address
259− , _mmsg_from_name :: Maybe T.Text
246+ , _mmsg_from_name :: Maybe T.Text
260247 -- ^ Optional from name to be used
261− , _mmsg_to :: [MandrillRecipient]
248+ , _mmsg_to :: [MandrillRecipient]
262249 -- ^ A list of recipient information
263− , _mmsg_headers :: MandrillHeaders
250+ , _mmsg_headers :: MandrillHeaders
264251 -- ^ optional extra headers to add to the message (most headers are allowed)
265− , _mmsg_important :: Maybe Bool
252+ , _mmsg_important :: Maybe Bool
266253 -- ^ whether or not this message is important, and should be delivered ahead
267254 -- of non-important messages
268− , _mmsg_track_opens :: Maybe Bool
255+ , _mmsg_track_opens :: Maybe Bool
269256 -- ^ whether or not to turn on open tracking for the message
270− , _mmsg_track_clicks :: Maybe Bool
257+ , _mmsg_track_clicks :: Maybe Bool
271258 -- ^ whether or not to turn on click tracking for the message
272− , _mmsg_auto_text :: Maybe Bool
259+ , _mmsg_auto_text :: Maybe Bool
273260 -- ^ whether or not to automatically generate a text part for messages that are not given text
274− , _mmsg_auto_html :: Maybe Bool
261+ , _mmsg_auto_html :: Maybe Bool
275262 -- ^ whether or not to automatically generate an HTML part for messages that are not given HTML
276− , _mmsg_inline_css :: Maybe Bool
263+ , _mmsg_inline_css :: Maybe Bool
277264 -- ^ whether or not to automatically inline all CSS styles provided in the message HTML
278265 -- - only for HTML documents less than 256KB in size
279− , _mmsg_url_strip_qs :: Maybe Bool
266+ , _mmsg_url_strip_qs :: Maybe Bool
280267 -- ^ whether or not to strip the query string from URLs when aggregating tracked URL data
281− , _mmsg_preserve_recipients :: Maybe Bool
268+ , _mmsg_preserve_recipients :: Maybe Bool
282269 -- ^ whether or not to expose all recipients in to "To" header for each email
283− , _mmsg_view_content_link :: Maybe Bool
270+ , _mmsg_view_content_link :: Maybe Bool
284271 -- ^ set to false to remove content logging for sensitive emails
285− , _mmsg_bcc_address :: Maybe T.Text
272+ , _mmsg_bcc_address :: Maybe T.Text
286273 -- ^ an optional address to receive an exact copy of each recipient's email
287− , _mmsg_tracking_domain :: Maybe T.Text
274+ , _mmsg_tracking_domain :: Maybe T.Text
288275 -- ^ a custom domain to use for tracking opens and clicks instead of mandrillapp.com
289− , _mmsg_signing_domain :: Maybe Bool
276+ , _mmsg_signing_domain :: Maybe Bool
290277 -- ^ a custom domain to use for SPF/DKIM signing instead of mandrill
291278 -- (for "via" or "on behalf of" in email clients)
292− , _mmsg_return_path_domain :: Maybe Bool
279+ , _mmsg_return_path_domain :: Maybe Bool
293280 -- ^ a custom domain to use for the messages's return-path
294− , _mmsg_merge :: Maybe Bool
281+ , _mmsg_merge :: Maybe Bool
295282 -- ^ whether to evaluate merge tags in the message.
296283 -- Will automatically be set to true if either merge_vars
297284 -- or global_merge_vars are provided.
298− , _mmsg_global_merge_vars :: [MergeVar]
285+ , _mmsg_global_merge_vars :: [MergeVar]
299286 -- ^ global merge variables to use for all recipients. You can override these per recipient.
300− , _mmsg_merge_vars :: [MandrillMergeVars]
287+ , _mmsg_merge_vars :: [MandrillMergeVars]
301288 -- ^ per-recipient merge variables, which override global merge variables with the same name.
302− , _mmsg_tags :: [MandrillTags]
289+ , _mmsg_tags :: [MandrillTags]
303290 -- ^ an array of string to tag the message with. Stats are accumulated using tags,
304291 -- though we only store the first 100 we see, so this should not be unique
305292 -- or change frequently. Tags should be 50 characters or less.
306293 -- Any tags starting with an underscore are reserved for internal use
307294 -- and will cause errors.
308− , _mmsg_subaccount :: Maybe T.Text
295+ , _mmsg_subaccount :: Maybe T.Text
309296 -- ^ the unique id of a subaccount for this message
310297 -- - must already exist or will fail with an error
311− , _mmsg_google_analytics_domains :: [T.Text]
298+ , _mmsg_google_analytics_domains :: [T.Text]
312299 -- ^ an array of strings indicating for which any matching URLs
313300 -- will automatically have Google Analytics parameters appended
314301 -- to their query string automatically.
@@ -316,17 +303,17 @@ data MandrillMessage = MandrillMessage {
316303 -- ^ optional string indicating the value to set for the utm_campaign
317304 -- tracking parameter. If this isn't provided the email's from address
318305 -- will be used instead.
319− , _mmsg_metadata :: Object
306+ , _mmsg_metadata :: Object
320307 -- ^ metadata an associative array of user metadata. Mandrill will store
321308 -- this metadata and make it available for retrieval.
322309 -- In addition, you can select up to 10 metadata fields to index
323310 -- and make searchable using the Mandrill search api.
324− , _mmsg_recipient_metadata :: [MandrillMetadata]
311+ , _mmsg_recipient_metadata :: [MandrillMetadata]
325312 -- ^ Per-recipient metadata that will override the global values
326313 -- specified in the metadata parameter.
327− , _mmsg_attachments :: [MandrillWebContent]
314+ , _mmsg_attachments :: [MandrillWebContent]
328315 -- ^ an array of supported attachments to add to the message
329− , _mmsg_images :: [MandrillWebContent]
316+ , _mmsg_images :: [MandrillWebContent]
330317 -- ^ an array of embedded images to add to the message
331318 } deriving Show
332319
src/Network/API/Mandrill/Users/Types.hs+1−1
@@ -5,12 +5,12 @@ module Network.API.Mandrill.Users.Types where
55import Data.Char
66import Data.Time
77import qualified Data.Text as T
8+import Control.Lens
89import Control.Monad
910import Data.Monoid
1011import Data.Aeson
1112import Data.Aeson.Types
1213import Data.Aeson.TH
13−import Lens.Micro.TH (makeLenses)
1414
1515import Network.API.Mandrill.Types
1616
src/Network/API/Mandrill/Webhooks.hsdeleted−70
@@ -1,70 +0,0 @@
1−{-# LANGUAGE OverloadedStrings #-}
2−{-# LANGUAGE TemplateHaskell #-}
3−module Network.API.Mandrill.Webhooks where
4−import Control.Applicative (pure)
5−import Control.Monad (mzero)
6−import Data.Aeson (FromJSON, ToJSON, parseJSON,
7− toJSON)
8−import Data.Aeson (Value (String))
9−import Data.Aeson.TH (defaultOptions, deriveJSON)
10−import Data.Aeson.Types (fieldLabelModifier)
11−import Data.Set (Set)
12−import Data.Text (Text)
13−import qualified Data.Text as T
14−import Lens.Micro.TH (makeLenses)
15−import Network.API.Mandrill.HTTP (toMandrillResponse)
16−import Network.API.Mandrill.Settings
17−import Network.API.Mandrill.Types
18−import Network.HTTP.Client (Manager)
19−
20−data EventHook
21− = EventSent
22− | EventDeferred
23− | EventHardBounced
24− | EventSoftBounced
25− | EventOpened
26− | EventClicked
27− | EventMarkedAsSpam
28− | EventUnsubscribed
29− | EventRejected
30− deriving (Ord,Eq)
31−
32−instance Show EventHook where
33− show e = case e of
34− EventSent -> "send"
35− EventDeferred -> "deferral"
36− EventSoftBounced -> "soft_bounce"
37− EventHardBounced -> "hard_bounce"
38− EventOpened -> "open"
39− EventClicked -> "click"
40− EventMarkedAsSpam -> "spam"
41− EventUnsubscribed -> "unsub"
42− EventRejected -> "reject"
43−instance FromJSON EventHook where
44− parseJSON (String s) =
45− case s of
46− "send" -> pure EventSent
47− "deferral" -> pure EventDeferred
48− "soft_bounce" -> pure EventSoftBounced
49− "hard_bounce" -> pure EventHardBounced
50− "open" -> pure EventOpened
51− "click" -> pure EventClicked
52− "spam" -> pure EventMarkedAsSpam
53− "reject" -> pure EventRejected
54− "unsub" -> pure EventUnsubscribed
55− x -> fail ("can't parse " ++ show x)
56−
57−
58−instance ToJSON EventHook where
59− toJSON e = String (T.pack $ show e)
60−
61−data WebhookAddRq =
62− WebhookAddRq
63− { _warq_key :: MandrillKey
64− , _warq_url :: Text
65− , _warq_description :: Text
66− , _warq_events :: Set EventHook
67− } deriving Show
68−
69−makeLenses ''WebhookAddRq
70−deriveJSON defaultOptions { fieldLabelModifier = drop 6 } ''WebhookAddRq
stack.yaml+1−1
@@ -2,4 +2,4 @@ flags: {}
22packages:
33- '.'
44extra-deps: []
5−resolver: lts-11.13
5+resolver: lts-2.19
test/Main.hs+7−13
@@ -1,14 +1,14 @@
11{-# LANGUAGE OverloadedStrings #-}
22module Main where
33
4+import System.Environment
45import Data.Monoid
5−import qualified Data.Text as T
6+import Tests
67import Online
7−import System.Environment
88import Test.Tasty
99import Test.Tasty.HUnit
1010import Test.Tasty.QuickCheck
11−import Tests
11+import qualified Data.Text as T
1212
1313----------------------------------------------------------------------
1414withQuickCheckDepth :: TestName -> Int -> [TestTree] -> TestTree
@@ -23,12 +23,10 @@ onlineTestsIfEnabled = do
2323 Nothing -> return []
2424 Just k -> return [
2525 testGroup "Mandrill online tests" [
26− testCase "users/info.json" (testOnlineUsersInfo k)
27− , testCase "users/ping2.json" (testOnlineUsersPing2 k)
28− , testCase "users/senders.json" (testOnlineUsersSenders k)
29− , testCase "messages/send.json" (testOnlineMessagesSend k)
30− , testCase "inbound/addDomain.json" (testOnlineDomainAdd k)
31− , testCase "inbound/addRoute.json" (testOnlineRouteAdd k)
26+ testCase "users/info.json" (testOnlineUsersInfo k)
27+ , testCase "users/ping2.json" (testOnlineUsersPing2 k)
28+ , testCase "users/senders.json" (testOnlineUsersSenders k)
29+ , testCase "messages/send.json" (testOnlineMessagesSend k)
3230 ]]
3331
3432----------------------------------------------------------------------
@@ -42,9 +40,5 @@ main = do
4240 , testCase "users/senders.json API parsing" testUsersSenders
4341 , testCase "messages/send.json API parsing" testMessagesSend
4442 , testCase "messages/send.json API response parsing" testMessagesResponseRejected
45− , testCase "inbound/add-route.json API response parsing" testRouteAdd
46− , testCase "inbound/add-domain.json API response parsing" testDomainAdd
47− , testCase "senders/verify-domain.json API response parsing" testVerifyDomain
48− , testCase "webhooks/add.json API response parsing" testWebhookAdd
4943 ]
5044 ]
test/Online.hs+7−25
@@ -1,20 +1,19 @@
11{-# LANGUAGE OverloadedStrings #-}
22module Online where
33
4−import Data.Aeson
5−import qualified Data.ByteString.Char8 as C8
4+import Test.QuickCheck
5+import Test.Tasty.HUnit
6+import Text.RawString.QQ
67import Data.Either
8+import Data.Aeson
79import Network.API.Mandrill.Messages.Types
810import Network.API.Mandrill.Users.Types
11+import qualified Data.ByteString.Char8 as C8
912import RawData
10−import Test.QuickCheck
11−import Test.Tasty.HUnit
12−import Text.RawString.QQ
1313
14−import qualified Network.API.Mandrill.Inbound as API
15−import qualified Network.API.Mandrill.Messages as API
1614import Network.API.Mandrill.Types
17−import qualified Network.API.Mandrill.Users as API
15+import qualified Network.API.Mandrill.Messages as API
16+import qualified Network.API.Mandrill.Users as API
1817
1918--
2019-- Users calls
@@ -51,20 +50,3 @@ testOnlineMessagesSend k = do
5150 case res of
5251 MandrillSuccess _ -> return ()
5352 MandrillFailure e -> fail $ "messages/send.json " ++ show e
54−
55−--
56−-- Inbound calls
57−--
58−testOnlineDomainAdd :: MandrillKey -> Assertion
59−testOnlineDomainAdd k = do
60− res <- API.addDomain k "foobar.com" Nothing
61− case res of
62− MandrillSuccess a -> print a
63− MandrillFailure e -> fail $ "inbound/add-domain.json " ++ show e
64−
65−testOnlineRouteAdd :: MandrillKey -> Assertion
66−testOnlineRouteAdd k = do
67− res <- API.addRoute k "foobar.com" "mail-*" "http://requestb.in/19a4frw1" Nothing
68− case res of
69− MandrillSuccess a -> print a
70− MandrillFailure e -> fail $ "inbound/add-domain.json " ++ show e
test/RawData.hs+4−49
@@ -1,10 +1,10 @@
11{-# LANGUAGE QuasiQuotes #-}
22module RawData where
33
4−import Data.Either
5−import Test.QuickCheck
6−import Test.Tasty.HUnit
7−import Text.RawString.QQ
4+import Test.QuickCheck
5+import Test.Tasty.HUnit
6+import Text.RawString.QQ
7+import Data.Either
88
99usersInfoData :: String
1010usersInfoData = [r|
@@ -210,48 +210,3 @@ messagesResponseRejected = [r|
210210 }
211211]
212212|]
213−
214−
215−domainAdd = [r|
216−{
217− "domain": "inbound.example.com",
218− "created_at": "2013-01-01 15:30:27",
219− "valid_mx": true
220−}
221−|]
222−
223−
224−routeAdd= [r|
225−{
226− "id": "7.23",
227− "pattern": "mailbox-*",
228− "url": "http://example.com/webhook-url"
229−}
230−|]
231−
232−domainVerify = [r|
233−{
234− "status": "example status",
235− "domain": "example domain",
236− "email": "email@domain.com"
237−}
238−|]
239−
240−webhookAdd = [r|
241−{
242− "key": "example key",
243− "url": "http://example/webhook-url",
244− "description": "My Example Webhook",
245− "events": [
246− "send",
247− "deferral",
248− "hard_bounce",
249− "soft_bounce",
250− "open",
251− "click",
252− "spam",
253− "unsub",
254− "reject"
255− ]
256−}
257−|]
test/Tests.hs+2−39
@@ -4,12 +4,9 @@ module Tests where
44import Data.Aeson
55import qualified Data.ByteString.Char8 as C8
66import Data.Either
7−import Network.API.Mandrill.Inbound
87import Network.API.Mandrill.Messages.Types
9−import Network.API.Mandrill.Senders
10−import Network.API.Mandrill.Types
118import Network.API.Mandrill.Users.Types
12−import Network.API.Mandrill.Webhooks
9+import Network.API.Mandrill.Types
1310import RawData
1411import Test.Tasty.HUnit
1512
@@ -20,7 +17,7 @@ isRight _ = True
2017#endif
2118
2219testMessagesSend :: Assertion
23−testMessagesSend =
20+testMessagesSend =
2421 assertBool ("send.json: Parsing failed! " ++ show parsePayload)
2522 (isRight parsePayload)
2623 where
@@ -52,37 +49,3 @@ testMessagesResponseRejected = do
5249 where
5350 parsePayload :: Either String (MandrillResponse [MessagesResponse])
5451 parsePayload = eitherDecodeStrict . C8.pack $ messagesResponseRejected
55−
56−testDomainAdd :: Assertion
57−testDomainAdd =
58− assertBool ("inbound/add-domain.json (response): parsing failed" ++ show parsePayload)
59− (isRight parsePayload)
60− where
61− parsePayload :: Either String DomainAddResponse
62− parsePayload = eitherDecodeStrict . C8.pack $ domainAdd
63−
64−
65−testRouteAdd :: Assertion
66−testRouteAdd =
67− assertBool ("inbound/add-route.json (response): parsing failed" ++ show parsePayload)
68− (isRight parsePayload)
69− where
70− parsePayload :: Either String RouteAddResponse
71− parsePayload = eitherDecodeStrict . C8.pack $ routeAdd
72−
73−testVerifyDomain :: Assertion
74−testVerifyDomain =
75− assertBool ("senders/verify-domain.json" ++ show parsePayload)
76− (isRight parsePayload)
77− where
78− parsePayload :: Either String VerifyDomainResponse
79− parsePayload = eitherDecodeStrict . C8.pack $ domainVerify
80−
81−
82−testWebhookAdd :: Assertion
83−testWebhookAdd =
84− assertBool ("webhooks/add.json (request): parsing failed" ++ show parsePayload)
85− (isRight parsePayload)
86− where
87− parsePayload :: Either String WebhookAddRq
88− parsePayload = eitherDecodeStrict . C8.pack $ webhookAdd