mandrill_mailer 1.0.1 → 1.0.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 9f3255d5096df33a1fcdbf3d562ff8f3a2cab3fc
4
- data.tar.gz: 1e4a6d539dc09befe73bdc2054b4c5bfd5210663
3
+ metadata.gz: 71d1eac500311e4cd57b322024c815e6f369cf18
4
+ data.tar.gz: 826bd16487f2d5281f3ddc6d8ba3acdd60d7a9a4
5
5
  SHA512:
6
- metadata.gz: 9b6c81956a7d72dfd202fd35aa46db470467fd783c2ac48485e3ed630aa735e786925a8d758a67c1b8f41e5beaa15a4a60695b773db228c37e8776d71d3021e4
7
- data.tar.gz: d47ec51ea5daa756a8d67c8659c0fdb120797a517df0362aa54d8ae31e07277e8240413456381170c654fc7a33ca27434a89cc723b8d98d6826859cedfc79a7c
6
+ metadata.gz: 3d759d95bd97f40669f6fcc38af767addf5c45415de171629ea8e9c89662a10fc0d85c4e7a5c12017bd78d0b7755130413728867f11a5251320a157aabfe9356
7
+ data.tar.gz: dc43f30132274915203149e07483bf4b06bdc3e1fc423829cbb74426c862050345cb0d1d11dd97b1dc4e80c3db0e6ff3c6f81a76208ce7c378e9a94ff7c5b5e5
data/CHANGELOG.md CHANGED
@@ -2,14 +2,21 @@
2
2
  All notable changes to this project will be documented in this file.
3
3
  This project adheres to [Semantic Versioning](http://semver.org/).
4
4
 
5
+ ## 1.0.2
6
+ - Fix a bug where defaults in merge vars were receiving the correct defaults - Credit @kennethkalmer
7
+
5
8
  ## 1.0.1
6
- - Correct regression caused in 1.0.0 that broke defaults in mailers - Credit: @etipton
9
+ - Correct regression caused in 1.0.0 that broke defaults in mailers - Credit: @etipton
7
10
 
8
11
  ## 1.0.0
12
+ ### Changed
9
13
  - Update manrill_api gem to 1.0.X
10
14
  - Change how interceptors work to be more flexible and not overwrite data if needed
11
15
  - Make both the template and message mailers compatible with all available attributes in the messages api
12
16
 
17
+ ### Removed
18
+ - Deprecated `data` method on Mailer objects, replaced with `message`.
19
+
13
20
  ## 0.6.1
14
21
  ### Fixed
15
22
  - Correct a regression introduced in 0.6.0 that caused a TypeError exception
data/README.md CHANGED
@@ -146,6 +146,8 @@ end
146
146
 
147
147
  * `:inline_css` - whether or not to automatically inline all CSS styles provided in the message HTML - only for HTML documents less than 256KB in size.
148
148
 
149
+ * `:merge_language` - the merge tag language to use when evaluating merge tags, either 'mailchimp' or 'handlebars'. Default is 'mailchimp'.
150
+
149
151
  * `:attachments` - An array of file objects with the following keys:
150
152
  * `content`: The file contents, this will be encoded into a base64 string internally
151
153
  * `name`: The name of the file
@@ -1,3 +1,3 @@
1
1
  module MandrillMailer
2
- VERSION = "1.0.1"
2
+ VERSION = "1.0.2"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: mandrill_mailer
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.1
4
+ version: 1.0.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Adam Rensel
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-05-20 00:00:00.000000000 Z
11
+ date: 2015-06-22 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activesupport