master..65532fc · typeable/mandrill

.gitignore−1

since splitsnapshots

unifiedsplit

@@ -3,4 +3,3 @@ dist

3cabal.sandbox.config

4shell.nix

5.stack-work

6−tags

README.md−8

@@ -8,14 +8,6 @@ the [Mandrill](http://mandrillapp.com) transactional email service.

8

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

11## Version 0.5.3.2

20

12

21* Relaxed upper bound on Aeson (see: fpco/stackage/issues/2449)

13* Relaxed upper bound on Aeson (see: fpco/stackage/issues/2449)

mandrill-nightly.yml+2−3

@@ -4,7 +4,6 @@ flags:

4packages:

5- '.'

6extra-deps:

7− - aeson-1.3.0.0

7+ - aeson-1.2.0.0

8− - text-1.2.3.0

9 - semigroups-0.18.2

8 - semigroups-0.18.2

10−resolver: lts-9.1

9+resolver: lts-7.4

mandrill.cabal+3−3

@@ -1,5 +1,5 @@

1name: mandrill

2−version: 0.5.3.5

2+version: 0.5.3.2

3synopsis: Library for interfacing with the Mandrill JSON API

4description: Pure Haskell client for the Mandrill JSON API

5license: MIT

@@ -41,8 +41,8 @@ library

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

44+ , aeson >= 0.7.0.3 && < 1.3.0.0

45− , microlens-th >= 0.4.0.0

45+ , lens >= 4.0

46 , blaze-html >= 0.5.0.0

47 , QuickCheck >= 2.6 && < 3.0

48 , mtl < 3.0

src/Network/API/Mandrill.hs+6−7

@@ -20,6 +20,7 @@ module Network.API.Mandrill (

20 -- $exampleusage

21 ) where

22

23+import Control.Lens

23import Control.Monad.Reader

24import Control.Monad.Reader

24import qualified Data.Aeson as JSON

25import qualified Data.Aeson as JSON

25import qualified Data.HashMap.Strict as H

26import qualified Data.HashMap.Strict as H

@@ -106,7 +107,7 @@ newHtmlMessage :: EmailAddress

106 -- ^ The HTML body

107 -- ^ The HTML body

107 -> MandrillMessage

108 -> MandrillMessage

108newHtmlMessage f t subj html = let body = mkMandrillHtml html in

109newHtmlMessage f t subj html = let body = mkMandrillHtml html in

109− (emptyMessage f t) { _mmsg_html = body, _mmsg_subject = subj }

110+ ((mmsg_html .~ body) . (mmsg_subject .~ subj)) $ (emptyMessage f t)

110

111

111--------------------------------------------------------------------------------

112--------------------------------------------------------------------------------

112-- | Create a new template message (no HTML).

113-- | Create a new template message (no HTML).

@@ -117,7 +118,7 @@ newTemplateMessage :: EmailAddress

117 -> T.Text

118 -> T.Text

118 -- ^ Subject

119 -- ^ Subject

119 -> MandrillMessage

120 -> MandrillMessage

120−newTemplateMessage f t subj = (emptyMessage f t) { _mmsg_subject = subj }

121+newTemplateMessage f t subj = (mmsg_subject .~ subj) $ (emptyMessage f t)

121

122

122--------------------------------------------------------------------------------

123--------------------------------------------------------------------------------

123-- | Create a new textual message. By default Mandrill doesn't require you

124-- | Create a new textual message. By default Mandrill doesn't require you

@@ -133,11 +134,9 @@ newTextMessage :: EmailAddress

133 -- ^ The body, as normal text.

134 -- ^ The body, as normal text.

134 -> MandrillMessage

135 -> MandrillMessage

135newTextMessage f t subj txt = let body = unsafeMkMandrillHtml txt in

136newTextMessage f t subj txt = let body = unsafeMkMandrillHtml txt in

136− (emptyMessage f t) {

137+ ((mmsg_html .~ body) .

137− _mmsg_html = body

138− , _mmsg_text = Just txt

138+ (mmsg_text .~ Just txt) .

139− , _mmsg_subject = subj

139+ (mmsg_subject .~ subj)) (emptyMessage f t)

140− }

141

140

142

141

143--------------------------------------------------------------------------------

142--------------------------------------------------------------------------------

src/Network/API/Mandrill/Inbound.hs+1−1

@@ -1,11 +1,11 @@

1{-# LANGUAGE TemplateHaskell #-}

2module Network.API.Mandrill.Inbound where

3+import Control.Lens

3import Data.Aeson (FromJSON, ToJSON, parseJSON,

4import Data.Aeson (FromJSON, ToJSON, parseJSON,

4 toJSON)

5 toJSON)

5import Data.Aeson.TH (defaultOptions, deriveJSON)

6import Data.Aeson.TH (defaultOptions, deriveJSON)

6import Data.Aeson.Types (fieldLabelModifier)

7import Data.Aeson.Types (fieldLabelModifier)

7import Data.Text (Text)

8import Data.Text (Text)

8−import Lens.Micro.TH (makeLenses)

9import Network.API.Mandrill.HTTP (toMandrillResponse)

10import Network.API.Mandrill.Settings

11import Network.API.Mandrill.Types

src/Network/API/Mandrill/Messages/Types.hs+1−1

@@ -5,12 +5,12 @@ module Network.API.Mandrill.Messages.Types where

5import Data.Char

6import Data.Time

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

15import Network.API.Mandrill.Types

16

src/Network/API/Mandrill/Senders.hs+1−1

@@ -1,12 +1,12 @@

1{-# LANGUAGE TemplateHaskell #-}

2module Network.API.Mandrill.Senders where

3+import Control.Lens

3import Data.Aeson (FromJSON, ToJSON, parseJSON,

4import Data.Aeson (FromJSON, ToJSON, parseJSON,

4 toJSON)

5 toJSON)

5import Data.Aeson.TH (defaultOptions, deriveJSON)

6import Data.Aeson.TH (defaultOptions, deriveJSON)

6import Data.Aeson.Types (Value (..), fieldLabelModifier)

7import Data.Aeson.Types (Value (..), fieldLabelModifier)

7import Data.Text (Text)

8import Data.Text (Text)

8import Data.Text.Encoding (decodeUtf8, encodeUtf8)

9import Data.Text.Encoding (decodeUtf8, encodeUtf8)

9−import Lens.Micro.TH (makeLenses)

10import Network.API.Mandrill.HTTP (toMandrillResponse)

11import Network.API.Mandrill.Settings

12import Network.API.Mandrill.Types

src/Network/API/Mandrill/Types.hs+1−6

@@ -13,7 +13,6 @@ import Control.Monad (mzero)

13import Data.Char

14import Data.Maybe

15import Data.Time

16−import Lens.Micro.TH (makeLenses)

17import Network.API.Mandrill.Utils

16import Network.API.Mandrill.Utils

18import Test.QuickCheck

17import Test.QuickCheck

19import Text.Email.Validate

18import Text.Email.Validate

@@ -22,6 +21,7 @@ import Data.Time.Format (TimeLocale, defaultTimeLocale)

22#else

21#else

23import System.Locale (TimeLocale, defaultTimeLocale)

22import System.Locale (TimeLocale, defaultTimeLocale)

24#endif

23#endif

24+import Control.Lens

25import Data.Aeson

26import Data.Aeson.TH

27import Data.Aeson.Types

@@ -158,11 +158,6 @@ unsafeMkMandrillHtml = MandrillHtml . Blaze.preEscapedToHtml

158mkMandrillHtml :: Blaze.Html -> MandrillHtml

159mkMandrillHtml = 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−

166instance Monoid MandrillHtml where

161instance Monoid MandrillHtml where

167 mempty = MandrillHtml mempty

162 mempty = MandrillHtml mempty

168 mappend (MandrillHtml m1) (MandrillHtml m2) = MandrillHtml (m1 <> m2)

163 mappend (MandrillHtml m1) (MandrillHtml m2) = MandrillHtml (m1 <> m2)

src/Network/API/Mandrill/Users/Types.hs+1−1

@@ -5,12 +5,12 @@ module Network.API.Mandrill.Users.Types where

5import Data.Char

6import Data.Time

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

15import Network.API.Mandrill.Types

16

src/Network/API/Mandrill/Webhooks.hs+1−1

@@ -2,6 +2,7 @@

2{-# LANGUAGE TemplateHaskell #-}

3module Network.API.Mandrill.Webhooks where

4import Control.Applicative (pure)

5+import Control.Lens

5import Control.Monad (mzero)

6import Control.Monad (mzero)

6import Data.Aeson (FromJSON, ToJSON, parseJSON,

7import Data.Aeson (FromJSON, ToJSON, parseJSON,

7 toJSON)

8 toJSON)

@@ -11,7 +12,6 @@ import Data.Aeson.Types (fieldLabelModifier)

11import Data.Set (Set)

12import Data.Set (Set)

12import Data.Text (Text)

13import Data.Text (Text)

13import qualified Data.Text as T

14import qualified Data.Text as T

14−import Lens.Micro.TH (makeLenses)

15import Network.API.Mandrill.HTTP (toMandrillResponse)

16import Network.API.Mandrill.Settings

17import Network.API.Mandrill.Types

stack.yaml+1−1

@@ -2,4 +2,4 @@ flags: {}

2packages:

3- '.'

4extra-deps: []

5−resolver: lts-11.13

5+resolver: lts-5.2