mandrill_mailer 0.4.1 → 0.4.2

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZmZiZGQ5ZDQwYzQ2ZDAzMzhjNjg3ZDA2ZTQ3YjkyYTQ3YmU4OTBjMA==
-  data.tar.gz: !binary |-
-    Y2Y0M2Y0ZjkzYTllNDg4NmUxOWU3YWVlYjIzNzEwYzA0MmZkZDU4MQ==
+SHA1:
+  metadata.gz: 1bfa455214d0fad5180b76450327ac30b7ffcc74
+  data.tar.gz: aaa9f37d06d8c32a1d3bb0ba33490c7ce4e3b36d
 SHA512:
-  metadata.gz: !binary |-
-    YmYzMmM5M2Y0NjNjNDE0MjdmZWEwODdmZDk5OTM4MWJlNTU2NmU2NTNjZDNl
-    Y2JmNGE3NjA4ODA4M2JmZjZiNDRjYmJkM2FkYTUzY2NhYjUzOTk2ODExNTlj
-    ZDJjYTUzN2JkMjEwMTAxNGZiMzJjNTFjNWM1NjVlMWI0ZjBkOTE=
-  data.tar.gz: !binary |-
-    ZTI4YjdmY2ZmNmU5MTYwYjJhNmJhZTRiMWVmMzE1YzhlNTc4MDc4ZDZjZTky
-    ODc5YjIzYzQ0N2Q5NzExZjk5MDRkOWE2YzMxODRlYjIwYWE1MTU3MjJkYzI3
-    OGY1ZTBmNTRlYzRlNGEyMGJkYmQ5OWIyM2NjYmIzOGQ1NTQ3YmE=
+  metadata.gz: 3f5580807bc7f7a0c13c6bcdc8749719e7b638e141253025b93b7fb3fc33dfe5735bf5f80f1bef647b5530f971647a80f133bb054d620e84b615b727eb9b76b1
+  data.tar.gz: 6dad0436a16f92014ac77929794d5e075a547be5ce19696f8a460e97af2589a34338a3b8c3c3f0e68c164ee2eeda95533e52eb54f42920a2db7a88d712e92a5d

data/README.md

