mandrill_mailer 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 050aa30e1863a63c0e023050c83d720fdf952805
-  data.tar.gz: f2179df6cf50a863c5b70096a8cadbf77ea40dc8
+  metadata.gz: 9f3255d5096df33a1fcdbf3d562ff8f3a2cab3fc
+  data.tar.gz: 1e4a6d539dc09befe73bdc2054b4c5bfd5210663
 SHA512:
-  metadata.gz: 5ccb28b3e20348666f2fe2ba80565a24ce06e2550013de771ab7ac7a03a9d69ef7e4773bef4aa5bbef72f93c764494cbc456e428d8c2b0eb0b881f65f52bd6d7
-  data.tar.gz: 31deabd8cace6c79cffe3f8004a3ffcb8e865bac0d71a0361da230790dcd7bae607c060c4ae63cf219c491e5422f7b0dbb476ba149ec5bcfa2a44d9a7229070f
+  metadata.gz: 9b6c81956a7d72dfd202fd35aa46db470467fd783c2ac48485e3ed630aa735e786925a8d758a67c1b8f41e5beaa15a4a60695b773db228c37e8776d71d3021e4
+  data.tar.gz: d47ec51ea5daa756a8d67c8659c0fdb120797a517df0362aa54d8ae31e07277e8240413456381170c654fc7a33ca27434a89cc723b8d98d6826859cedfc79a7c

data/CHANGELOG.md

@@ -2,6 +2,9 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 1.0.1
+- Correct regression caused in 1.0.0 that broke defaults in mailers - Credit: @etipton 
+
 ## 1.0.0
 - Update manrill_api gem to 1.0.X
 - Change how interceptors work to be more flexible and not overwrite data if needed

data/README.md

@@ -341,11 +341,11 @@ MandrillMailer.configure do |config|
   config.interceptor = Proc.new {|params|
 
     params[:to] =  [
-                     params[:to],
-                     { email: "bccEmailThatWillBeUsedInAll@emailsSent1.com", name: "name", type: "bcc" },
-                     { email: "bccEmailThatWillBeUsedInAll@emailsSent2.com", name: "name", type: "bcc" },
-                     { email: "bccEmailThatWillBeUsedInAll@emailsSent3.com", name: "name", type: "bcc" }
-                   ].flatten
+      params[:to],
+      { email: "bccEmailThatWillBeUsedInAll@emailsSent1.com", name: "name", type: "bcc" },
+      { email: "bccEmailThatWillBeUsedInAll@emailsSent2.com", name: "name", type: "bcc" },
+      { email: "bccEmailThatWillBeUsedInAll@emailsSent3.com", name: "name", type: "bcc" }
+    ].flatten
   }
 end
 ```

data/lib/mandrill_mailer/arg_formatter.rb

@@ -69,7 +69,7 @@ module MandrillMailer
       end
     end
 
-    def self.format_messages_api_message_data(args)
+    def self.format_messages_api_message_data(args, defaults)
       # If a merge_language attribute is given and it's not one of the accepted
       # languages Raise an error
       if args[:merge_language] && !ACCEPTED_MERGE_LANGUAGES.include?(args[:merge_language])
@@ -111,9 +111,5 @@ module MandrillMailer
         "images" => images_args(args[:images])
       }
     end
-
-    def self.defaults
-      MandrillMailer::CoreMailer.defaults
-    end
   end
-end
+end

data/lib/mandrill_mailer/core_mailer.rb

@@ -242,7 +242,7 @@ module MandrillMailer
       mandrill_mail_handler(args)
 
       # Construct message hash
-      self.message = MandrillMailer::ArgFormatter.format_messages_api_message_data(args)
+      self.message = MandrillMailer::ArgFormatter.format_messages_api_message_data(args, self.class.defaults)
 
       # Apply any interceptors that may be present
       apply_interceptors!(self.message)

data/lib/mandrill_mailer/version.rb

@@ -1,3 +1,3 @@
 module MandrillMailer
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/spec/arg_formatter_spec.rb

@@ -197,7 +197,7 @@ describe MandrillMailer::ArgFormatter do
 
   describe ".format_messages_api_message_data" do
     it "includes all api values" do
-      result = formatter.format_messages_api_message_data({})
+      result = formatter.format_messages_api_message_data({}, {})
       api_values = ["html", "text", "subject", "from_email", "from_name", "to",
                     "headers", "important", "track_opens", "track_clicks", "auto_text",
                     "auto_html", "inline_css", "url_strip_qs", "preserve_recipients",
@@ -216,20 +216,20 @@ describe MandrillMailer::ArgFormatter do
     context "merge_language exists" do
       context "merge_language is an accepted merge language" do
         it "does not raise an error" do
-          expect { formatter.format_messages_api_message_data({merge_language: "handlebars"}) }.not_to raise_error
+          expect { formatter.format_messages_api_message_data({merge_language: "handlebars"}, {}) }.not_to raise_error
         end
       end
 
       context "merge_language is not an accepted merge language" do
         it "raises an error" do
-          expect { formatter.format_messages_api_message_data({merge_language: "not_valid"}) }.to raise_error(MandrillMailer::CoreMailer::InvalidMergeLanguageError)
+          expect { formatter.format_messages_api_message_data({merge_language: "not_valid"}, {}) }.to raise_error(MandrillMailer::CoreMailer::InvalidMergeLanguageError)
         end
       end
     end
 
     context "merge_language does not exist" do
       it "does not raise an error" do
-        expect { formatter.format_messages_api_message_data({}) }.not_to raise_error
+        expect { formatter.format_messages_api_message_data({}, {}) }.not_to raise_error
       end
     end
   end

data/spec/core_mailer_spec.rb

@@ -95,6 +95,28 @@ describe MandrillMailer::CoreMailer do
       mailer.mandrill_mail(args)
     end
 
+    it "applies defaults" do
+      default_from = "default name"
+      default_from_email = "default@email.com"
+
+      unique_mailer = Class.new(core_mailer) do
+        default from_name: default_from,
+                from: default_from_email
+      end
+
+      # Create a second mailer to make sure we don't get class var pollution
+      control_mailer = Class.new(core_mailer) do
+        default from_name: "None",
+                from: "invalid@email.com"
+      end
+
+      new_unique_mailer = unique_mailer.new
+      new_unique_mailer.mandrill_mail({})
+
+      expect(new_unique_mailer.message['from_name']).to eq default_from
+      expect(new_unique_mailer.message['from_email']).to eq default_from_email
+    end
+
     describe "vars attribute" do
       it "returns the vars" do
         mailer.mandrill_mail(args)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mandrill_mailer
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Adam Rensel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-16 00:00:00.000000000 Z
+date: 2015-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport