git.iko.soy/typeable/mandrill
on master help sign in
25 files changed+1093−114
since splitsnapshots
unifiedsplit
.gitignore+6−1 .hub+1−1 .travis.yml+13−6 README.md+105 default.nix+24 examples/Send.hs+13 mandrill-nightly.yml+10 mandrill.cabal+22−7 src/Network/API/Mandrill.hs+164 src/Network/API/Mandrill/HTTP.hs+24−10 src/Network/API/Mandrill/Inbound.hs+78 src/Network/API/Mandrill/Messages.hs+26−6 src/Network/API/Mandrill/Messages/Types.hs+14−1 src/Network/API/Mandrill/Senders.hs+45 src/Network/API/Mandrill/Settings.hs+17−7 src/Network/API/Mandrill/Trans.hs+29 src/Network/API/Mandrill/Types.hs+262−36 src/Network/API/Mandrill/Users.hs+6−6 src/Network/API/Mandrill/Users/Types.hs+1−1 src/Network/API/Mandrill/Webhooks.hs+70 stack.yaml+5 test/Main.hs+14−7 test/Online.hs+29−11 test/RawData.hs+59−4 test/Tests.hs+56−10
.gitignore+6−1
@@ -1 +1,6 @@
1−dist
1+dist
2+.cabal-sandbox
3+cabal.sandbox.config
4+shell.nix
5+.stack-work
6+tags
.hub+1−1
@@ -1 +1 @@
1−mandrill
1+mandrill-7.10.1
.travis.yml+13−6
@@ -5,15 +5,17 @@ notifications:
55 email: false
66
77env:
8− - GHCVER=7.6.2 CABALVER=1.16
98 - GHCVER=7.6.3 CABALVER=1.16
109 - GHCVER=7.8.2 CABALVER=1.18
1110 - GHCVER=7.8.3 CABALVER=1.18
12− - GHCVER=head CABALVER=1.20
11+ - GHCVER=7.10.2 CABALVER=1.22
12+ - GHCVER=8.0.1 CABALVER=1.22
13+ - GHCVER=head CABALVER=1.22
1314
1415matrix:
1516 allow_failures:
16− - env: GHCVER=head CABALVER=1.20
17+ - env: GHCVER=8.0.1 CABALVER=1.22
18+ - env: GHCVER=head CABALVER=1.22
1719
1820before_install:
1921 - travis_retry sudo add-apt-repository -y ppa:hvr/ghc
@@ -27,9 +29,9 @@ install:
2729 - cabal install --only-dependencies --enable-tests
2830
2931script:
30− - cabal configure --enable-tests -v2
32+ - cabal configure --enable-tests -v2 --enable-library-coverage
3133 - cabal build
32− - cabal test
34+ - cabal test --show-details=always
3335 - cabal check
3436 - cabal sdist
3537
@@ -41,4 +43,9 @@ script:
4143 else
4244 echo "expected '$SRC_TGZ' not found";
4345 exit 1;
44− fi
46+ fi
47+
48+after_script:
49+ - cabal install hpc-coveralls
50+ - export PATH=/opt/ghc/$GHCVER/bin:$HOME/.cabal/bin:$PATH
51+ - hpc-coveralls --coverage-mode=StrictlyFullLines mandrill-tests
README.md+105
@@ -1,10 +1,102 @@
11[![Build Status](https://travis-ci.org/adinapoli/mandrill.svg?branch=master)](https://travis-ci.org/adinapoli/mandrill)
2+[![Coverage Status](https://img.shields.io/coveralls/adinapoli/mandrill.svg)](https://coveralls.io/r/adinapoli/mandrill)
23
34# Haskell Client for the Mandrill JSON API
45
56This module implement a low-level, 1:1 mapping API to
67the [Mandrill](http://mandrillapp.com) transactional email service.
78
9+# Changelog
10+
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+
51+## Version 0.5.0.0
52+
53+* Changed the `MandrillHeaders` type synonym from `Value` to `Object`.
54+
55+* Changed the `mmsg_metadata` and `mmdt_values` fields from `MandrillVars` to `Object`.
56+
57+* Changed the `mmsg_global_merge_vars` and `mmvr_vars` fields from `[MandrillVars]` to `[MergeVar]`
58+
59+* Added the `MergeVar` data type:
60+
61+```haskell
62+data MergeVar = MergeVar {
63+ _mv_name :: !Text
64+ , _mv_content :: Value
65+ }
66+```
67+
68+* Removed the `MandrillVars` type synonym.
69+
70+## Version 0.4.0.0
71+
72+* Modified the `Base64ByteString` type to accept another constructor. This
73+ allows the user to pass already-encoded Base64 strings which might be coming
74+ upstream.
75+
76+# Example
77+
78+This package was built with pragmatism and reuse in mind. This means
79+this API comes in two flavours: an IO-based and an handy monad transformer
80+which can be plugged in your stack of choice.
81+Example:
82+
83+``` haskell
84+{-# LANGUAGE OverloadedStrings #-}
85+import Text.Email.Validate
86+import Network.API.Mandrill
87+
88+main :: IO ()
89+main = do
90+ case validate "foo@example.com" of
91+ Left err -> print $ "Invalid email!" ++ show err
92+ Right addr -> runMandrill "MYTOKENHERE" $ do
93+ let msg = "<p>My Html</p>"
94+ res <- sendEmail (newTextMessage addr [addr] "Hello" msg)
95+ case res of
96+ MandrillSuccess k -> liftIO (print k)
97+ MandrillFailure f -> liftIO (print f)
98+```
99+
8100# Supported API versions
9101
10102* 1.0 (partially)
@@ -13,9 +105,17 @@ the [Mandrill](http://mandrillapp.com) transactional email service.
13105 + ~~ping.json~~ (as **doesn't return valid json!**)
14106 + ping2.json
15107 + senders.json
108+
16109 - [Messages call](https://mandrillapp.com/api/docs/messages.JSON.html)
17110 + send.json
18111
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+
19119# Testing online API
20120
21121To test the online API, first build the package with tests enabled:
@@ -35,3 +135,8 @@ And finally execute the testsuite:
35135```
36136cabal test
37137```
138+
139+# Contributions
140+This library scratches my own itches, but please fork away!
141+Pull requests are encouraged to implement the part of the API
142+you need.
default.nixnew file+24
@@ -0,0 +1,24 @@
1+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
2+
3+{ cabal, aeson, base64Bytestring, blazeHtml, emailValidate, lens
4+, mtl, QuickCheck, rawStringsQq, tasty, tastyHunit, tastyQuickcheck
5+, text, time, wreq
6+}:
7+
8+cabal.mkDerivation (self: {
9+ pname = "mandrill";
10+ version = "0.1.0.3";
11+ src = ./.;
12+ buildDepends = [
13+ aeson base64Bytestring blazeHtml emailValidate lens mtl QuickCheck
14+ text time wreq
15+ ];
16+ testDepends = [
17+ aeson QuickCheck rawStringsQq tasty tastyHunit tastyQuickcheck text
18+ ];
19+ meta = {
20+ description = "Library for interfacing with the Mandrill JSON API";
21+ license = self.stdenv.lib.licenses.mit;
22+ platforms = self.ghc.meta.platforms;
23+ };
24+})
examples/Send.hsnew file+13
@@ -0,0 +1,13 @@
1+{-# LANGUAGE OverloadedStrings #-}
2+import Text.Email.Validate
3+import Network.API.Mandrill
4+
5+main :: IO ()
6+main = case validate "foo@example.com" of
7+ Left err -> print $ "Invalid email!" ++ show err
8+ Right addr -> runMandrill "SUPER-SECRET-TOKEN" $ do
9+ let msg = "<p>My Html</p>"
10+ res <- sendEmail (newTextMessage addr [addr] "Hello" msg)
11+ case res of
12+ MandrillSuccess k -> liftIO (print k)
13+ MandrillFailure f -> liftIO (print f)
mandrill-nightly.ymlnew file+10
@@ -0,0 +1,10 @@
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+22−7
@@ -1,5 +1,5 @@
11name: mandrill
2−version: 0.1.0.0
2+version: 0.5.3.5
33synopsis: Library for interfacing with the Mandrill JSON API
44description: Pure Haskell client for the Mandrill JSON API
55license: MIT
@@ -8,6 +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
1112cabal-version: >=1.10
1213
1314source-repository head
@@ -16,30 +17,44 @@ source-repository head
1617
1718library
1819 exposed-modules:
20+ Network.API.Mandrill
1921 Network.API.Mandrill.Settings
2022 Network.API.Mandrill.Types
23+ Network.API.Mandrill.Trans
2124 Network.API.Mandrill.Users
2225 Network.API.Mandrill.Users.Types
2326 Network.API.Mandrill.Messages
2427 Network.API.Mandrill.Messages.Types
28+ Network.API.Mandrill.Inbound
29+ Network.API.Mandrill.Webhooks
30+ Network.API.Mandrill.Senders
2531 other-modules:
2632 Network.API.Mandrill.Utils
2733 Network.API.Mandrill.HTTP
2834 -- other-extensions:
2935 build-depends:
3036 base >=4.6 && < 5
31− , text >= 1.0.0.0 && < 1.2
32− , wreq >= 0.1.0.1
33− , aeson >= 0.7.0.3 && < 0.8
34− , lens >= 4.1 && < 4.6
37+ , containers >= 0.5.0.0
38+ , bytestring >= 0.9.0
39+ , base64-bytestring >= 1.0.0.1
40+ , text >= 1.0.0.0 && < 1.3
41+ , http-types >= 0.8.0
42+ , http-client >= 0.3.0
43+ , http-client-tls >= 0.2.0.0
44+ , aeson >= 0.7.0.3 && < 1.5.0.0
45+ , microlens-th >= 0.4.0.0
3546 , blaze-html >= 0.5.0.0
36− , QuickCheck >= 2.6 && < 2.8
47+ , QuickCheck >= 2.6 && < 3.0
48+ , mtl < 3.0
3749 , time
50+ , email-validate >= 1.0.0
3851 , old-locale
52+ , unordered-containers
3953 hs-source-dirs:
4054 src
4155 default-language:
4256 Haskell2010
57+
4358 ghc-options:
4459 -funbox-strict-fields
4560
@@ -62,7 +77,7 @@ test-suite mandrill-tests
6277 , aeson
6378 , bytestring
6479 , QuickCheck
65− , tasty >= 0.7 && < 0.9
80+ , tasty >= 0.9.0.1
6681 , tasty-quickcheck
6782 , tasty-hunit
6883 , raw-strings-qq < 1.2
src/Network/API/Mandrill.hsnew file+164
@@ -0,0 +1,164 @@
1+{-| This package is an attempt to expose the Mandrill JSON API in pure Haskell.
2+ To do that, the library API comes in two flavours:
3+
4+ * An IO-based, low-level 1:1 mapping of the JSON API,
5+ as described on <https://mandrillapp.com/api/docs/ the website>.
6+ * A handy monad transformer which can be plugged in your stack of choice.
7+-}
8+
9+module Network.API.Mandrill (
10+ module M
11+ , sendEmail
12+ , sendTextEmail
13+ , emptyMessage
14+ , newTextMessage
15+ , newHtmlMessage
16+ , newTemplateMessage
17+ , liftIO
18+
19+ -- * Appendix: Example Usage
20+ -- $exampleusage
21+ ) where
22+
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
35+
36+{- $exampleusage
37+
38+The API was designed to allow to get you started as quickly as possible:
39+
40+> {-# LANGUAGE OverloadedStrings #-}
41+> import Text.Email.Validate
42+> import Network.API.Mandrill
43+>
44+> main :: IO ()
45+> main = do
46+> case validate "foo@example.com" of
47+> Left err -> print $ "Invalid email!" ++ show err
48+> Right addr -> runMandrill "MYTOKENHERE" $ do
49+> let msg = "<p>My Html</p>"
50+> res <- sendEmail (newTextMessage addr [addr] "Hello" msg)
51+> case res of
52+> MandrillSuccess k -> liftIO (print k)
53+> MandrillFailure f -> liftIO (print f)
54+
55+-}
56+
57+--------------------------------------------------------------------------------
58+-- | Builds an empty message, given only the email of the sender and
59+-- the emails of the receiver. Please note that the "Subject" will be empty,
60+-- so you need to use either @newTextMessage@ or @newHtmlMessage@ to populate it.
61+emptyMessage :: EmailAddress -> [EmailAddress] -> MandrillMessage
62+emptyMessage f t = MandrillMessage {
63+ _mmsg_html = mempty
64+ , _mmsg_text = Nothing
65+ , _mmsg_subject = T.empty
66+ , _mmsg_from_email = (MandrillEmail f)
67+ , _mmsg_from_name = Nothing
68+ , _mmsg_to = map newRecipient t
69+ , _mmsg_headers = H.empty
70+ , _mmsg_important = Nothing
71+ , _mmsg_track_opens = Nothing
72+ , _mmsg_track_clicks = Nothing
73+ , _mmsg_auto_text = Nothing
74+ , _mmsg_auto_html = Nothing
75+ , _mmsg_inline_css = Nothing
76+ , _mmsg_url_strip_qs = Nothing
77+ , _mmsg_preserve_recipients = Nothing
78+ , _mmsg_view_content_link = Nothing
79+ , _mmsg_bcc_address = Nothing
80+ , _mmsg_tracking_domain = Nothing
81+ , _mmsg_signing_domain = Nothing
82+ , _mmsg_return_path_domain = Nothing
83+ , _mmsg_merge = Nothing
84+ , _mmsg_global_merge_vars = []
85+ , _mmsg_merge_vars = []
86+ , _mmsg_tags = []
87+ , _mmsg_subaccount = Nothing
88+ , _mmsg_google_analytics_domains = []
89+ , _mmsg_google_analytics_campaign = Nothing
90+ , _mmsg_metadata = H.empty
91+ , _mmsg_recipient_metadata = []
92+ , _mmsg_attachments = []
93+ , _mmsg_images = []
94+ }
95+
96+
97+--------------------------------------------------------------------------------
98+-- | Create a new HTML message.
99+newHtmlMessage :: EmailAddress
100+ -- ^ Sender email
101+ -> [EmailAddress]
102+ -- ^ Receivers email
103+ -> T.Text
104+ -- ^ Subject
105+ -> Html
106+ -- ^ The HTML body
107+ -> MandrillMessage
108+newHtmlMessage f t subj html = let body = mkMandrillHtml html in
109+ (emptyMessage f t) { _mmsg_html = body, _mmsg_subject = subj }
110+
111+--------------------------------------------------------------------------------
112+-- | Create a new template message (no HTML).
113+newTemplateMessage :: EmailAddress
114+ -- ^ Sender email
115+ -> [EmailAddress]
116+ -- ^ Receivers email
117+ -> T.Text
118+ -- ^ Subject
119+ -> MandrillMessage
120+newTemplateMessage f t subj = (emptyMessage f t) { _mmsg_subject = subj }
121+
122+--------------------------------------------------------------------------------
123+-- | Create a new textual message. By default Mandrill doesn't require you
124+-- to specify the @mmsg_text@ when sending out the JSON Payload, and this
125+-- function ensure it will be present.
126+newTextMessage :: EmailAddress
127+ -- ^ Sender email
128+ -> [EmailAddress]
129+ -- ^ Receivers email
130+ -> T.Text
131+ -- ^ Subject
132+ -> T.Text
133+ -- ^ The body, as normal text.
134+ -> MandrillMessage
135+newTextMessage 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+ }
141+
142+
143+--------------------------------------------------------------------------------
144+-- | The simplest way to use the API. All you need to provide is a valid
145+-- 'MandrillMessage' and this function will send an email inside a
146+-- 'MandrillT' transformer. You are not forced to use the 'MandrillT' context
147+-- though. Have a look at "Network.API.Mandrill.Messages" for an IO-based,
148+-- low level function for sending email.
149+sendEmail :: MonadIO m
150+ => MandrillMessage
151+ -> MandrillT m (MandrillResponse [MessagesResponse])
152+sendEmail msg = do
153+ (key, mgr) <- ask
154+ liftIO $ send key msg (Just True) Nothing Nothing (Just mgr)
155+
156+
157+--------------------------------------------------------------------------------
158+sendTextEmail :: MonadIO m
159+ => MandrillMessage
160+ -> MandrillT m (MandrillResponse [MessagesResponse])
161+sendTextEmail msg = do
162+ (key, mgr) <- ask
163+ now <- liftIO getCurrentTime
164+ liftIO $ send key msg (Just True) Nothing (Just now) (Just mgr)
src/Network/API/Mandrill/HTTP.hs+24−10
@@ -1,19 +1,33 @@
11{-# LANGUAGE OverloadedStrings #-}
22module Network.API.Mandrill.HTTP where
33
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 Network.Wreq
10−import Control.Lens
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
1113
1214toMandrillResponse :: (MandrillEndpoint ep, FromJSON a, ToJSON rq)
1315 => ep
1416 -> rq
17+ -> Maybe Manager
1518 -> IO (MandrillResponse a)
16−toMandrillResponse ep rq = do
19+toMandrillResponse ep rq mbMgr = do
1720 let fullUrl = mandrillUrl <> toUrl ep
18− res <- asJSON =<< post (T.unpack fullUrl) (toJSON rq)
19− return $ res ^. responseBody
21+ rq' <- parseUrl (T.unpack fullUrl)
22+ let headers = [(hContentType, "application/json")]
23+ let jsonBody = encode rq
24+ let req = rq' {
25+ method = "POST"
26+ , requestHeaders = headers
27+ , requestBody = RequestBodyLBS jsonBody
28+ }
29+ mgr <- maybe (newManager tlsManagerSettings) return mbMgr
30+ res <- responseBody <$> httpLbs req mgr
31+ case eitherDecode res of
32+ Left e -> fail e
33+ Right v -> return v
src/Network/API/Mandrill/Inbound.hsnew file+78
@@ -0,0 +1,78 @@
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+26−6
@@ -1,12 +1,13 @@
11
22module Network.API.Mandrill.Messages where
33
4−import Network.API.Mandrill.Types
4+import qualified Data.Text as T
5+import Data.Time
6+import Network.API.Mandrill.HTTP
57import Network.API.Mandrill.Messages.Types
68import Network.API.Mandrill.Settings
7−import Network.API.Mandrill.HTTP
8−import Data.Time
9−import qualified Data.Text as T
9+import Network.API.Mandrill.Types
10+import Network.HTTP.Client
1011
1112--------------------------------------------------------------------------------
1213-- | Send a new transactional message through Mandrill
@@ -20,6 +21,25 @@ send :: MandrillKey
2021 -- ^ ip_pool
2122 -> Maybe UTCTime
2223 -- ^ send_at
24+ -> Maybe Manager
2325 -> IO (MandrillResponse [MessagesResponse])
24−send k msg async ip_pool send_at =
25− toMandrillResponse MessagesSend (MessagesSendRq k msg async ip_pool send_at)
26+send k msg async ip_pool send_at = toMandrillResponse MessagesSend (MessagesSendRq k msg async ip_pool send_at)
27+
28+-- | Send a new transactional message through Mandrill using a template
29+sendTemplate :: MandrillKey
30+ -- ^ The API key
31+ -> MandrillTemplate
32+ -- ^ The template name
33+ -> [MandrillTemplateContent]
34+ -- ^ Template content for 'editable regions'
35+ -> MandrillMessage
36+ -- ^ The email message
37+ -> Maybe Bool
38+ -- ^ Enable a background sending mode that is optimized for bulk sending
39+ -> Maybe T.Text
40+ -- ^ ip_pool
41+ -> Maybe UTCTime
42+ -- ^ send_at
43+ -> Maybe Manager
44+ -> IO (MandrillResponse [MessagesResponse])
45+sendTemplate k template content msg async ip_pool send_at = toMandrillResponse MessagesSendTemplate (MessagesSendTemplateRq k template content msg async ip_pool send_at)
src/Network/API/Mandrill/Messages/Types.hs+14−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
98import Control.Monad
109import Data.Monoid
1110import Data.Aeson
1211import Data.Aeson.Types
1312import Data.Aeson.TH
13+import Lens.Micro.TH (makeLenses)
1414
1515import Network.API.Mandrill.Types
1616
@@ -27,6 +27,19 @@ data MessagesSendRq = MessagesSendRq {
2727makeLenses ''MessagesSendRq
2828deriveJSON defaultOptions { fieldLabelModifier = drop 6 } ''MessagesSendRq
2929
30+--------------------------------------------------------------------------------
31+data MessagesSendTemplateRq = MessagesSendTemplateRq {
32+ _mstrq_key :: MandrillKey
33+ , _mstrq_template_name :: T.Text
34+ , _mstrq_template_content :: [MandrillTemplateContent]
35+ , _mstrq_message :: MandrillMessage
36+ , _mstrq_async :: Maybe Bool
37+ , _mstrq_ip_pool :: Maybe T.Text
38+ , _mstrq_send_at :: Maybe UTCTime
39+ } deriving Show
40+
41+makeLenses ''MessagesSendTemplateRq
42+deriveJSON defaultOptions { fieldLabelModifier = drop 7 } ''MessagesSendTemplateRq
3043
3144--------------------------------------------------------------------------------
3245data MessagesResponse = MessagesResponse {
src/Network/API/Mandrill/Senders.hsnew file+45
@@ -0,0 +1,45 @@
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+17−7
@@ -15,16 +15,26 @@ data MandrillCalls =
1515 -- Messages API
1616 | MessagesSend
1717 | MessagesSendTemplate
18− | MessagesSearch deriving Show
18+ | MessagesSearch
19+ -- Inbound API
20+ | RoutesAdd
21+ | DomainsAdd
22+ -- Senders API
23+ | VerifyDomain
24+
25+ deriving Show
1926
2027class MandrillEndpoint ep where
2128 toUrl :: ep -> T.Text
2229
2330instance MandrillEndpoint MandrillCalls where
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"
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"
2936 toUrl MessagesSendTemplate = "messages/send-template.json"
30− toUrl MessagesSearch = "messages/search.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"
src/Network/API/Mandrill/Trans.hsnew file+29
@@ -0,0 +1,29 @@
1+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
2+module Network.API.Mandrill.Trans where
3+
4+import Control.Monad.Reader
5+import Control.Applicative
6+import Network.API.Mandrill.Types
7+import Network.HTTP.Client
8+import Network.HTTP.Client.TLS
9+
10+
11+--------------------------------------------------------------------------------
12+newtype MandrillT m a = MandrillT {
13+ runMandrillT :: ReaderT (MandrillKey, Manager) m a
14+ } deriving (MonadTrans, MonadReader (MandrillKey, Manager),
15+ Functor, Applicative, Monad, MonadIO)
16+
17+
18+--------------------------------------------------------------------------------
19+type Mandrill = MandrillT IO
20+
21+
22+--------------------------------------------------------------------------------
23+runMandrill :: MonadIO m
24+ => MandrillKey
25+ -> MandrillT m a
26+ -> m a
27+runMandrill key action = do
28+ mgr <- liftIO $ newManager tlsManagerSettings
29+ runReaderT (runMandrillT action) (key, mgr)
src/Network/API/Mandrill/Types.hs+262−36
@@ -1,34 +1,59 @@
1−{-# LANGUAGE TemplateHaskell #-}
2−{-# LANGUAGE RankNTypes #-}
1+{-# LANGUAGE CPP #-}
2+{-# LANGUAGE DeriveFoldable #-}
3+{-# LANGUAGE DeriveFunctor #-}
4+{-# LANGUAGE DeriveTraversable #-}
5+{-# LANGUAGE OverloadedStrings #-}
6+{-# LANGUAGE RankNTypes #-}
37{-# LANGUAGE ScopedTypeVariables #-}
4−{-# LANGUAGE OverloadedStrings #-}
8+{-# LANGUAGE TemplateHaskell #-}
59module Network.API.Mandrill.Types where
610
7−import Network.API.Mandrill.Utils
8−import Test.QuickCheck
11+import Control.Applicative
12+import Control.Monad (mzero)
913import Data.Char
14+import Data.Maybe
1015import Data.Time
11−import Control.Applicative
12−import System.Locale (defaultTimeLocale)
13−import qualified Data.Text as T
14−import qualified Data.Text.Lazy as TL
15−import Control.Lens
16−import Control.Monad
17−import Data.Monoid
16+import Lens.Micro.TH (makeLenses)
17+import Network.API.Mandrill.Utils
18+import Test.QuickCheck
19+import Text.Email.Validate
20+#if MIN_VERSION_time(1,5,0)
21+import Data.Time.Format (TimeLocale, defaultTimeLocale)
22+#else
23+import System.Locale (TimeLocale, defaultTimeLocale)
24+#endif
1825import Data.Aeson
19−import Data.Aeson.Types
2026import Data.Aeson.TH
21−import qualified Text.Blaze.Html as Blaze
27+import 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
2240import qualified Text.Blaze.Html.Renderer.Text as Blaze
41+import qualified Text.Email.Validate as TEV
2342
43+timeParse :: ParseTime t => TimeLocale -> String -> String -> Maybe t
44+#if MIN_VERSION_time(1,5,0)
45+timeParse = parseTimeM True
46+#else
47+timeParse = parseTime
48+#endif
2449
2550--------------------------------------------------------------------------------
2651data MandrillError = MandrillError {
27− _merr_status :: !T.Text
28− , _merr_code :: !Int
29− , _merr_name :: !T.Text
52+ _merr_status :: !T.Text
53+ , _merr_code :: !Int
54+ , _merr_name :: !T.Text
3055 , _merr_message :: !T.Text
31− } deriving Show
56+ } deriving (Show, Eq)
3257
3358makeLenses ''MandrillError
3459deriveJSON defaultOptions { fieldLabelModifier = drop 6 } ''MandrillError
@@ -53,6 +78,7 @@ data MandrillRejectReason = RR_HardBounce
5378 | RR_InvalidSender
5479 | RR_Invalid
5580 | RR_TestModeLimit
81+ | RR_Unsigned
5682 | RR_Rule deriving Show
5783
5884deriveJSON defaultOptions {
@@ -65,7 +91,7 @@ deriveJSON defaultOptions {
6591-- which can be either a success or a failure.
6692data MandrillResponse k =
6793 MandrillSuccess k
68− | MandrillFailure MandrillError deriving Show
94+ | MandrillFailure MandrillError deriving (Show, Eq, Functor, Foldable, Traversable)
6995
7096instance FromJSON k => FromJSON (MandrillResponse k) where
7197 parseJSON v = case (parseMaybe parseJSON v) :: Maybe k of
@@ -83,14 +109,27 @@ data MandrillRecipientTag = To | Cc | Bcc deriving Show
83109deriveJSON defaultOptions { constructorTagModifier = map toLower } ''MandrillRecipientTag
84110
85111
112+--------------------------------------------------------------------------------
113+newtype MandrillEmail = MandrillEmail EmailAddress deriving Show
114+
115+instance ToJSON MandrillEmail where
116+ toJSON (MandrillEmail e) = String . TL.decodeUtf8 . toByteString $ e
117+
118+instance FromJSON MandrillEmail where
119+ parseJSON (String s) = case validate (TL.encodeUtf8 s) of
120+ Left err -> fail err
121+ Right v -> return . MandrillEmail $ v
122+ parseJSON o = typeMismatch "Expecting a String for MandrillEmail." o
123+
124+
86125--------------------------------------------------------------------------------
87126-- | An array of recipient information.
88127data MandrillRecipient = MandrillRecipient {
89− _mrec_email :: !T.Text
128+ _mrec_email :: MandrillEmail
90129 -- ^ The email address of the recipient
91− , _mrec_name :: Maybe T.Text
130+ , _mrec_name :: Maybe T.Text
92131 -- ^ The optional display name to use for the recipient
93− , _mrec_type :: Maybe MandrillRecipientTag
132+ , _mrec_type :: Maybe MandrillRecipientTag
94133 -- ^ The header type to use for the recipient.
95134 -- defaults to "to" if not provided
96135 } deriving Show
@@ -98,17 +137,35 @@ data MandrillRecipient = MandrillRecipient {
98137makeLenses ''MandrillRecipient
99138deriveJSON defaultOptions { fieldLabelModifier = drop 6 } ''MandrillRecipient
100139
140+newRecipient :: EmailAddress -> MandrillRecipient
141+newRecipient email = MandrillRecipient (MandrillEmail email) Nothing Nothing
142+
101143instance Arbitrary MandrillRecipient where
102− arbitrary = pure $ MandrillRecipient "test@example.com" Nothing Nothing
144+ arbitrary = pure MandrillRecipient {
145+ _mrec_email = MandrillEmail $ fromJust (emailAddress "test@example.com")
146+ , _mrec_name = Nothing
147+ , _mrec_type = Nothing
148+ }
103149
104150--------------------------------------------------------------------------------
105151newtype MandrillHtml = MandrillHtml Blaze.Html
106152
107−mkMandrillHtml :: T.Text -> MandrillHtml
108−mkMandrillHtml = MandrillHtml . Blaze.toHtml
153+unsafeMkMandrillHtml :: T.Text -> MandrillHtml
154+unsafeMkMandrillHtml = MandrillHtml . Blaze.preEscapedToHtml
109155
110−mkMandrillHtml' :: Blaze.Html -> MandrillHtml
111−mkMandrillHtml' = MandrillHtml
156+-- This might be slightly hairy because it violates
157+-- the nice encapsulation that newtypes offer.
158+mkMandrillHtml :: Blaze.Html -> MandrillHtml
159+mkMandrillHtml = MandrillHtml
160+
161+#if MIN_VERSION_base(4,11,0)
162+instance Semigroup MandrillHtml where
163+ MandrillHtml m1 <> MandrillHtml m2 = MandrillHtml (m1 <> m2)
164+#endif
165+
166+instance Monoid MandrillHtml where
167+ mempty = MandrillHtml mempty
168+ mappend (MandrillHtml m1) (MandrillHtml m2) = MandrillHtml (m1 <> m2)
112169
113170instance Show MandrillHtml where
114171 show (MandrillHtml h) = show $ Blaze.renderHtml h
@@ -117,27 +174,160 @@ instance ToJSON MandrillHtml where
117174 toJSON (MandrillHtml h) = String . TL.toStrict . Blaze.renderHtml $ h
118175
119176instance FromJSON MandrillHtml where
120− parseJSON (String h) = return $ MandrillHtml (Blaze.toHtml h)
177+ parseJSON (String h) = return $ MandrillHtml (Blaze.preEscapedToHtml h)
121178 parseJSON v = typeMismatch "Expecting a String for MandrillHtml" v
122179
123180instance Arbitrary MandrillHtml where
124181 arbitrary = pure $ mkMandrillHtml "<p><b>FooBar</b></p>"
125182
183+--------------------------------------------------------------------------------
184+type MandrillTags = T.Text
185+
186+
187+--------------------------------------------------------------------------------
188+type MandrillHeaders = Object
189+
190+
191+--------------------------------------------------------------------------------
192+
193+data MergeVar = MergeVar {
194+ _mv_name :: !T.Text
195+ , _mv_content :: Value
196+ } deriving Show
197+
198+makeLenses ''MergeVar
199+deriveJSON defaultOptions { fieldLabelModifier = drop 4 } ''MergeVar
200+
201+--------------------------------------------------------------------------------
202+data MandrillMergeVars = MandrillMergeVars {
203+ _mmvr_rcpt :: !T.Text
204+ , _mmvr_vars :: [MergeVar]
205+ } deriving Show
206+
207+makeLenses ''MandrillMergeVars
208+deriveJSON defaultOptions { fieldLabelModifier = drop 6 } ''MandrillMergeVars
209+
210+--------------------------------------------------------------------------------
211+data MandrillMetadata = MandrillMetadata {
212+ _mmdt_rcpt :: !T.Text
213+ , _mmdt_values :: Object
214+ } deriving Show
215+
216+makeLenses ''MandrillMetadata
217+deriveJSON defaultOptions { fieldLabelModifier = drop 6 } ''MandrillMetadata
218+
219+
220+data Base64ByteString =
221+ EncodedB64BS B.ByteString
222+ -- ^ An already-encoded Base64 ByteString.
223+ | PlainBS B.ByteString
224+ -- ^ A plain Base64 ByteString which requires encoding.
225+ deriving Show
226+
227+instance ToJSON Base64ByteString where
228+ toJSON (PlainBS bs) = String . TL.decodeUtf8 . Base64.encode $ bs
229+ toJSON (EncodedB64BS bs) = String . TL.decodeUtf8 $ bs
230+
231+instance FromJSON Base64ByteString where
232+ parseJSON (String v) = pure $ EncodedB64BS (TL.encodeUtf8 v)
233+ parseJSON rest = typeMismatch "Base64ByteString must be a String." rest
234+
235+--------------------------------------------------------------------------------
236+data MandrillWebContent = MandrillWebContent {
237+ _mwct_type :: !T.Text
238+ , _mwct_name :: !T.Text
239+ -- ^ [for images] the Content ID of the image
240+ -- - use <img src="cid:THIS_VALUE"> to reference the image
241+ -- in your HTML content
242+ , _mwct_content :: !Base64ByteString
243+ } deriving Show
244+
245+makeLenses ''MandrillWebContent
246+deriveJSON defaultOptions { fieldLabelModifier = drop 6 } ''MandrillWebContent
247+
126248--------------------------------------------------------------------------------
127249-- | The information on the message to send
128250data MandrillMessage = MandrillMessage {
129− _mmsg_html :: MandrillHtml
251+ _mmsg_html :: MandrillHtml
130252 -- ^ The full HTML content to be sent
131− , _mmsg_text :: Maybe T.Text
253+ , _mmsg_text :: Maybe T.Text
132254 -- ^ Optional full text content to be sent
133− , _mmsg_subject :: !T.Text
255+ , _mmsg_subject :: !T.Text
134256 -- ^ The message subject
135− , _mmsg_from_email :: !T.Text
257+ , _mmsg_from_email :: MandrillEmail
136258 -- ^ The sender email address
137− , _mmsg_from_name :: Maybe T.Text
259+ , _mmsg_from_name :: Maybe T.Text
138260 -- ^ Optional from name to be used
139− , _mmsg_to :: [MandrillRecipient]
261+ , _mmsg_to :: [MandrillRecipient]
140262 -- ^ A list of recipient information
263+ , _mmsg_headers :: MandrillHeaders
264+ -- ^ optional extra headers to add to the message (most headers are allowed)
265+ , _mmsg_important :: Maybe Bool
266+ -- ^ whether or not this message is important, and should be delivered ahead
267+ -- of non-important messages
268+ , _mmsg_track_opens :: Maybe Bool
269+ -- ^ whether or not to turn on open tracking for the message
270+ , _mmsg_track_clicks :: Maybe Bool
271+ -- ^ whether or not to turn on click tracking for the message
272+ , _mmsg_auto_text :: Maybe Bool
273+ -- ^ whether or not to automatically generate a text part for messages that are not given text
274+ , _mmsg_auto_html :: Maybe Bool
275+ -- ^ whether or not to automatically generate an HTML part for messages that are not given HTML
276+ , _mmsg_inline_css :: Maybe Bool
277+ -- ^ whether or not to automatically inline all CSS styles provided in the message HTML
278+ -- - only for HTML documents less than 256KB in size
279+ , _mmsg_url_strip_qs :: Maybe Bool
280+ -- ^ whether or not to strip the query string from URLs when aggregating tracked URL data
281+ , _mmsg_preserve_recipients :: Maybe Bool
282+ -- ^ whether or not to expose all recipients in to "To" header for each email
283+ , _mmsg_view_content_link :: Maybe Bool
284+ -- ^ set to false to remove content logging for sensitive emails
285+ , _mmsg_bcc_address :: Maybe T.Text
286+ -- ^ an optional address to receive an exact copy of each recipient's email
287+ , _mmsg_tracking_domain :: Maybe T.Text
288+ -- ^ a custom domain to use for tracking opens and clicks instead of mandrillapp.com
289+ , _mmsg_signing_domain :: Maybe Bool
290+ -- ^ a custom domain to use for SPF/DKIM signing instead of mandrill
291+ -- (for "via" or "on behalf of" in email clients)
292+ , _mmsg_return_path_domain :: Maybe Bool
293+ -- ^ a custom domain to use for the messages's return-path
294+ , _mmsg_merge :: Maybe Bool
295+ -- ^ whether to evaluate merge tags in the message.
296+ -- Will automatically be set to true if either merge_vars
297+ -- or global_merge_vars are provided.
298+ , _mmsg_global_merge_vars :: [MergeVar]
299+ -- ^ global merge variables to use for all recipients. You can override these per recipient.
300+ , _mmsg_merge_vars :: [MandrillMergeVars]
301+ -- ^ per-recipient merge variables, which override global merge variables with the same name.
302+ , _mmsg_tags :: [MandrillTags]
303+ -- ^ an array of string to tag the message with. Stats are accumulated using tags,
304+ -- though we only store the first 100 we see, so this should not be unique
305+ -- or change frequently. Tags should be 50 characters or less.
306+ -- Any tags starting with an underscore are reserved for internal use
307+ -- and will cause errors.
308+ , _mmsg_subaccount :: Maybe T.Text
309+ -- ^ the unique id of a subaccount for this message
310+ -- - must already exist or will fail with an error
311+ , _mmsg_google_analytics_domains :: [T.Text]
312+ -- ^ an array of strings indicating for which any matching URLs
313+ -- will automatically have Google Analytics parameters appended
314+ -- to their query string automatically.
315+ , _mmsg_google_analytics_campaign :: Maybe T.Text
316+ -- ^ optional string indicating the value to set for the utm_campaign
317+ -- tracking parameter. If this isn't provided the email's from address
318+ -- will be used instead.
319+ , _mmsg_metadata :: Object
320+ -- ^ metadata an associative array of user metadata. Mandrill will store
321+ -- this metadata and make it available for retrieval.
322+ -- In addition, you can select up to 10 metadata fields to index
323+ -- and make searchable using the Mandrill search api.
324+ , _mmsg_recipient_metadata :: [MandrillMetadata]
325+ -- ^ Per-recipient metadata that will override the global values
326+ -- specified in the metadata parameter.
327+ , _mmsg_attachments :: [MandrillWebContent]
328+ -- ^ an array of supported attachments to add to the message
329+ , _mmsg_images :: [MandrillWebContent]
330+ -- ^ an array of embedded images to add to the message
141331 } deriving Show
142332
143333makeLenses ''MandrillMessage
@@ -147,12 +337,48 @@ instance Arbitrary MandrillMessage where
147337 arbitrary = MandrillMessage <$> arbitrary
148338 <*> pure Nothing
149339 <*> pure "Test Subject"
150− <*> pure "sender@example.com"
340+ <*> pure (MandrillEmail . fromJust $ emailAddress "sender@example.com")
151341 <*> pure Nothing
152342 <*> resize 2 arbitrary
343+ <*> pure H.empty
344+ <*> pure Nothing
345+ <*> pure Nothing
346+ <*> pure Nothing
347+ <*> pure Nothing
348+ <*> pure Nothing
349+ <*> pure Nothing
350+ <*> pure Nothing
351+ <*> pure Nothing
352+ <*> pure Nothing
353+ <*> pure Nothing
354+ <*> pure Nothing
355+ <*> pure Nothing
356+ <*> pure Nothing
357+ <*> pure Nothing
358+ <*> pure []
359+ <*> pure []
360+ <*> pure []
361+ <*> pure Nothing
362+ <*> pure []
363+ <*> pure Nothing
364+ <*> pure H.empty
365+ <*> pure []
366+ <*> pure []
367+ <*> pure []
368+
369+--------------------------------------------------------------------------------
370+-- | Key value pair for replacing content in templates via 'Editable Regions'
371+data MandrillTemplateContent = MandrillTemplateContent {
372+ _mtc_name :: T.Text
373+ , _mtc_content :: T.Text
374+ } deriving Show
375+
376+makeLenses ''MandrillTemplateContent
377+deriveJSON defaultOptions { fieldLabelModifier = drop 5 } ''MandrillTemplateContent
153378
154379--------------------------------------------------------------------------------
155380type MandrillKey = T.Text
381+type MandrillTemplate = T.Text
156382
157383newtype MandrillDate = MandrillDate {
158384 fromMandrillDate :: UTCTime
@@ -163,6 +389,6 @@ instance ToJSON MandrillDate where
163389
164390instance FromJSON MandrillDate where
165391 parseJSON = withText "MandrillDate" $ \t ->
166− case parseTime defaultTimeLocale "%Y-%m-%d %I:%M:%S%Q" (T.unpack t) of
392+ case timeParse defaultTimeLocale "%Y-%m-%d %I:%M:%S%Q" (T.unpack t) of
167393 Just d -> pure $ MandrillDate d
168394 _ -> fail "could not parse Mandrill date"
src/Network/API/Mandrill/Users.hs+6−6
@@ -5,28 +5,28 @@ import Network.API.Mandrill.Settings
55import Network.API.Mandrill.HTTP
66import Network.API.Mandrill.Types
77import Network.API.Mandrill.Users.Types
8−import Data.Aeson
8+import Network.HTTP.Client
99
1010
1111--------------------------------------------------------------------------------
1212-- | Return the information about the API-connected user
13−info :: MandrillKey -> IO (MandrillResponse UsersInfoResponse)
13+info :: MandrillKey -> Maybe Manager -> IO (MandrillResponse UsersInfoResponse)
1414info key = toMandrillResponse UsersInfo (UsersRq key)
1515
1616
1717--------------------------------------------------------------------------------
1818-- | Validate an API key and respond to a ping
19−ping :: MandrillKey -> IO (MandrillResponse UsersPingResponse)
20−ping _ = fail "users/ping.json doesn't return valid JSON, thus is not implemented yet."
19+ping :: MandrillKey -> Maybe Manager -> IO (MandrillResponse UsersPingResponse)
20+ping _ _ = fail "users/ping.json doesn't return valid JSON, thus is not implemented yet."
2121
2222
2323--------------------------------------------------------------------------------
2424-- | Validate an API key and respond to a ping (anal JSON parser version)
25−ping2 :: MandrillKey -> IO (MandrillResponse UsersPing2Response)
25+ping2 :: MandrillKey -> Maybe Manager -> IO (MandrillResponse UsersPing2Response)
2626ping2 key = toMandrillResponse UsersPing2 (UsersRq key)
2727
2828
2929--------------------------------------------------------------------------------
3030-- | Return the senders that have tried to use this account, both verified and unverified
31−senders :: MandrillKey -> IO (MandrillResponse [UsersSendersResponse])
31+senders :: MandrillKey -> Maybe Manager -> IO (MandrillResponse [UsersSendersResponse])
3232senders key = toMandrillResponse UsersSenders (UsersRq key)
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
98import Control.Monad
109import Data.Monoid
1110import Data.Aeson
1211import Data.Aeson.Types
1312import Data.Aeson.TH
13+import Lens.Micro.TH (makeLenses)
1414
1515import Network.API.Mandrill.Types
1616
src/Network/API/Mandrill/Webhooks.hsnew file+70
@@ -0,0 +1,70 @@
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.yamlnew file+5
@@ -0,0 +1,5 @@
1+flags: {}
2+packages:
3+- '.'
4+extra-deps: []
5+resolver: lts-11.13
test/Main.hs+14−7
@@ -1,14 +1,14 @@
11{-# LANGUAGE OverloadedStrings #-}
22module Main where
33
4−import System.Environment
54import Data.Monoid
6−import Tests
5+import qualified Data.Text as T
76import Online
7+import System.Environment
88import Test.Tasty
99import Test.Tasty.HUnit
1010import Test.Tasty.QuickCheck
11−import qualified Data.Text as T
11+import Tests
1212
1313----------------------------------------------------------------------
1414withQuickCheckDepth :: TestName -> Int -> [TestTree] -> TestTree
@@ -23,10 +23,12 @@ 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)
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)
3032 ]]
3133
3234----------------------------------------------------------------------
@@ -39,5 +41,10 @@ main = do
3941 testCase "users/info.json API parsing" testUsersInfo
4042 , testCase "users/senders.json API parsing" testUsersSenders
4143 , testCase "messages/send.json API parsing" testMessagesSend
44+ , 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
4249 ]
4350 ]
test/Online.hs+29−11
@@ -1,40 +1,41 @@
11{-# LANGUAGE OverloadedStrings #-}
22module Online where
33
4−import Test.QuickCheck
5−import Test.Tasty.HUnit
6−import Text.RawString.QQ
7−import Data.Either
84import Data.Aeson
5+import qualified Data.ByteString.Char8 as C8
6+import Data.Either
97import Network.API.Mandrill.Messages.Types
108import Network.API.Mandrill.Users.Types
11−import qualified Data.ByteString.Char8 as C8
129import 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
1416import Network.API.Mandrill.Types
15−import qualified Network.API.Mandrill.Messages as API
16−import qualified Network.API.Mandrill.Users as API
17+import qualified Network.API.Mandrill.Users as API
1718
1819--
1920-- Users calls
2021--
2122testOnlineUsersInfo :: MandrillKey -> Assertion
2223testOnlineUsersInfo k = do
23− res <- API.info k
24+ res <- API.info k Nothing
2425 case res of
2526 MandrillSuccess _ -> return ()
2627 MandrillFailure e -> fail $ "users/info.json " ++ show e
2728
2829testOnlineUsersPing2 :: MandrillKey -> Assertion
2930testOnlineUsersPing2 k = do
30− res <- API.ping2 k
31+ res <- API.ping2 k Nothing
3132 case res of
3233 MandrillSuccess _ -> return ()
3334 MandrillFailure e -> fail $ "users/ping2.json " ++ show e
3435
3536testOnlineUsersSenders :: MandrillKey -> Assertion
3637testOnlineUsersSenders k = do
37− res <- API.senders k
38+ res <- API.senders k Nothing
3839 case res of
3940 MandrillSuccess _ -> return ()
4041 MandrillFailure e -> fail $ "users/senders.json " ++ show e
@@ -46,7 +47,24 @@ testOnlineUsersSenders k = do
4647testOnlineMessagesSend :: MandrillKey -> Assertion
4748testOnlineMessagesSend k = do
4849 msg <- generate arbitrary
49− res <- API.send k msg Nothing Nothing Nothing
50+ res <- API.send k msg Nothing Nothing Nothing Nothing
5051 case res of
5152 MandrillSuccess _ -> return ()
5253 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+59−4
@@ -1,10 +1,10 @@
11{-# LANGUAGE QuasiQuotes #-}
22module RawData where
33
4−import Test.QuickCheck
5−import Test.Tasty.HUnit
6−import Text.RawString.QQ
7−import Data.Either
4+import Data.Either
5+import Test.QuickCheck
6+import Test.Tasty.HUnit
7+import Text.RawString.QQ
88
99usersInfoData :: String
1010usersInfoData = [r|
@@ -200,3 +200,58 @@ sendData = [r|
200200 "send_at": "2014-08-17T14:23:02.954Z"
201201}
202202|]
203+
204+
205+messagesResponseRejected = [r|
206+[ { "email" : "foo@bar.com",
207+ "status" : "rejected",
208+ "_id" : "abc123",
209+ "reject_reason": "unsigned"
210+ }
211+]
212+|]
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+56−10
@@ -1,15 +1,17 @@
11{-# LANGUAGE CPP #-}
22module Tests where
33
4−import Test.QuickCheck
5−import Test.Tasty.HUnit
6−import Text.RawString.QQ
7−import Data.Either
8−import Data.Aeson
9−import Network.API.Mandrill.Messages.Types
10−import Network.API.Mandrill.Users.Types
11−import qualified Data.ByteString.Char8 as C8
12−import RawData
4+import Data.Aeson
5+import qualified Data.ByteString.Char8 as C8
6+import Data.Either
7+import Network.API.Mandrill.Inbound
8+import Network.API.Mandrill.Messages.Types
9+import Network.API.Mandrill.Senders
10+import Network.API.Mandrill.Types
11+import Network.API.Mandrill.Users.Types
12+import Network.API.Mandrill.Webhooks
13+import RawData
14+import Test.Tasty.HUnit
1315
1416#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ <= 706
1517isRight :: Either a b -> Bool
@@ -18,7 +20,9 @@ isRight _ = True
1820#endif
1921
2022testMessagesSend :: Assertion
21−testMessagesSend = assertBool "send.json: Parsing failed!" (isRight parsePayload)
23+testMessagesSend =
24+ assertBool ("send.json: Parsing failed! " ++ show parsePayload)
25+ (isRight parsePayload)
2226 where
2327 parsePayload :: Either String MessagesSendRq
2428 parsePayload = eitherDecodeStrict . C8.pack $ sendData
@@ -40,3 +44,45 @@ testUsersSenders = do
4044 where
4145 parsePayload :: Either String UsersSendersResponse
4246 parsePayload = eitherDecodeStrict . C8.pack $ usersSendersData
47+
48+testMessagesResponseRejected :: Assertion
49+testMessagesResponseRejected = do
50+ assertBool ("send.json response: Parsing failed" ++ show parsePayload)
51+ (isRight parsePayload)
52+ where
53+ parsePayload :: Either String (MandrillResponse [MessagesResponse])
54+ 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