@@ -191,3 +191,14 @@ class UpdateEmailJob < Struct.new(:user_id)
   end
 end
 ```
+
+## Using an interceptor
+You can set a mailer interceptor to override any params used when you deliver an e-mail.
+
+Example:
+
+```ruby
+MandrillMailer.configure do |config|
+  config.interceptor_params = { to: "emailtothatwillbeusedinall@emailssent.com" }
+end
+```

data/change_log.md

@@ -1,3 +1,7 @@
+* 0.4.2
+  Add the ability to intercept emails before they are sent in the config
+  see the specs for more info
+
 * 0.4.1
   add subaccount parameter
 

data/lib/mandrill_mailer/template_mailer.rb

@@ -91,6 +91,7 @@ module MandrillMailer
 
     class InvalidEmail < StandardError; end
     class InvalidMailerMethod < StandardError; end
+    class InvalidInterceptorParams < StandardError; end
 
     # Public: Defaults for the mailer. Currently the only option is from:
     #
@@ -267,6 +268,13 @@ module MandrillMailer
         "attachments" => mandrill_attachment_args(args[:attachments])
       }
 
+      unless MandrillMailer.config.interceptor_params.nil?
+        unless MandrillMailer.config.interceptor_params.is_a?(Hash)
+          raise InvalidInterceptorParams.new "The interceptor_params config must be a Hash"
+        end
+        self.message.merge!(MandrillMailer.config.interceptor_params.stringify_keys)
+      end
+
       # return self so we can chain deliver after the method call, like a normal mailer.
       return self
     end

data/lib/mandrill_mailer/version.rb

@@ -1,3 +1,3 @@
 module MandrillMailer
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

data/spec/template_mailer_spec.rb

@@ -178,32 +178,6 @@ describe MandrillMailer::TemplateMailer do
       subject.template_content.should eq [{'name' => template_content_name, 'content' => template_content_content}]
     end
 
-    it 'should produce the correct message' do
-      subject.message.should eq ({
-        "subject" => args[:subject],
-        "from_email" => from_email,
-        "from_name" => from_name,
-        "to" => [{'email' => to_email, 'name' => to_name}],
-        "headers" => args[:headers],
-        "important" => args[:important],
-        "inline_css" => args[:inline_css],
-        "track_opens" => args[:track_opens],
-        "track_clicks" => args[:track_clicks],
-        "auto_text" => true,
-        "url_strip_qs" => args[:url_strip_qs],
-        "preserve_recipients" => false,
-        "bcc_address" => args[:bcc],
-        "global_merge_vars" => [{"name" => var_name, "content" => var_content}],
-        "merge_vars" => [{"rcpt" => to_email, "vars" => [{"name" => var_rcpt_name, "content" => var_rcpt_content}]}],
-        "tags" => args[:tags],
-        "metadata" => args[:metadata],
-        "subaccount" => args[:subaccount],
-        "google_analytics_domains" => args[:google_analytics_domains],
-        "google_analytics_campaign" => args[:google_analytics_campaign],
-        "attachments" => [{'type' => attachment_mimetype, 'name' => attachment_filename, 'content' => Base64.encode64(attachment_file)}]
-      })
-    end
-
     it 'should retain data method' do
       subject.data.should eq({
         "key" => MandrillMailer.config.api_key,
@@ -219,6 +193,76 @@ describe MandrillMailer::TemplateMailer do
     it 'should set send_at option' do
       subject.send_at.should eq('2020-01-01 08:00:00')
     end
+
+    context "without interceptor" do
+      it 'should produce the correct message' do
+        subject.message.should eq ({
+          "subject" => args[:subject],
+          "from_email" => from_email,
+          "from_name" => from_name,
+          "to" => [{'email' => to_email, 'name' => to_name}],
+          "headers" => args[:headers],
+          "important" => args[:important],
+          "inline_css" => args[:inline_css],
+          "track_opens" => args[:track_opens],
+          "track_clicks" => args[:track_clicks],
+          "auto_text" => true,
+          "url_strip_qs" => args[:url_strip_qs],
+          "preserve_recipients" => false,
+          "bcc_address" => args[:bcc],
+          "global_merge_vars" => [{"name" => var_name, "content" => var_content}],
+          "merge_vars" => [{"rcpt" => to_email, "vars" => [{"name" => var_rcpt_name, "content" => var_rcpt_content}]}],
+          "tags" => args[:tags],
+          "metadata" => args[:metadata],
+          "subaccount" => args[:subaccount],
+          "google_analytics_domains" => args[:google_analytics_domains],
+          "google_analytics_campaign" => args[:google_analytics_campaign],
+          "attachments" => [{'type' => attachment_mimetype, 'name' => attachment_filename, 'content' => Base64.encode64(attachment_file)}]
+        })
+      end
+    end
+
+    context "with interceptor" do
+      before(:each) do
+        @intercepted_params = {
+          to: { email: 'interceptedto@test.com', name: 'Mr. Interceptor' },
+          tags: ['intercepted-tag'],
+          bcc_address: 'interceptedbbc@email.com'
+        }
+        MandrillMailer.config.interceptor_params = @intercepted_params
+      end
+
+      it "should raise an error if interceptor params is not a Hash" do
+        MandrillMailer.config.interceptor_params = "error"
+        expect { subject }.to raise_error(MandrillMailer::TemplateMailer::InvalidInterceptorParams, "The interceptor_params config must be a Hash")
+      end
+
+      it 'should produce the correct message' do
+        subject.message.should eq ({
+          "subject" => args[:subject],
+          "from_email" => from_email,
+          "from_name" => from_name,
+          "to" => @intercepted_params[:to],
+          "headers" => args[:headers],
+          "important" => args[:important],
+          "inline_css" => args[:inline_css],
+          "track_opens" => args[:track_opens],
+          "track_clicks" => args[:track_clicks],
+          "auto_text" => true,
+          "url_strip_qs" => args[:url_strip_qs],
+          "preserve_recipients" => false,
+          "bcc_address" => @intercepted_params[:bcc_address],
+          "global_merge_vars" => [{"name" => var_name, "content" => var_content}],
+          "merge_vars" => [{"rcpt" => to_email, "vars" => [{"name" => var_rcpt_name, "content" => var_rcpt_content}]}],
+          "tags" => @intercepted_params[:tags],
+          "metadata" => args[:metadata],
+          "subaccount" => args[:subaccount],
+          "google_analytics_domains" => args[:google_analytics_domains],
+          "google_analytics_campaign" => args[:google_analytics_campaign],
+          "attachments" => [{'type' => attachment_mimetype, 'name' => attachment_filename, 'content' => Base64.encode64(attachment_file)}]
+        })
+      end
+    end
   end
 
   describe 'url helpers in mailer' do

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: mandrill_mailer
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Adam Rensel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-06 00:00:00.000000000 Z
+date: 2013-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -56,28 +56,28 @@ dependencies:
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Transactional Mailer for Mandrill
@@ -112,12 +112,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []