@@ -1,39 +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 Network.API.Mandrill.Orphans()
9−import Test.QuickCheck
10−import Text.Email.Validate
11+import Control.Applicative
12+import Control.Monad (mzero)
1113import Data.Char
1214import Data.Maybe
1315import Data.Time
14−import Control.Applicative
15−import System.Locale (defaultTimeLocale)
16−import qualified Data.ByteString as B
17−import qualified Data.ByteString.Base64 as Base64
18−import qualified Data.Text as T
19−import qualified Data.Text.Encoding as TL
20−import qualified Data.Text.Lazy as TL
21−import Control.Lens
22−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
2325import Data.Aeson
24−import Data.Aeson.Types
2526import Data.Aeson.TH
26−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
2740import qualified Text.Blaze.Html.Renderer.Text as Blaze
41+import qualified Text.Email.Validate as TEV
2842
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
2949
3050--------------------------------------------------------------------------------
3151data MandrillError = MandrillError {
32− _merr_status :: !T.Text
33− , _merr_code :: !Int
34− , _merr_name :: !T.Text
52+ _merr_status :: !T.Text
53+ , _merr_code :: !Int
54+ , _merr_name :: !T.Text
3555 , _merr_message :: !T.Text
36− } deriving Show
56+ } deriving (Show, Eq)
3757
3858makeLenses ''MandrillError
3959deriveJSON defaultOptions { fieldLabelModifier = drop 6 } ''MandrillError
@@ -58,6 +78,7 @@ data MandrillRejectReason = RR_HardBounce
5878 | RR_InvalidSender
5979 | RR_Invalid
6080 | RR_TestModeLimit
81+ | RR_Unsigned
6182 | RR_Rule deriving Show
6283
6384deriveJSON defaultOptions {
@@ -70,7 +91,7 @@ deriveJSON defaultOptions {
7091-- which can be either a success or a failure.
7192data MandrillResponse k =
7293 MandrillSuccess k
73− | MandrillFailure MandrillError deriving Show
94+ | MandrillFailure MandrillError deriving (Show, Eq, Functor, Foldable, Traversable)
7495
7596instance FromJSON k => FromJSON (MandrillResponse k) where
7697 parseJSON v = case (parseMaybe parseJSON v) :: Maybe k of
@@ -88,14 +109,27 @@ data MandrillRecipientTag = To | Cc | Bcc deriving Show
88109deriveJSON defaultOptions { constructorTagModifier = map toLower } ''MandrillRecipientTag
89110
90111
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+
91125--------------------------------------------------------------------------------
92126-- | An array of recipient information.
93127data MandrillRecipient = MandrillRecipient {
94− _mrec_email :: EmailAddress
128+ _mrec_email :: MandrillEmail
95129 -- ^ The email address of the recipient
96− , _mrec_name :: Maybe T.Text
130+ , _mrec_name :: Maybe T.Text
97131 -- ^ The optional display name to use for the recipient
98− , _mrec_type :: Maybe MandrillRecipientTag
132+ , _mrec_type :: Maybe MandrillRecipientTag
99133 -- ^ The header type to use for the recipient.
100134 -- defaults to "to" if not provided
101135 } deriving Show
@@ -104,11 +138,11 @@ makeLenses ''MandrillRecipient
104138deriveJSON defaultOptions { fieldLabelModifier = drop 6 } ''MandrillRecipient
105139
106140newRecipient :: EmailAddress -> MandrillRecipient
107−newRecipient email = MandrillRecipient email Nothing Nothing
141+newRecipient email = MandrillRecipient (MandrillEmail email) Nothing Nothing
108142
109143instance Arbitrary MandrillRecipient where
110144 arbitrary = pure MandrillRecipient {
111− _mrec_email = fromJust (emailAddress "test@example.com")
145+ _mrec_email = MandrillEmail $ fromJust (emailAddress "test@example.com")
112146 , _mrec_name = Nothing
113147 , _mrec_type = Nothing
114148 }
@@ -124,6 +158,11 @@ unsafeMkMandrillHtml = MandrillHtml . Blaze.preEscapedToHtml
124158mkMandrillHtml :: Blaze.Html -> MandrillHtml
125159mkMandrillHtml = MandrillHtml
126160
161+#if MIN_VERSION_base(4,11,0)
162+instance Semigroup MandrillHtml where
163+ MandrillHtml m1 <> MandrillHtml m2 = MandrillHtml (m1 <> m2)
164+#endif
165+
127166instance Monoid MandrillHtml where
128167 mempty = MandrillHtml mempty
129168 mappend (MandrillHtml m1) (MandrillHtml m2) = MandrillHtml (m1 <> m2)
@@ -146,17 +185,23 @@ type MandrillTags = T.Text
146185
147186
148187--------------------------------------------------------------------------------
149−type MandrillHeaders = Value
188+type MandrillHeaders = Object
150189
151190
152191--------------------------------------------------------------------------------
153−type MandrillVars = Value
154192
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
155200
156201--------------------------------------------------------------------------------
157202data MandrillMergeVars = MandrillMergeVars {
158203 _mmvr_rcpt :: !T.Text
159− , _mmvr_vars :: [MandrillVars]
204+ , _mmvr_vars :: [MergeVar]
160205 } deriving Show
161206
162207makeLenses ''MandrillMergeVars
@@ -164,29 +209,33 @@ deriveJSON defaultOptions { fieldLabelModifier = drop 6 } ''MandrillMergeVars
164209
165210--------------------------------------------------------------------------------
166211data MandrillMetadata = MandrillMetadata {
167− _mmdt_rcpt :: !T.Text
168− , _mmdt_values :: MandrillVars
212+ _mmdt_rcpt :: !T.Text
213+ , _mmdt_values :: Object
169214 } deriving Show
170215
171216makeLenses ''MandrillMetadata
172217deriveJSON defaultOptions { fieldLabelModifier = drop 6 } ''MandrillMetadata
173218
174219
175−newtype Base64ByteString = B64BS B.ByteString deriving Show
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
176226
177227instance ToJSON Base64ByteString where
178− toJSON (B64BS bs) = String . TL.decodeUtf8 . Base64.encode $ bs
228+ toJSON (PlainBS bs) = String . TL.decodeUtf8 . Base64.encode $ bs
229+ toJSON (EncodedB64BS bs) = String . TL.decodeUtf8 $ bs
179230
180231instance FromJSON Base64ByteString where
181− parseJSON (String v) = case Base64.decode (TL.encodeUtf8 v) of
182− Left err -> fail err
183− Right rs -> return $ B64BS rs
232+ parseJSON (String v) = pure $ EncodedB64BS (TL.encodeUtf8 v)
184233 parseJSON rest = typeMismatch "Base64ByteString must be a String." rest
185234
186235--------------------------------------------------------------------------------
187236data MandrillWebContent = MandrillWebContent {
188− _mwct_type :: !T.Text
189− , _mwct_name :: !T.Text
237+ _mwct_type :: !T.Text
238+ , _mwct_name :: !T.Text
190239 -- ^ [for images] the Content ID of the image
191240 -- - use <img src="cid:THIS_VALUE"> to reference the image
192241 -- in your HTML content
@@ -199,67 +248,67 @@ deriveJSON defaultOptions { fieldLabelModifier = drop 6 } ''MandrillWebContent
199248--------------------------------------------------------------------------------
200249-- | The information on the message to send
201250data MandrillMessage = MandrillMessage {
202− _mmsg_html :: MandrillHtml
251+ _mmsg_html :: MandrillHtml
203252 -- ^ The full HTML content to be sent
204− , _mmsg_text :: Maybe T.Text
253+ , _mmsg_text :: Maybe T.Text
205254 -- ^ Optional full text content to be sent
206− , _mmsg_subject :: !T.Text
255+ , _mmsg_subject :: !T.Text
207256 -- ^ The message subject
208− , _mmsg_from_email :: EmailAddress
257+ , _mmsg_from_email :: MandrillEmail
209258 -- ^ The sender email address
210− , _mmsg_from_name :: Maybe T.Text
259+ , _mmsg_from_name :: Maybe T.Text
211260 -- ^ Optional from name to be used
212− , _mmsg_to :: [MandrillRecipient]
261+ , _mmsg_to :: [MandrillRecipient]
213262 -- ^ A list of recipient information
214− , _mmsg_headers :: MandrillHeaders
263+ , _mmsg_headers :: MandrillHeaders
215264 -- ^ optional extra headers to add to the message (most headers are allowed)
216− , _mmsg_important :: Maybe Bool
265+ , _mmsg_important :: Maybe Bool
217266 -- ^ whether or not this message is important, and should be delivered ahead
218267 -- of non-important messages
219− , _mmsg_track_opens :: Maybe Bool
268+ , _mmsg_track_opens :: Maybe Bool
220269 -- ^ whether or not to turn on open tracking for the message
221− , _mmsg_track_clicks :: Maybe Bool
270+ , _mmsg_track_clicks :: Maybe Bool
222271 -- ^ whether or not to turn on click tracking for the message
223− , _mmsg_auto_text :: Maybe Bool
272+ , _mmsg_auto_text :: Maybe Bool
224273 -- ^ whether or not to automatically generate a text part for messages that are not given text
225− , _mmsg_auto_html :: Maybe Bool
274+ , _mmsg_auto_html :: Maybe Bool
226275 -- ^ whether or not to automatically generate an HTML part for messages that are not given HTML
227− , _mmsg_inline_css :: Maybe Bool
276+ , _mmsg_inline_css :: Maybe Bool
228277 -- ^ whether or not to automatically inline all CSS styles provided in the message HTML
229278 -- - only for HTML documents less than 256KB in size
230− , _mmsg_url_strip_qs :: Maybe Bool
279+ , _mmsg_url_strip_qs :: Maybe Bool
231280 -- ^ whether or not to strip the query string from URLs when aggregating tracked URL data
232− , _mmsg_preserve_recipients :: Maybe Bool
281+ , _mmsg_preserve_recipients :: Maybe Bool
233282 -- ^ whether or not to expose all recipients in to "To" header for each email
234− , _mmsg_view_content_link :: Maybe Bool
283+ , _mmsg_view_content_link :: Maybe Bool
235284 -- ^ set to false to remove content logging for sensitive emails
236− , _mmsg_bcc_address :: Maybe T.Text
285+ , _mmsg_bcc_address :: Maybe T.Text
237286 -- ^ an optional address to receive an exact copy of each recipient's email
238− , _mmsg_tracking_domain :: Maybe T.Text
287+ , _mmsg_tracking_domain :: Maybe T.Text
239288 -- ^ a custom domain to use for tracking opens and clicks instead of mandrillapp.com
240− , _mmsg_signing_domain :: Maybe Bool
241− -- ^ a custom domain to use for SPF/DKIM signing instead of mandrill
289+ , _mmsg_signing_domain :: Maybe Bool
290+ -- ^ a custom domain to use for SPF/DKIM signing instead of mandrill
242291 -- (for "via" or "on behalf of" in email clients)
243− , _mmsg_return_path_domain :: Maybe Bool
292+ , _mmsg_return_path_domain :: Maybe Bool
244293 -- ^ a custom domain to use for the messages's return-path
245− , _mmsg_merge :: Maybe Bool
294+ , _mmsg_merge :: Maybe Bool
246295 -- ^ whether to evaluate merge tags in the message.
247296 -- Will automatically be set to true if either merge_vars
248297 -- or global_merge_vars are provided.
249− , _mmsg_global_merge_vars :: [MandrillVars]
298+ , _mmsg_global_merge_vars :: [MergeVar]
250299 -- ^ global merge variables to use for all recipients. You can override these per recipient.
251− , _mmsg_merge_vars :: [MandrillMergeVars]
300+ , _mmsg_merge_vars :: [MandrillMergeVars]
252301 -- ^ per-recipient merge variables, which override global merge variables with the same name.
253− , _mmsg_tags :: [MandrillTags]
302+ , _mmsg_tags :: [MandrillTags]
254303 -- ^ an array of string to tag the message with. Stats are accumulated using tags,
255304 -- though we only store the first 100 we see, so this should not be unique
256305 -- or change frequently. Tags should be 50 characters or less.
257306 -- Any tags starting with an underscore are reserved for internal use
258307 -- and will cause errors.
259− , _mmsg_subaccount :: Maybe T.Text
308+ , _mmsg_subaccount :: Maybe T.Text
260309 -- ^ the unique id of a subaccount for this message
261310 -- - must already exist or will fail with an error
262− , _mmsg_google_analytics_domains :: [T.Text]
311+ , _mmsg_google_analytics_domains :: [T.Text]
263312 -- ^ an array of strings indicating for which any matching URLs
264313 -- will automatically have Google Analytics parameters appended
265314 -- to their query string automatically.
@@ -267,17 +316,17 @@ data MandrillMessage = MandrillMessage {
267316 -- ^ optional string indicating the value to set for the utm_campaign
268317 -- tracking parameter. If this isn't provided the email's from address
269318 -- will be used instead.
270− , _mmsg_metadata :: MandrillVars
319+ , _mmsg_metadata :: Object
271320 -- ^ metadata an associative array of user metadata. Mandrill will store
272321 -- this metadata and make it available for retrieval.
273322 -- In addition, you can select up to 10 metadata fields to index
274323 -- and make searchable using the Mandrill search api.
275− , _mmsg_recipient_metadata :: [MandrillMetadata]
324+ , _mmsg_recipient_metadata :: [MandrillMetadata]
276325 -- ^ Per-recipient metadata that will override the global values
277326 -- specified in the metadata parameter.
278− , _mmsg_attachments :: [MandrillWebContent]
327+ , _mmsg_attachments :: [MandrillWebContent]
279328 -- ^ an array of supported attachments to add to the message
280− , _mmsg_images :: [MandrillWebContent]
329+ , _mmsg_images :: [MandrillWebContent]
281330 -- ^ an array of embedded images to add to the message
282331 } deriving Show
283332
@@ -288,10 +337,10 @@ instance Arbitrary MandrillMessage where
288337 arbitrary = MandrillMessage <$> arbitrary
289338 <*> pure Nothing
290339 <*> pure "Test Subject"
291− <*> pure (fromJust $ emailAddress "sender@example.com")
340+ <*> pure (MandrillEmail . fromJust $ emailAddress "sender@example.com")
292341 <*> pure Nothing
293342 <*> resize 2 arbitrary
294− <*> pure emptyObject
343+ <*> pure H.empty
295344 <*> pure Nothing
296345 <*> pure Nothing
297346 <*> pure Nothing
@@ -312,13 +361,24 @@ instance Arbitrary MandrillMessage where
312361 <*> pure Nothing
313362 <*> pure []
314363 <*> pure Nothing
315− <*> pure emptyObject
364+ <*> pure H.empty
316365 <*> pure []
317366 <*> pure []
318367 <*> pure []
319368
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
378+
320379--------------------------------------------------------------------------------
321380type MandrillKey = T.Text
381+type MandrillTemplate = T.Text
322382
323383newtype MandrillDate = MandrillDate {
324384 fromMandrillDate :: UTCTime
@@ -329,6 +389,6 @@ instance ToJSON MandrillDate where
329389
330390instance FromJSON MandrillDate where
331391 parseJSON = withText "MandrillDate" $ \t ->
332− 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
333393 Just d -> pure $ MandrillDate d
334394 _ -> fail "could not parse Mandrill date"