git.iko.soy/typeable/mandrill
on ceec6d1 help sign in
f90e466
swap
0 ahead, 53 behind
.gitignore−1
since splitsnapshots
unifiedsplit
@@ -3,4 +3,3 @@ dist
3cabal.sandbox.config
3cabal.sandbox.config
4shell.nix
4shell.nix
5.stack-work
5.stack-work
6−tags
.travis.yml+4−4
@@ -5,17 +5,17 @@ notifications:
5 email: false
5 email: false
6
6
7env:
7env:
8+ - GHCVER=7.6.2 CABALVER=1.16
8 - GHCVER=7.6.3 CABALVER=1.16
9 - GHCVER=7.6.3 CABALVER=1.16
9 - GHCVER=7.8.2 CABALVER=1.18
10 - GHCVER=7.8.2 CABALVER=1.18
10 - GHCVER=7.8.3 CABALVER=1.18
11 - GHCVER=7.8.3 CABALVER=1.18
12+ - GHCVER=7.10.1 CABALVER=1.22
11 - GHCVER=7.10.2 CABALVER=1.22
13 - 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
14
15
15matrix:
16matrix:
16 allow_failures:
17 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
19
19
20before_install:
20before_install:
21 - travis_retry sudo add-apt-repository -y ppa:hvr/ghc
21 - travis_retry sudo add-apt-repository -y ppa:hvr/ghc
README.md−67
@@ -8,65 +8,6 @@ the [Mandrill](http://mandrillapp.com) transactional email service.
8
8
9# Changelog
9# Changelog
10
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
11## Version 0.4.0.0
71
12
72* Modified the `Base64ByteString` type to accept another constructor. This
13* Modified the `Base64ByteString` type to accept another constructor. This
@@ -105,17 +46,9 @@ main = do
105 + ~~ping.json~~ (as **doesn't return valid json!**)
46 + ~~ping.json~~ (as **doesn't return valid json!**)
106 + ping2.json
47 + ping2.json
107 + senders.json
48 + senders.json
108−
109 - [Messages call](https://mandrillapp.com/api/docs/messages.JSON.html)
49 - [Messages call](https://mandrillapp.com/api/docs/messages.JSON.html)
110 + send.json
50 + send.json
111
51
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−
119# Testing online API
52# Testing online API
120
53
121To test the online API, first build the package with tests enabled:
54To 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−9
@@ -1,5 +1,5 @@
1name: mandrill
1name: mandrill
2−version: 0.5.3.5
2+version: 0.4.1.0
3synopsis: Library for interfacing with the Mandrill JSON API
3synopsis: Library for interfacing with the Mandrill JSON API
4description: Pure Haskell client for the Mandrill JSON API
4description: Pure Haskell client for the Mandrill JSON API
5license: MIT
5license: MIT
@@ -8,7 +8,7 @@ author: Alfredo Di Napoli
8maintainer: alfredo.dinapoli@gmail.com
8maintainer: alfredo.dinapoli@gmail.com
9category: Network
9category: Network
10build-type: Simple
10build-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
12cabal-version: >=1.10
12cabal-version: >=1.10
13
13
14source-repository head
14source-repository head
@@ -25,9 +25,6 @@ library
25 Network.API.Mandrill.Users.Types
25 Network.API.Mandrill.Users.Types
26 Network.API.Mandrill.Messages
26 Network.API.Mandrill.Messages
27 Network.API.Mandrill.Messages.Types
27 Network.API.Mandrill.Messages.Types
28− Network.API.Mandrill.Inbound
29− Network.API.Mandrill.Webhooks
30− Network.API.Mandrill.Senders
31 other-modules:
28 other-modules:
32 Network.API.Mandrill.Utils
29 Network.API.Mandrill.Utils
33 Network.API.Mandrill.HTTP
30 Network.API.Mandrill.HTTP
@@ -41,15 +38,14 @@ library
41 , http-types >= 0.8.0
38 , http-types >= 0.8.0
42 , http-client >= 0.3.0
39 , http-client >= 0.3.0
43 , http-client-tls >= 0.2.0.0
40 , http-client-tls >= 0.2.0.0
44− , aeson >= 0.7.0.3 && < 1.5.0.0
41+ , aeson >= 0.7.0.3 && < 0.11.0.0
45− , microlens-th >= 0.4.0.0
42+ , lens >= 4.0
46 , blaze-html >= 0.5.0.0
43 , blaze-html >= 0.5.0.0
47− , QuickCheck >= 2.6 && < 3.0
44+ , QuickCheck >= 2.6 && < 2.9
48 , mtl < 3.0
45 , mtl < 3.0
49 , time
46 , time
50 , email-validate >= 1.0.0
47 , email-validate >= 1.0.0
51 , old-locale
48 , old-locale
52− , unordered-containers
53 hs-source-dirs:
49 hs-source-dirs:
54 src
50 src
55 default-language:
51 default-language:
src/Network/API/Mandrill.hs+21−23
@@ -20,18 +20,18 @@ module Network.API.Mandrill (
20 -- $exampleusage
20 -- $exampleusage
21 ) where
21 ) where
22
22
23−import Control.Monad.Reader
23+import Control.Monad.Reader
24−import qualified Data.Aeson as JSON
24+import Control.Lens
25−import qualified Data.HashMap.Strict as H
26−import Data.Monoid
27−import qualified Data.Text as T
28−import Data.Time
25+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
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
34−import Text.Email.Validate
32+import Text.Email.Validate
33+import qualified Data.Text as T
34+import qualified Data.Aeson as JSON
35
35
36{- $exampleusage
36{- $exampleusage
37
37
@@ -40,7 +40,7 @@ The API was designed to allow to get you started as quickly as possible:
40> {-# LANGUAGE OverloadedStrings #-}
40> {-# LANGUAGE OverloadedStrings #-}
41> import Text.Email.Validate
41> import Text.Email.Validate
42> import Network.API.Mandrill
42> import Network.API.Mandrill
43−>
43+>
44> main :: IO ()
44> main :: IO ()
45> main = do
45> main = do
46> case validate "foo@example.com" of
46> case validate "foo@example.com" of
@@ -66,7 +66,7 @@ emptyMessage f t = MandrillMessage {
66 , _mmsg_from_email = (MandrillEmail f)
66 , _mmsg_from_email = (MandrillEmail f)
67 , _mmsg_from_name = Nothing
67 , _mmsg_from_name = Nothing
68 , _mmsg_to = map newRecipient t
68 , _mmsg_to = map newRecipient t
69− , _mmsg_headers = H.empty
69+ , _mmsg_headers = JSON.Null
70 , _mmsg_important = Nothing
70 , _mmsg_important = Nothing
71 , _mmsg_track_opens = Nothing
71 , _mmsg_track_opens = Nothing
72 , _mmsg_track_clicks = Nothing
72 , _mmsg_track_clicks = Nothing
@@ -87,7 +87,7 @@ emptyMessage f t = MandrillMessage {
87 , _mmsg_subaccount = Nothing
87 , _mmsg_subaccount = Nothing
88 , _mmsg_google_analytics_domains = []
88 , _mmsg_google_analytics_domains = []
89 , _mmsg_google_analytics_campaign = Nothing
89 , _mmsg_google_analytics_campaign = Nothing
90− , _mmsg_metadata = H.empty
90+ , _mmsg_metadata = JSON.Null
91 , _mmsg_recipient_metadata = []
91 , _mmsg_recipient_metadata = []
92 , _mmsg_attachments = []
92 , _mmsg_attachments = []
93 , _mmsg_images = []
93 , _mmsg_images = []
@@ -106,7 +106,7 @@ newHtmlMessage :: EmailAddress
106 -- ^ The HTML body
106 -- ^ The HTML body
107 -> MandrillMessage
107 -> MandrillMessage
108newHtmlMessage f t subj html = let body = mkMandrillHtml html in
108newHtmlMessage f t subj html = let body = mkMandrillHtml html in
109− (emptyMessage f t) { _mmsg_html = body, _mmsg_subject = subj }
109+ ((mmsg_html .~ body) . (mmsg_subject .~ subj)) $ (emptyMessage f t)
110
110
111--------------------------------------------------------------------------------
111--------------------------------------------------------------------------------
112-- | Create a new template message (no HTML).
112-- | Create a new template message (no HTML).
@@ -117,7 +117,7 @@ newTemplateMessage :: EmailAddress
117 -> T.Text
117 -> T.Text
118 -- ^ Subject
118 -- ^ Subject
119 -> MandrillMessage
119 -> MandrillMessage
120−newTemplateMessage f t subj = (emptyMessage f t) { _mmsg_subject = subj }
120+newTemplateMessage f t subj = (mmsg_subject .~ subj) $ (emptyMessage f t)
121
121
122--------------------------------------------------------------------------------
122--------------------------------------------------------------------------------
123-- | Create a new textual message. By default Mandrill doesn't require you
123-- | Create a new textual message. By default Mandrill doesn't require you
@@ -133,11 +133,9 @@ newTextMessage :: EmailAddress
133 -- ^ The body, as normal text.
133 -- ^ The body, as normal text.
134 -> MandrillMessage
134 -> MandrillMessage
135newTextMessage f t subj txt = let body = unsafeMkMandrillHtml txt in
135newTextMessage f t subj txt = let body = unsafeMkMandrillHtml txt in
136− (emptyMessage f t) {
136+ ((mmsg_html .~ body) .
137− _mmsg_html = body
138− , _mmsg_text = Just txt
137+ (mmsg_text .~ Just txt) .
139− , _mmsg_subject = subj
138+ (mmsg_subject .~ subj)) (emptyMessage f t)
140− }
141
139
142
140
143--------------------------------------------------------------------------------
141--------------------------------------------------------------------------------
@@ -145,7 +143,7 @@ newTextMessage f t subj txt = let body = unsafeMkMandrillHtml txt in
145-- 'MandrillMessage' and this function will send an email inside a
143-- 'MandrillMessage' and this function will send an email inside a
146-- 'MandrillT' transformer. You are not forced to use the 'MandrillT' context
144-- '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,
145-- though. Have a look at "Network.API.Mandrill.Messages" for an IO-based,
148−-- low level function for sending email.
146+-- low lever function for sending email.
149sendEmail :: MonadIO m
147sendEmail :: MonadIO m
150 => MandrillMessage
148 => MandrillMessage
151 -> MandrillT m (MandrillResponse [MessagesResponse])
149 -> MandrillT m (MandrillResponse [MessagesResponse])
src/Network/API/Mandrill/HTTP.hs+9−9
@@ -1,15 +1,15 @@
1{-# LANGUAGE OverloadedStrings #-}
1{-# LANGUAGE OverloadedStrings #-}
2module Network.API.Mandrill.HTTP where
2module Network.API.Mandrill.HTTP where
3
3
4−import Control.Applicative
4+import Network.API.Mandrill.Settings
5−import Data.Aeson
5+import Network.API.Mandrill.Types
6−import Data.Monoid
7−import qualified Data.Text as T
6+import qualified Data.Text as T
8−import Network.API.Mandrill.Settings
7+import Data.Monoid
8+import Data.Aeson
9+import Control.Applicative
9−import Network.API.Mandrill.Types
10+import Network.HTTP.Types
10−import Network.HTTP.Client
11+import Network.HTTP.Client
11−import Network.HTTP.Client.TLS
12+import Network.HTTP.Client.TLS
12−import Network.HTTP.Types
13
13
14toMandrillResponse :: (MandrillEndpoint ep, FromJSON a, ToJSON rq)
14toMandrillResponse :: (MandrillEndpoint ep, FromJSON a, ToJSON rq)
15 => ep
15 => 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 @@
1
1
2module Network.API.Mandrill.Messages where
2module Network.API.Mandrill.Messages where
3
3
4−import qualified Data.Text as T
5−import Data.Time
6−import Network.API.Mandrill.HTTP
4+import Network.API.Mandrill.Types
7import Network.API.Mandrill.Messages.Types
5import Network.API.Mandrill.Messages.Types
8import Network.API.Mandrill.Settings
6import Network.API.Mandrill.Settings
9−import Network.API.Mandrill.Types
7+import Network.API.Mandrill.HTTP
10import Network.HTTP.Client
8import Network.HTTP.Client
9+import Data.Time
10+import qualified Data.Text as T
11
11
12--------------------------------------------------------------------------------
12--------------------------------------------------------------------------------
13-- | Send a new transactional message through Mandrill
13-- | 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
5import Data.Char
5import Data.Char
6import Data.Time
6import Data.Time
7import qualified Data.Text as T
7import qualified Data.Text as T
8+import Control.Lens
8import Control.Monad
9import Control.Monad
9import Data.Monoid
10import Data.Monoid
10import Data.Aeson
11import Data.Aeson
11import Data.Aeson.Types
12import Data.Aeson.Types
12import Data.Aeson.TH
13import Data.Aeson.TH
13−import Lens.Micro.TH (makeLenses)
14
14
15import Network.API.Mandrill.Types
15import Network.API.Mandrill.Types
16
16
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 =
15 -- Messages API
15 -- Messages API
16 | MessagesSend
16 | MessagesSend
17 | MessagesSendTemplate
17 | MessagesSendTemplate
18− | MessagesSearch
18+ | MessagesSearch deriving Show
19− -- Inbound API
20− | RoutesAdd
21− | DomainsAdd
22− -- Senders API
23− | VerifyDomain
24−
25− deriving Show
26
19
27class MandrillEndpoint ep where
20class MandrillEndpoint ep where
28 toUrl :: ep -> T.Text
21 toUrl :: ep -> T.Text
29
22
30instance MandrillEndpoint MandrillCalls where
23instance MandrillEndpoint MandrillCalls where
31− toUrl UsersInfo = "users/info.json"
24+ toUrl UsersInfo = "users/info.json"
32− toUrl UsersPing = "users/ping.json"
25+ toUrl UsersPing = "users/ping.json"
33− toUrl UsersPing2 = "users/ping2.json"
26+ toUrl UsersPing2 = "users/ping2.json"
34− toUrl UsersSenders = "users/senders.json"
27+ toUrl UsersSenders = "users/senders.json"
35− toUrl MessagesSend = "messages/send.json"
28+ toUrl MessagesSend = "messages/send.json"
36 toUrl MessagesSendTemplate = "messages/send-template.json"
29 toUrl MessagesSendTemplate = "messages/send-template.json"
37− toUrl MessagesSearch = "messages/search.json"
30+ 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/Types.hs+67−88
@@ -1,44 +1,35 @@
1−{-# LANGUAGE CPP #-}
1+{-# LANGUAGE TemplateHaskell #-}
2−{-# LANGUAGE DeriveFoldable #-}
2+{-# LANGUAGE CPP #-}
3−{-# LANGUAGE DeriveFunctor #-}
4−{-# LANGUAGE DeriveTraversable #-}
5−{-# LANGUAGE OverloadedStrings #-}
6−{-# LANGUAGE RankNTypes #-}
3+{-# LANGUAGE RankNTypes #-}
7{-# LANGUAGE ScopedTypeVariables #-}
4{-# LANGUAGE ScopedTypeVariables #-}
8−{-# LANGUAGE TemplateHaskell #-}
5+{-# LANGUAGE OverloadedStrings #-}
9module Network.API.Mandrill.Types where
6module Network.API.Mandrill.Types where
10
7
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)
17import Network.API.Mandrill.Utils
8import Network.API.Mandrill.Utils
18import Test.QuickCheck
9import Test.QuickCheck
19import Text.Email.Validate
10import Text.Email.Validate
11+import Data.Char
12+import Data.Maybe
13+import Data.Time
14+import Control.Applicative
20#if MIN_VERSION_time(1,5,0)
15#if MIN_VERSION_time(1,5,0)
21−import Data.Time.Format (TimeLocale, defaultTimeLocale)
16+import Data.Time.Format (TimeLocale, defaultTimeLocale)
22#else
17#else
23−import System.Locale (TimeLocale, defaultTimeLocale)
18+import System.Locale (TimeLocale, defaultTimeLocale)
24#endif
19#endif
20+import qualified Data.ByteString as B
21+import qualified Data.ByteString.Base64 as Base64
22+import qualified Data.Text as T
23+import qualified Data.Text.Encoding as TL
24+import qualified Data.Text.Lazy as TL
25+import Control.Lens
26+import Data.Monoid
25import Data.Aeson
27import Data.Aeson
26−import Data.Aeson.TH
27import Data.Aeson.Types
28import Data.Aeson.Types
28−import qualified Data.ByteString as B
29+import Data.Aeson.TH
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 qualified Text.Blaze.Html as Blaze
40import qualified Text.Blaze.Html.Renderer.Text as Blaze
31import qualified Text.Blaze.Html.Renderer.Text as Blaze
41−import qualified Text.Email.Validate as TEV
32+
42
33
43timeParse :: ParseTime t => TimeLocale -> String -> String -> Maybe t
34timeParse :: ParseTime t => TimeLocale -> String -> String -> Maybe t
44#if MIN_VERSION_time(1,5,0)
35#if MIN_VERSION_time(1,5,0)
@@ -49,11 +40,11 @@ timeParse = parseTime
49
40
50--------------------------------------------------------------------------------
41--------------------------------------------------------------------------------
51data MandrillError = MandrillError {
42data MandrillError = MandrillError {
52− _merr_status :: !T.Text
43+ _merr_status :: !T.Text
53− , _merr_code :: !Int
44+ , _merr_code :: !Int
54− , _merr_name :: !T.Text
45+ , _merr_name :: !T.Text
55 , _merr_message :: !T.Text
46 , _merr_message :: !T.Text
56− } deriving (Show, Eq)
47+ } deriving Show
57
48
58makeLenses ''MandrillError
49makeLenses ''MandrillError
59deriveJSON defaultOptions { fieldLabelModifier = drop 6 } ''MandrillError
50deriveJSON defaultOptions { fieldLabelModifier = drop 6 } ''MandrillError
@@ -78,7 +69,6 @@ data MandrillRejectReason = RR_HardBounce
78 | RR_InvalidSender
69 | RR_InvalidSender
79 | RR_Invalid
70 | RR_Invalid
80 | RR_TestModeLimit
71 | RR_TestModeLimit
81− | RR_Unsigned
82 | RR_Rule deriving Show
72 | RR_Rule deriving Show
83
73
84deriveJSON defaultOptions {
74deriveJSON defaultOptions {
@@ -91,7 +81,7 @@ deriveJSON defaultOptions {
91-- which can be either a success or a failure.
81-- which can be either a success or a failure.
92data MandrillResponse k =
82data MandrillResponse k =
93 MandrillSuccess k
83 MandrillSuccess k
94− | MandrillFailure MandrillError deriving (Show, Eq, Functor, Foldable, Traversable)
84+ | MandrillFailure MandrillError deriving Show
95
85
96instance FromJSON k => FromJSON (MandrillResponse k) where
86instance FromJSON k => FromJSON (MandrillResponse k) where
97 parseJSON v = case (parseMaybe parseJSON v) :: Maybe k of
87 parseJSON v = case (parseMaybe parseJSON v) :: Maybe k of
@@ -127,9 +117,9 @@ instance FromJSON MandrillEmail where
127data MandrillRecipient = MandrillRecipient {
117data MandrillRecipient = MandrillRecipient {
128 _mrec_email :: MandrillEmail
118 _mrec_email :: MandrillEmail
129 -- ^ The email address of the recipient
119 -- ^ The email address of the recipient
130− , _mrec_name :: Maybe T.Text
120+ , _mrec_name :: Maybe T.Text
131 -- ^ The optional display name to use for the recipient
121 -- ^ The optional display name to use for the recipient
132− , _mrec_type :: Maybe MandrillRecipientTag
122+ , _mrec_type :: Maybe MandrillRecipientTag
133 -- ^ The header type to use for the recipient.
123 -- ^ The header type to use for the recipient.
134 -- defaults to "to" if not provided
124 -- defaults to "to" if not provided
135 } deriving Show
125 } deriving Show
@@ -158,11 +148,6 @@ unsafeMkMandrillHtml = MandrillHtml . Blaze.preEscapedToHtml
158mkMandrillHtml :: Blaze.Html -> MandrillHtml
148mkMandrillHtml :: Blaze.Html -> MandrillHtml
159mkMandrillHtml = MandrillHtml
149mkMandrillHtml = MandrillHtml
160
150
161−#if MIN_VERSION_base(4,11,0)
162−instance Semigroup MandrillHtml where
163− MandrillHtml m1 <> MandrillHtml m2 = MandrillHtml (m1 <> m2)
164−#endif
165−
166instance Monoid MandrillHtml where
151instance Monoid MandrillHtml where
167 mempty = MandrillHtml mempty
152 mempty = MandrillHtml mempty
168 mappend (MandrillHtml m1) (MandrillHtml m2) = MandrillHtml (m1 <> m2)
153 mappend (MandrillHtml m1) (MandrillHtml m2) = MandrillHtml (m1 <> m2)
@@ -185,23 +170,17 @@ type MandrillTags = T.Text
185
170
186
171
187--------------------------------------------------------------------------------
172--------------------------------------------------------------------------------
188−type MandrillHeaders = Object
173+type MandrillHeaders = Value
189
174
190
175
191--------------------------------------------------------------------------------
176--------------------------------------------------------------------------------
177+type MandrillVars = Value
192
178
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
179
201--------------------------------------------------------------------------------
180--------------------------------------------------------------------------------
202data MandrillMergeVars = MandrillMergeVars {
181data MandrillMergeVars = MandrillMergeVars {
203 _mmvr_rcpt :: !T.Text
182 _mmvr_rcpt :: !T.Text
204− , _mmvr_vars :: [MergeVar]
183+ , _mmvr_vars :: [MandrillVars]
205 } deriving Show
184 } deriving Show
206
185
207makeLenses ''MandrillMergeVars
186makeLenses ''MandrillMergeVars
@@ -209,8 +188,8 @@ deriveJSON defaultOptions { fieldLabelModifier = drop 6 } ''MandrillMergeVars
209
188
210--------------------------------------------------------------------------------
189--------------------------------------------------------------------------------
211data MandrillMetadata = MandrillMetadata {
190data MandrillMetadata = MandrillMetadata {
212− _mmdt_rcpt :: !T.Text
191+ _mmdt_rcpt :: !T.Text
213− , _mmdt_values :: Object
192+ , _mmdt_values :: MandrillVars
214 } deriving Show
193 } deriving Show
215
194
216makeLenses ''MandrillMetadata
195makeLenses ''MandrillMetadata
@@ -234,8 +213,8 @@ instance FromJSON Base64ByteString where
234
213
235--------------------------------------------------------------------------------
214--------------------------------------------------------------------------------
236data MandrillWebContent = MandrillWebContent {
215data MandrillWebContent = MandrillWebContent {
237− _mwct_type :: !T.Text
216+ _mwct_type :: !T.Text
238− , _mwct_name :: !T.Text
217+ , _mwct_name :: !T.Text
239 -- ^ [for images] the Content ID of the image
218 -- ^ [for images] the Content ID of the image
240 -- - use <img src="cid:THIS_VALUE"> to reference the image
219 -- - use <img src="cid:THIS_VALUE"> to reference the image
241 -- in your HTML content
220 -- in your HTML content
@@ -248,67 +227,67 @@ deriveJSON defaultOptions { fieldLabelModifier = drop 6 } ''MandrillWebContent
248--------------------------------------------------------------------------------
227--------------------------------------------------------------------------------
249-- | The information on the message to send
228-- | The information on the message to send
250data MandrillMessage = MandrillMessage {
229data MandrillMessage = MandrillMessage {
251− _mmsg_html :: MandrillHtml
230+ _mmsg_html :: MandrillHtml
252 -- ^ The full HTML content to be sent
231 -- ^ The full HTML content to be sent
253− , _mmsg_text :: Maybe T.Text
232+ , _mmsg_text :: Maybe T.Text
254 -- ^ Optional full text content to be sent
233 -- ^ Optional full text content to be sent
255− , _mmsg_subject :: !T.Text
234+ , _mmsg_subject :: !T.Text
256 -- ^ The message subject
235 -- ^ The message subject
257− , _mmsg_from_email :: MandrillEmail
236+ , _mmsg_from_email :: MandrillEmail
258 -- ^ The sender email address
237 -- ^ The sender email address
259− , _mmsg_from_name :: Maybe T.Text
238+ , _mmsg_from_name :: Maybe T.Text
260 -- ^ Optional from name to be used
239 -- ^ Optional from name to be used
261− , _mmsg_to :: [MandrillRecipient]
240+ , _mmsg_to :: [MandrillRecipient]
262 -- ^ A list of recipient information
241 -- ^ A list of recipient information
263− , _mmsg_headers :: MandrillHeaders
242+ , _mmsg_headers :: MandrillHeaders
264 -- ^ optional extra headers to add to the message (most headers are allowed)
243 -- ^ optional extra headers to add to the message (most headers are allowed)
265− , _mmsg_important :: Maybe Bool
244+ , _mmsg_important :: Maybe Bool
266 -- ^ whether or not this message is important, and should be delivered ahead
245 -- ^ whether or not this message is important, and should be delivered ahead
267 -- of non-important messages
246 -- of non-important messages
268− , _mmsg_track_opens :: Maybe Bool
247+ , _mmsg_track_opens :: Maybe Bool
269 -- ^ whether or not to turn on open tracking for the message
248 -- ^ whether or not to turn on open tracking for the message
270− , _mmsg_track_clicks :: Maybe Bool
249+ , _mmsg_track_clicks :: Maybe Bool
271 -- ^ whether or not to turn on click tracking for the message
250 -- ^ whether or not to turn on click tracking for the message
272− , _mmsg_auto_text :: Maybe Bool
251+ , _mmsg_auto_text :: Maybe Bool
273 -- ^ whether or not to automatically generate a text part for messages that are not given text
252 -- ^ whether or not to automatically generate a text part for messages that are not given text
274− , _mmsg_auto_html :: Maybe Bool
253+ , _mmsg_auto_html :: Maybe Bool
275 -- ^ whether or not to automatically generate an HTML part for messages that are not given HTML
254 -- ^ whether or not to automatically generate an HTML part for messages that are not given HTML
276− , _mmsg_inline_css :: Maybe Bool
255+ , _mmsg_inline_css :: Maybe Bool
277 -- ^ whether or not to automatically inline all CSS styles provided in the message HTML
256 -- ^ whether or not to automatically inline all CSS styles provided in the message HTML
278 -- - only for HTML documents less than 256KB in size
257 -- - only for HTML documents less than 256KB in size
279− , _mmsg_url_strip_qs :: Maybe Bool
258+ , _mmsg_url_strip_qs :: Maybe Bool
280 -- ^ whether or not to strip the query string from URLs when aggregating tracked URL data
259 -- ^ whether or not to strip the query string from URLs when aggregating tracked URL data
281− , _mmsg_preserve_recipients :: Maybe Bool
260+ , _mmsg_preserve_recipients :: Maybe Bool
282 -- ^ whether or not to expose all recipients in to "To" header for each email
261 -- ^ whether or not to expose all recipients in to "To" header for each email
283− , _mmsg_view_content_link :: Maybe Bool
262+ , _mmsg_view_content_link :: Maybe Bool
284 -- ^ set to false to remove content logging for sensitive emails
263 -- ^ set to false to remove content logging for sensitive emails
285− , _mmsg_bcc_address :: Maybe T.Text
264+ , _mmsg_bcc_address :: Maybe T.Text
286 -- ^ an optional address to receive an exact copy of each recipient's email
265 -- ^ an optional address to receive an exact copy of each recipient's email
287− , _mmsg_tracking_domain :: Maybe T.Text
266+ , _mmsg_tracking_domain :: Maybe T.Text
288 -- ^ a custom domain to use for tracking opens and clicks instead of mandrillapp.com
267 -- ^ a custom domain to use for tracking opens and clicks instead of mandrillapp.com
289− , _mmsg_signing_domain :: Maybe Bool
268+ , _mmsg_signing_domain :: Maybe Bool
290− -- ^ a custom domain to use for SPF/DKIM signing instead of mandrill
269+ -- ^ a custom domain to use for SPF/DKIM signing instead of mandrill
291 -- (for "via" or "on behalf of" in email clients)
270 -- (for "via" or "on behalf of" in email clients)
292− , _mmsg_return_path_domain :: Maybe Bool
271+ , _mmsg_return_path_domain :: Maybe Bool
293 -- ^ a custom domain to use for the messages's return-path
272 -- ^ a custom domain to use for the messages's return-path
294− , _mmsg_merge :: Maybe Bool
273+ , _mmsg_merge :: Maybe Bool
295 -- ^ whether to evaluate merge tags in the message.
274 -- ^ whether to evaluate merge tags in the message.
296 -- Will automatically be set to true if either merge_vars
275 -- Will automatically be set to true if either merge_vars
297 -- or global_merge_vars are provided.
276 -- or global_merge_vars are provided.
298− , _mmsg_global_merge_vars :: [MergeVar]
277+ , _mmsg_global_merge_vars :: [MandrillVars]
299 -- ^ global merge variables to use for all recipients. You can override these per recipient.
278 -- ^ global merge variables to use for all recipients. You can override these per recipient.
300− , _mmsg_merge_vars :: [MandrillMergeVars]
279+ , _mmsg_merge_vars :: [MandrillMergeVars]
301 -- ^ per-recipient merge variables, which override global merge variables with the same name.
280 -- ^ per-recipient merge variables, which override global merge variables with the same name.
302− , _mmsg_tags :: [MandrillTags]
281+ , _mmsg_tags :: [MandrillTags]
303 -- ^ an array of string to tag the message with. Stats are accumulated using tags,
282 -- ^ 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
283 -- 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.
284 -- or change frequently. Tags should be 50 characters or less.
306 -- Any tags starting with an underscore are reserved for internal use
285 -- Any tags starting with an underscore are reserved for internal use
307 -- and will cause errors.
286 -- and will cause errors.
308− , _mmsg_subaccount :: Maybe T.Text
287+ , _mmsg_subaccount :: Maybe T.Text
309 -- ^ the unique id of a subaccount for this message
288 -- ^ the unique id of a subaccount for this message
310 -- - must already exist or will fail with an error
289 -- - must already exist or will fail with an error
311− , _mmsg_google_analytics_domains :: [T.Text]
290+ , _mmsg_google_analytics_domains :: [T.Text]
312 -- ^ an array of strings indicating for which any matching URLs
291 -- ^ an array of strings indicating for which any matching URLs
313 -- will automatically have Google Analytics parameters appended
292 -- will automatically have Google Analytics parameters appended
314 -- to their query string automatically.
293 -- to their query string automatically.
@@ -316,17 +295,17 @@ data MandrillMessage = MandrillMessage {
316 -- ^ optional string indicating the value to set for the utm_campaign
295 -- ^ optional string indicating the value to set for the utm_campaign
317 -- tracking parameter. If this isn't provided the email's from address
296 -- tracking parameter. If this isn't provided the email's from address
318 -- will be used instead.
297 -- will be used instead.
319− , _mmsg_metadata :: Object
298+ , _mmsg_metadata :: MandrillVars
320 -- ^ metadata an associative array of user metadata. Mandrill will store
299 -- ^ metadata an associative array of user metadata. Mandrill will store
321 -- this metadata and make it available for retrieval.
300 -- this metadata and make it available for retrieval.
322 -- In addition, you can select up to 10 metadata fields to index
301 -- In addition, you can select up to 10 metadata fields to index
323 -- and make searchable using the Mandrill search api.
302 -- and make searchable using the Mandrill search api.
324− , _mmsg_recipient_metadata :: [MandrillMetadata]
303+ , _mmsg_recipient_metadata :: [MandrillMetadata]
325 -- ^ Per-recipient metadata that will override the global values
304 -- ^ Per-recipient metadata that will override the global values
326 -- specified in the metadata parameter.
305 -- specified in the metadata parameter.
327− , _mmsg_attachments :: [MandrillWebContent]
306+ , _mmsg_attachments :: [MandrillWebContent]
328 -- ^ an array of supported attachments to add to the message
307 -- ^ an array of supported attachments to add to the message
329− , _mmsg_images :: [MandrillWebContent]
308+ , _mmsg_images :: [MandrillWebContent]
330 -- ^ an array of embedded images to add to the message
309 -- ^ an array of embedded images to add to the message
331 } deriving Show
310 } deriving Show
332
311
@@ -340,7 +319,7 @@ instance Arbitrary MandrillMessage where
340 <*> pure (MandrillEmail . fromJust $ emailAddress "sender@example.com")
319 <*> pure (MandrillEmail . fromJust $ emailAddress "sender@example.com")
341 <*> pure Nothing
320 <*> pure Nothing
342 <*> resize 2 arbitrary
321 <*> resize 2 arbitrary
343− <*> pure H.empty
322+ <*> pure emptyObject
344 <*> pure Nothing
323 <*> pure Nothing
345 <*> pure Nothing
324 <*> pure Nothing
346 <*> pure Nothing
325 <*> pure Nothing
@@ -361,7 +340,7 @@ instance Arbitrary MandrillMessage where
361 <*> pure Nothing
340 <*> pure Nothing
362 <*> pure []
341 <*> pure []
363 <*> pure Nothing
342 <*> pure Nothing
364− <*> pure H.empty
343+ <*> pure emptyObject
365 <*> pure []
344 <*> pure []
366 <*> pure []
345 <*> pure []
367 <*> pure []
346 <*> pure []
src/Network/API/Mandrill/Users/Types.hs+1−1
@@ -5,12 +5,12 @@ module Network.API.Mandrill.Users.Types where
5import Data.Char
5import Data.Char
6import Data.Time
6import Data.Time
7import qualified Data.Text as T
7import qualified Data.Text as T
8+import Control.Lens
8import Control.Monad
9import Control.Monad
9import Data.Monoid
10import Data.Monoid
10import Data.Aeson
11import Data.Aeson
11import Data.Aeson.Types
12import Data.Aeson.Types
12import Data.Aeson.TH
13import Data.Aeson.TH
13−import Lens.Micro.TH (makeLenses)
14
14
15import Network.API.Mandrill.Types
15import Network.API.Mandrill.Types
16
16
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: {}
2packages:
2packages:
3- '.'
3- '.'
4extra-deps: []
4extra-deps: []
5−resolver: lts-11.13
5+resolver: lts-2.19
test/Main.hs+7−14
@@ -1,14 +1,14 @@
1{-# LANGUAGE OverloadedStrings #-}
1{-# LANGUAGE OverloadedStrings #-}
2module Main where
2module Main where
3
3
4+import System.Environment
4import Data.Monoid
5import Data.Monoid
5−import qualified Data.Text as T
6+import Tests
6import Online
7import Online
7−import System.Environment
8import Test.Tasty
8import Test.Tasty
9import Test.Tasty.HUnit
9import Test.Tasty.HUnit
10import Test.Tasty.QuickCheck
10import Test.Tasty.QuickCheck
11−import Tests
11+import qualified Data.Text as T
12
12
13----------------------------------------------------------------------
13----------------------------------------------------------------------
14withQuickCheckDepth :: TestName -> Int -> [TestTree] -> TestTree
14withQuickCheckDepth :: TestName -> Int -> [TestTree] -> TestTree
@@ -23,12 +23,10 @@ onlineTestsIfEnabled = do
23 Nothing -> return []
23 Nothing -> return []
24 Just k -> return [
24 Just k -> return [
25 testGroup "Mandrill online tests" [
25 testGroup "Mandrill online tests" [
26− testCase "users/info.json" (testOnlineUsersInfo k)
26+ testCase "users/info.json" (testOnlineUsersInfo k)
27− , testCase "users/ping2.json" (testOnlineUsersPing2 k)
27+ , testCase "users/ping2.json" (testOnlineUsersPing2 k)
28− , testCase "users/senders.json" (testOnlineUsersSenders k)
28+ , testCase "users/senders.json" (testOnlineUsersSenders k)
29− , testCase "messages/send.json" (testOnlineMessagesSend k)
29+ , testCase "messages/send.json" (testOnlineMessagesSend k)
30− , testCase "inbound/addDomain.json" (testOnlineDomainAdd k)
31− , testCase "inbound/addRoute.json" (testOnlineRouteAdd k)
32 ]]
30 ]]
33
31
34----------------------------------------------------------------------
32----------------------------------------------------------------------
@@ -41,10 +39,5 @@ main = do
41 testCase "users/info.json API parsing" testUsersInfo
39 testCase "users/info.json API parsing" testUsersInfo
42 , testCase "users/senders.json API parsing" testUsersSenders
40 , testCase "users/senders.json API parsing" testUsersSenders
43 , testCase "messages/send.json API parsing" testMessagesSend
41 , 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
49 ]
42 ]
50 ]
43 ]
test/Online.hs+7−25
@@ -1,20 +1,19 @@
1{-# LANGUAGE OverloadedStrings #-}
1{-# LANGUAGE OverloadedStrings #-}
2module Online where
2module Online where
3
3
4−import Data.Aeson
4+import Test.QuickCheck
5−import qualified Data.ByteString.Char8 as C8
5+import Test.Tasty.HUnit
6+import Text.RawString.QQ
6import Data.Either
7import Data.Either
8+import Data.Aeson
7import Network.API.Mandrill.Messages.Types
9import Network.API.Mandrill.Messages.Types
8import Network.API.Mandrill.Users.Types
10import Network.API.Mandrill.Users.Types
11+import qualified Data.ByteString.Char8 as C8
9import RawData
12import RawData
10−import Test.QuickCheck
11−import Test.Tasty.HUnit
12−import Text.RawString.QQ
13
13
14−import qualified Network.API.Mandrill.Inbound as API
15−import qualified Network.API.Mandrill.Messages as API
16import Network.API.Mandrill.Types
14import 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
18
17
19--
18--
20-- Users calls
19-- Users calls
@@ -51,20 +50,3 @@ testOnlineMessagesSend k = do
51 case res of
50 case res of
52 MandrillSuccess _ -> return ()
51 MandrillSuccess _ -> return ()
53 MandrillFailure e -> fail $ "messages/send.json " ++ show e
52 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−59
@@ -1,10 +1,10 @@
1{-# LANGUAGE QuasiQuotes #-}
1{-# LANGUAGE QuasiQuotes #-}
2module RawData where
2module RawData where
3
3
4−import Data.Either
5−import Test.QuickCheck
4+import Test.QuickCheck
6−import Test.Tasty.HUnit
5+import Test.Tasty.HUnit
7−import Text.RawString.QQ
6+import Text.RawString.QQ
7+import Data.Either
8
8
9usersInfoData :: String
9usersInfoData :: String
10usersInfoData = [r|
10usersInfoData = [r|
@@ -200,58 +200,3 @@ sendData = [r|
200 "send_at": "2014-08-17T14:23:02.954Z"
200 "send_at": "2014-08-17T14:23:02.954Z"
201}
201}
202|]
202|]
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+8−54
@@ -1,17 +1,13 @@
1{-# LANGUAGE CPP #-}
1{-# LANGUAGE CPP #-}
2module Tests where
2module Tests where
3
3
4+import Test.Tasty.HUnit
5+import Data.Either
4−import Data.Aeson
6+import Data.Aeson
7+import Network.API.Mandrill.Messages.Types
8+import Network.API.Mandrill.Users.Types
5−import qualified Data.ByteString.Char8 as C8
9+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
10+import RawData
14−import Test.Tasty.HUnit
15
11
16#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ <= 706
12#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ <= 706
17isRight :: Either a b -> Bool
13isRight :: Either a b -> Bool
@@ -20,7 +16,7 @@ isRight _ = True
20#endif
16#endif
21
17
22testMessagesSend :: Assertion
18testMessagesSend :: Assertion
23−testMessagesSend =
19+testMessagesSend =
24 assertBool ("send.json: Parsing failed! " ++ show parsePayload)
20 assertBool ("send.json: Parsing failed! " ++ show parsePayload)
25 (isRight parsePayload)
21 (isRight parsePayload)
26 where
22 where
@@ -44,45 +40,3 @@ testUsersSenders = do
44 where
40 where
45 parsePayload :: Either String UsersSendersResponse
41 parsePayload :: Either String UsersSendersResponse
46 parsePayload = eitherDecodeStrict . C8.pack $ usersSendersData
42 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