mandrill_mailer 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71d1eac500311e4cd57b322024c815e6f369cf18
-  data.tar.gz: 826bd16487f2d5281f3ddc6d8ba3acdd60d7a9a4
+  metadata.gz: 6cec71a64a8a20cffa3174b760b1196f3e72846f
+  data.tar.gz: 72ad5d28b0e812b0513fd9bbd3c0c3f19d47e864
 SHA512:
-  metadata.gz: 3d759d95bd97f40669f6fcc38af767addf5c45415de171629ea8e9c89662a10fc0d85c4e7a5c12017bd78d0b7755130413728867f11a5251320a157aabfe9356
-  data.tar.gz: dc43f30132274915203149e07483bf4b06bdc3e1fc423829cbb74426c862050345cb0d1d11dd97b1dc4e80c3db0e6ff3c6f81a76208ce7c378e9a94ff7c5b5e5
+  metadata.gz: 179f7ed1f504bcfc472d8db839dac2fd9bd4eef419e4304101de9ef7477ac6f3f50f513781c97395f1e3e5c9c6fc901a3e10565058b23406b055199a8fc9315d
+  data.tar.gz: 2914a62ac2d55f9e17f500e512b7949e6961ec033bdaad995357368033b01de642313e6ae58e33c9971820315d0e820f8c583939544baa40310dbe143dc77633

data/CHANGELOG.md

@@ -2,7 +2,7 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## 1.0.2
+## 1.0.3
 - Fix a bug where defaults in merge vars were receiving the correct defaults - Credit @kennethkalmer
 
 ## 1.0.1

data/lib/mandrill_mailer/arg_formatter.rb

@@ -99,8 +99,8 @@ module MandrillMailer
         "return_path_domain" => args[:return_path_domain],
         "merge" => boolean(args[:merge]),
         "merge_language" => args[:merge_language],
-        "global_merge_vars" => mandrill_args(args[:vars] || args[:global_merge_vars]),
-        "merge_vars" => merge_vars(args[:recipient_vars] || args[:merge_vars] || defaults[:merge_vars]),
+        "global_merge_vars" => mandrill_args(args[:vars] || args[:global_merge_vars] || defaults[:merge_vars]),
+        "merge_vars" => merge_vars(args[:recipient_vars] || args[:merge_vars]),
         "tags" => args[:tags],
         "subaccount" => args[:subaccount],
         "google_analytics_domains" => args[:google_analytics_domains],

data/lib/mandrill_mailer/version.rb

@@ -1,3 +1,3 @@
 module MandrillMailer
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/spec/core_mailer_spec.rb

@@ -98,10 +98,12 @@ describe MandrillMailer::CoreMailer do
     it "applies defaults" do
       default_from = "default name"
       default_from_email = "default@email.com"
+      default_merge_vars = { foo: "bar" }
 
       unique_mailer = Class.new(core_mailer) do
         default from_name: default_from,
-                from: default_from_email
+                from: default_from_email,
+                merge_vars: default_merge_vars
       end
 
       # Create a second mailer to make sure we don't get class var pollution
@@ -115,6 +117,9 @@ describe MandrillMailer::CoreMailer do
 
       expect(new_unique_mailer.message['from_name']).to eq default_from
       expect(new_unique_mailer.message['from_email']).to eq default_from_email
+
+      global_merge_vars = [{ "name" => :foo, "content" => "bar" }]
+      expect(new_unique_mailer.message['global_merge_vars']).to eq global_merge_vars
     end
 
     describe "vars attribute" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mandrill_mailer
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Adam Rensel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-22 00:00:00.000000000 Z
+date: 2015-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport