mandrill_mailer 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 066d9d8a41e15e942635771fdef695a54a71a667
-  data.tar.gz: c1dddaf88be75ed2ddab9165767145aace80dc1b
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YWI2NjAwM2QwM2Q4OWFmZWUyNjQwNjFiOTBlOWYyMWI2NGJmNDEwZQ==
+  data.tar.gz: !binary |-
+    NTg4NzVlMGU0NjFhNGY4MWM3ZTc4YmM3ZjNlODI3N2EzMjRkMmY0YQ==
 SHA512:
-  metadata.gz: 768bfe2d37ea0b516bead42c089ffdb5d2a077bb8e0300a5e721f8ec656f1fc9717e068877e5b6d5c190c2b73e6c09fdea9e67a74b47f8a2332e74a77ac8a05e
-  data.tar.gz: df0ea1de244c30e78cb3b5c8de329c2f8bc017abb01e56369dab9c7c715a280a8da9d4ada95f1538d2b8d4bcad9455868cfb07ed48cd165f3429e98d9af85e52
+  metadata.gz: !binary |-
+    Y2NhMWM5ZTMwNjNiZmNhNmU1ZDVhYjJiMzkxY2VkNzNiOTQyZDRhZjU5ZmFk
+    NWJmZjFlYTdkYjJiY2FhNzNjMWZkMGNlN2Q3Y2QyNTQyOTNlNWY4OTQxZGY0
+    ZDY0ZTgyNWNhYjA0Yzc5ZDdlNzQ5MDdlZTkwYzBjMWFmMjk2ZmY=
+  data.tar.gz: !binary |-
+    MWE2ODc4OTI2YzgyZmIyMDQ5NjAxYjQ5ZDhlMWY2ODU0MTNmOThkMTE5N2Jk
+    YTNmMTBjNWVhOWQ5N2UxMWU1YmFiMGQ0NWExMGE4MmE3NjlmZmE3MzZhYzJl
+    OGU2ODM2ZTc1NmNkYTU1OWQzNGU5YzQ1ZjMwNzZkMzNhNjc0MTk=

data/CHANGELOG.md

@@ -0,0 +1,14 @@
+# 0.4.3
+- [FEATURE] Add the ability to look at deliveries for offline testing.
+
+# 0.4.2
+- [FEATURE] Add the ability to intercept emails before they are sent in the config (see the specs for more info).
+
+# 0.4.1
+- [FEATURE] Add subaccount parameter.
+
+# 0.4.0
+- Default setting for preserve_recipients no longer defaults to true. Bumping a minor version since this might have been assumed to be default and not set by some.
+
+# 0.3.8
+- Changelog created.

data/README.md

@@ -176,7 +176,7 @@ And then if you wish you can look at the contents of `MandrillMailer.deliveries`
 ```ruby
 email = MandrillMailer::deliveries.detect { |mail|
   mail.template_name == 'my-template' &&
-  mail.message['to'].any? { |to| to['email'] == 'my@email.com' }
+  mail.message['to'].any? { |to| to[:email] == 'my@email.com' }
 }
 expect(email).to_not be_nil
 ```
@@ -215,6 +215,17 @@ class UpdateEmailJob < Struct.new(:user_id)
 end
 ```
 
+## Using Sidekiq
+
+To use this gem with Sidekiq, add `config/initializers/mandrill_mailer_sidekiq.rb`
+
+```ruby
+::MandrillMailer::TemplateMailer.extend(Sidekiq::Extensions::ActionMailer)
+```
+
+Use the same way you use ActionMailer. More info: https://github.com/mperham/sidekiq/wiki/Delayed-Extensions#actionmailer
+
+
 ## Using an interceptor
 You can set a mailer interceptor to override any params used when you deliver an e-mail.
 

data/lib/mandrill_mailer/template_mailer.rb

@@ -3,7 +3,7 @@
 
 # Example usage:
 
-# class InvitationMailer < MandrillMailer
+# class InvitationMailer < MandrillMailer::TemplateMailer
 #   default from: 'support@codeschool.com'
 
 #   def invite(invitation)
@@ -292,6 +292,18 @@ module MandrillMailer
       }
     end
 
+    def from
+      self.message && self.message['from_email']
+    end
+
+    def to
+      self.message && self.message['to']
+    end
+
+    def bcc
+      self.message && self.message['bcc_address']
+    end
+
     protected
 
     def mandrill_attachment_args(args)
@@ -314,7 +326,7 @@ module MandrillMailer
     end
 
     def self.respond_to?(method, include_private = false)
-      super || instance_methods.include?(method)
+      super || instance_methods.include?(method.to_sym)
     end
 
     # Proxy route helpers to rails if Rails exists. Doing routes this way

data/lib/mandrill_mailer/version.rb

@@ -1,3 +1,3 @@
 module MandrillMailer
-  VERSION = "0.4.3"
+  VERSION = "0.4.4"
 end

data/spec/template_mailer_spec.rb

@@ -7,10 +7,57 @@ describe MandrillMailer::TemplateMailer do
   let(:mailer) { described_class.new }
   let(:api_key) { '1237861278' }
 
+  let(:template_content_name) { 'edit' }
+  let(:template_content_content) { 'edit_content' }
+  let(:from_email) { 'from@email.com' }
+  let(:from_name) { 'Example Name' }
+  let(:var_name) { 'USER_NAME' }
+  let(:var_content) { 'bobert' }
+  let(:var_rcpt_name) { 'USER_INFO' }
+  let(:var_rcpt_content) { 'boboblacksheep' }
+  let(:to_email) { 'bob@email.com' }
+  let(:to_name) { 'bob' }
+  let(:attachment_file) { File.read(File.expand_path('spec/support/test_image.png')) }
+  let(:attachment_filename) { 'test_image.png' }
+  let(:attachment_mimetype) { 'image/png' }
+  let(:send_at) { Time.utc(2020, 1, 1, 8, 0) }
+  let(:bcc) { "bcc@email.com" }
+
+  let(:args) do
+    {
+      from: from_email,
+      template: 'Email Template',
+      subject: "super secret",
+      to: {'email' => to_email, 'name' => to_name},
+      preserve_recipients: false,
+      vars: {
+        var_name => var_content
+      },
+      recipient_vars: [
+        { to_email => { var_rcpt_name => var_rcpt_content } }
+      ],
+      template_content: {template_content_name => template_content_content},
+      headers: {"Reply-To" => "support@email.com"},
+      bcc: bcc,
+      tags: ['tag1'],
+      subaccount: "subaccount1",
+      google_analytics_domains: ["http://site.com"],
+      google_analytics_campaign: '1237423474',
+      attachments: [{file: attachment_file, filename: attachment_filename, mimetype: attachment_mimetype}],
+      inline_css: true,
+      important: true,
+      send_at: send_at,
+      track_opens: false,
+      track_clicks: false,
+      url_strip_qs: false
+    }
+  end
+
   before do
     MandrillMailer.config.api_key = api_key
     MandrillMailer.config.default_url_options = { host: default_host }
     MandrillMailer.config.stub(:image_path).and_return(image_path)
+    MandrillMailer::TemplateMailer.default from: from_email, from_name: from_name
   end
 
   describe '#image_path' do
@@ -116,56 +163,8 @@ describe MandrillMailer::TemplateMailer do
   end
 
   describe '#mandrill_mail' do
-    let(:template_content_name) { 'edit' }
-    let(:template_content_content) { 'edit_content' }
-    let(:from_email) { 'from@email.com' }
-    let(:from_name) { 'Example Name' }
-    let(:var_name) { 'USER_NAME' }
-    let(:var_content) { 'bobert' }
-    let(:var_rcpt_name) { 'USER_INFO' }
-    let(:var_rcpt_content) { 'boboblacksheep' }
-    let(:to_email) { 'bob@email.com' }
-    let(:to_name) { 'bob' }
-    let(:attachment_file) { File.read(File.expand_path('spec/support/test_image.png')) }
-    let(:attachment_filename) { 'test_image.png' }
-    let(:attachment_mimetype) { 'image/png' }
-    let(:send_at) { Time.utc(2020, 1, 1, 8, 0) }
-
-    let(:args) do
-      {
-        template: 'Email Template',
-        subject: "super secret",
-        to: {'email' => to_email, 'name' => to_name},
-        preserve_recipients: false,
-        vars: {
-          var_name => var_content
-        },
-        recipient_vars: [
-          { to_email => { var_rcpt_name => var_rcpt_content } }
-        ],
-        template_content: {template_content_name => template_content_content},
-        headers: {"Reply-To" => "support@email.com"},
-        bcc: 'email@email.com',
-        tags: ['tag1'],
-        subaccount: "subaccount1",
-        google_analytics_domains: ["http://site.com"],
-        google_analytics_campaign: '1237423474',
-        attachments: [{file: attachment_file, filename: attachment_filename, mimetype: attachment_mimetype}],
-        inline_css: true,
-        important: true,
-        send_at: send_at,
-        track_opens: false,
-        track_clicks: false,
-        url_strip_qs: false
-      }
-    end
-
     subject { mailer.mandrill_mail(args) }
 
-    before do
-      MandrillMailer::TemplateMailer.default from: from_email, from_name: from_name
-    end
-
     it 'should return the current class instance' do
       should eq mailer
     end
@@ -232,6 +231,10 @@ describe MandrillMailer::TemplateMailer do
         MandrillMailer.config.interceptor_params = @intercepted_params
       end
 
+      after do
+        MandrillMailer.config.interceptor_params = nil
+      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")
@@ -319,4 +322,49 @@ describe MandrillMailer::TemplateMailer do
       klassB.mandrill_mail({vars: {}}).message['from_name'].should eq 'ClassB'
     end
   end
+
+  describe '#respond_to' do
+    it 'can respond to a symbol' do
+      klassA = Class.new(MandrillMailer::TemplateMailer) do
+        def test_method
+
+        end
+      end
+
+      klassA.respond_to?(:test_method).should be_true
+    end
+    it 'can respond to a string' do
+      klassA = Class.new(MandrillMailer::TemplateMailer) do
+        def test_method
+
+        end
+      end
+
+      klassA.respond_to?('test_method').should be_true
+    end
+  end
+
+  describe "#from" do
+    subject { mailer.mandrill_mail(args) }
+
+    it "returns the from email" do
+      subject.from.should eq from_email
+    end
+  end
+
+  describe "#to" do
+    subject { mailer.mandrill_mail(args) }
+
+    it "returns the to email data" do
+      subject.to.should eq [{"email" => to_email, "name" => to_name}]
+    end
+  end
+
+  describe "#bcc" do
+    subject { mailer.mandrill_mail(args) }
+
+    it "returns the bcc email/s" do
+      subject.bcc.should eq bcc
+    end
+  end
 end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: mandrill_mailer
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Adam Rensel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-28 00:00:00.000000000 Z
+date: 2014-03-26 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
@@ -89,9 +89,9 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- CHANGELOG.md
 - Gemfile
 - README.md
-- change_log.md
 - lib/mandrill_mailer.rb
 - lib/mandrill_mailer/mock.rb
 - lib/mandrill_mailer/offline.rb
@@ -113,12 +113,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: []

data/change_log.md

@@ -1,16 +0,0 @@
-* 0.4.3
-  Add the ability to look at deliveries for offline testing.
-
-* 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
-
-* 0.4.0
-  Default setting for preserve_recipients no longer defaults to true. Bumping a minor
-  version since this might have been assumed to be default and not set by some.
-
-* 0.3.8
-  Change log created