multi_mail 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a14ecc758499e8df176c767f62299f37df33cb18
-  data.tar.gz: 32b938fec60cb8e6ae4b458bc5e88ccdcfd5237f
+  metadata.gz: 325f587b59afe15568ffa2098f5a17cb6cb9bc08
+  data.tar.gz: 3bfb48a0e0277863b7d86c2856af60d2db492647
 SHA512:
-  metadata.gz: 00473360787d54704565c3c4be5c25af31e27254fc64495ea229e59d934a64f8a645bd43b0687a39ebba94f5b488a0aa76192aee6c6b24b5384a79c4d501fa10
-  data.tar.gz: 7b43f573c40d70d6eab2f2a5f5fc2456f3b3cff2941701f2ec748ee1a8b509806a8828f230ae2dfaddc93da0f9e777487bad7da586084c685c0e3078d419ee6e
+  metadata.gz: 00e6624230f8adc6a1e86eaa400968a6ac5fc809bb19ba1480e3dfd94de45348dabc3a1018b9453a5d88393ea3a7d3d189299099f3b1284cea6b6e2138684c7c
+  data.tar.gz: 1241e28407f57bf8270424db4495df3109d081ebd1c32e6d529c197f31734d1ab5d9a3462b03de4c530df2959858bb1a7c6cae8ed79dfe527cc9f4294c52c4bf

data/README.md

@@ -96,20 +96,20 @@ end
 First, add the delivery method to ActionMailer:
 
 ```
-ActionMailer::Base.add_delivery_method :postmark, MultiMail::Sender::Postmark, :api_key => 'your-api-key'
+ActionMailer::Base.add_delivery_method :mandrill, MultiMail::Sender::Mandrill, :api_key => 'your-api-key'
 ```
 
 Set the default delivery method for all ActionMailer classes in `config/environments/<ENV>.rb`:
 
 ```
-config.action_mailer.delivery_method = :postmark
+config.action_mailer.delivery_method = :mandrill
 ```
 
 Or, set the delivery method in an ActionMailer class:
 
 ```
 class UserMailer < ActionMailer::Base
-  default :delivery_method => :postmark
+  default :delivery_method => :mandrill
 end
 ```
 
@@ -121,7 +121,7 @@ class UserMailer < ActionMailer::Base
     mail({
       :to => user.email,
       :subject => 'Welcome to My Awesome Site',
-      :delivery_method => :postmark,
+      :delivery_method => :mandrill,
     })
   end
 end
@@ -130,7 +130,7 @@ end
 Set the delivery method's default options for all ActionMailer classes in `config/environments/<ENV>.rb`:
 
 ```
-config.action_mailer.postmark_settings = {:api_key => 'your-api-key'}
+config.action_mailer.mandrill_settings = {:api_key => 'your-api-key', :template_name => 'default'}
 ```
 
 Or, set the delivery method's options in an ActionMailer method:
@@ -141,7 +141,7 @@ class UserMailer < ActionMailer::Base
     mail({
       :to => user.email,
       :subject => 'Welcome to My Awesome Site',
-      :delivery_method_options => {:api_key => 'your-api-key'},
+      :delivery_method_options => {:template_name => 'default'},
     })
   end
 end
@@ -151,14 +151,14 @@ Or, set the delivery method's options in an ActionMailer action:
 
 ```
 class UserMailer < ActionMailer::Base
-  after_action :set_delivery_method_options
+  before_action :set_delivery_method_options
 
   ...
 
   private
 
     def set_delivery_method_options
-      mail.delivery_method.settings.merge!({:api_key => 'your-api-key'})
+      mail.delivery_method.template_name = 'default'
     end
 end
 ```

data/lib/multi_mail/mandrill/sender.rb

@@ -6,7 +6,9 @@ module MultiMail
 
       requires :api_key
 
-      attr_reader :api_key, :async, :ip_pool, :send_at, :template_name, :template_content
+      attr_reader :api_key, :async, :ip_pool, :send_at
+
+      attr_accessor :template_name, :template_content
 
       # Initializes a Mandrill outgoing email sender.
       #
@@ -16,12 +18,12 @@ module MultiMail
       #   mode optimized for bulk sending
       # @option options [String] :ip_pool the name of the dedicated IP pool that
       #   should be used to send the message
+      # @option options [Time,String] :send_at when this message should be sent
       # @option options [String] :template_name the slug or name of a template
       #   that exists in the user's Mandrill account
       # @option options [Array<Hash>] :template_content an array of hashes, each
       #   with a `"name"` key for the editable region to inject into and a
       #  `"content"` key for the content to inject
-      # @option options [Time,String] :send_at when this message should be sent
       # @see https://mandrillapp.com/api/docs/index.ruby.html
       # @see https://mandrillapp.com/api/docs/messages.JSON.html#method-send
       def initialize(options = {})
@@ -67,9 +69,6 @@ module MultiMail
       # @see https://bitbucket.org/mailchimp/mandrill-api-ruby/src/d0950a6f9c4fac1dd2d5198a4f72c12c626ab149/lib/mandrill/api.rb?at=master#cl-738
       # @see https://bitbucket.org/mailchimp/mandrill-api-ruby/src/d0950a6f9c4fac1dd2d5198a4f72c12c626ab149/lib/mandrill.rb?at=master#cl-32
       def deliver!(mail)
-        @template_name = settings.delete(:template_name)
-        @template_content = settings.delete(:template_content)
-
         message = MultiMail::Message::Mandrill.new(mail).to_mandrill_hash.merge(parameters)
 
         api_params = {

data/lib/multi_mail/version.rb

@@ -1,3 +1,3 @@
 module MultiMail
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/multi_mail.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency('rack', '~> 1.5')
 
   # For testing
+  s.add_development_dependency('actionmailer', '~> 4.2.1')
   s.add_development_dependency('coveralls')
   s.add_development_dependency('rake')
   s.add_development_dependency('rspec', '~> 2.10')

data/spec/fixtures/anonymous/welcome.erb

@@ -0,0 +1 @@
+Anonymous mailer body

data/spec/mandrill/sender_spec.rb

@@ -14,6 +14,75 @@ describe MultiMail::Sender::Mandrill do
     Mail.new
   end
 
+  let :mailer do
+    Class.new(ActionMailer::Base) do
+      def welcome
+        mail
+      end
+    end
+  end
+
+  let :mailer_with_delivery_method_set_by_class do
+    Class.new(ActionMailer::Base) do
+      default :delivery_method => :mandrill
+
+      def welcome
+        mail
+      end
+    end
+  end
+
+  let :mailer_with_delivery_method_set_by_method do
+    Class.new(ActionMailer::Base) do
+      def welcome
+        mail(:delivery_method => :mandrill)
+      end
+    end
+  end
+
+  let :mailer_with_delivery_method_options_set_by_method do
+    Class.new(ActionMailer::Base) do
+      def welcome
+        mail(:delivery_method_options => {:template_name => 'default'})
+      end
+    end
+  end
+
+  let :mailer_with_delivery_method_options_set_by_action do
+    Class.new(ActionMailer::Base) do
+      before_action :set_delivery_method_options
+
+      def welcome
+        mail
+      end
+
+    private
+
+      def set_delivery_method_options
+        mail.delivery_method.template_name = 'default'
+      end
+    end
+  end
+
+  shared_examples 'a sender' do
+    it 'should send a message' do
+      results = message.deliver!
+      results.size.should == 1
+
+      result = results.first
+      result.size.should == 4
+
+      result['reject_reason'].should == nil
+      result['status'].should == 'sent'
+      result['email'].should == 'bit-bucket@test.smtp.org'
+      result['_id'].should match(/\A[0-9a-f]{32}\z/)
+    end
+
+    it 'should not send an empty message' do
+      empty_message.deliver!.should == [] # response not saved
+    end
+  end
+
   describe '#initialize' do
     it 'should raise an error if :api_key is missing' do
       expect{
@@ -133,48 +202,107 @@ describe MultiMail::Sender::Mandrill do
 
   describe '#deliver!' do
     context 'when :template_name is set' do
-      before do
+      before :all do
         Mail.defaults do
           delivery_method MultiMail::Sender::Mandrill, :api_key => ENV['MANDRILL_API_KEY'], :return_response => true, :template_name => 'default'
         end
       end
 
-      it 'should send a mandrill template' do
-        results = message.deliver!
-        results.size.should == 1
-
-        result = results.first
-        result.size.should == 4
-
-        result['reject_reason'].should == nil
-        result['status'].should == 'sent'
-        result['email'].should == 'bit-bucket@test.smtp.org'
-        result['_id'].should match(/\A[0-9a-f]{32}\z/)
-      end
+      it_behaves_like 'a sender'
     end
 
     context 'when :template_name is not set' do
-      before do
+      before :all do
         Mail.defaults do
           delivery_method MultiMail::Sender::Mandrill, :api_key => ENV['MANDRILL_API_KEY'], :return_response => true
         end
       end
 
-      it 'should send a message' do
-        results = message.deliver!
-        results.size.should == 1
+      it_behaves_like 'a sender'
+    end
+  end
 
-        result = results.first
-        result.size.should == 4
+  # @see https://github.com/rails/rails/blob/3e36db4406beea32772b1db1e9a16cc1e8aea14c/actionmailer/test/delivery_methods_test.rb
+  context 'with ActionMailer' do
+    before :all do
+      ActionMailer::Base.view_paths = File.expand_path('../../fixtures', __FILE__)
+      ActionMailer::Base.add_delivery_method :mandrill, MultiMail::Sender::Mandrill, :api_key => ENV['MANDRILL_API_KEY']
+    end
+
+    context 'when setting delivery method' do
+      context 'with delivery method set globally' do
+        it 'should send a message' do
+          ActionMailer::Base.delivery_method = :mandrill
 
-        result['reject_reason'].should == nil
-        result['status'].should == 'sent'
-        result['email'].should == 'bit-bucket@test.smtp.org'
-        result['_id'].should match(/\A[0-9a-f]{32}\z/)
+          email = mailer.welcome.deliver_now
+          email.delivery_method.should be_a(MultiMail::Sender::Mandrill)
+
+          ActionMailer::Base.delivery_method = :smtp
+        end
       end
 
-      it 'should not send an empty message' do
-        empty_message.deliver!.should == [] # response not saved
+      context 'with delivery method set by a class' do
+        it 'should send a message' do
+          Mail::SMTP.any_instance.stub(:deliver!)
+          email = mailer.welcome.deliver_now
+          email.delivery_method.should be_a(Mail::SMTP)
+
+          email = mailer_with_delivery_method_set_by_class.welcome.deliver_now
+          email.delivery_method.should be_a(MultiMail::Sender::Mandrill)
+        end
+      end
+
+      context 'with delivery method set by a method' do
+        it 'should send a message' do
+          Mail::SMTP.any_instance.stub(:deliver!)
+          email = mailer.welcome.deliver_now
+          email.delivery_method.should be_a(Mail::SMTP)
+
+          email = mailer_with_delivery_method_set_by_method.welcome.deliver_now
+          email.delivery_method.should be_a(MultiMail::Sender::Mandrill)
+        end
+      end
+    end
+
+    context 'when setting delivery method options' do
+      before :all do
+        ActionMailer::Base.delivery_method = :mandrill
+      end
+
+      context 'with delivery method options set globally' do
+        it 'should send a message' do
+          old_settings = ActionMailer::Base.mandrill_settings
+
+          email = mailer.welcome.deliver_now
+          email.delivery_method.template_name.should == nil
+
+          ActionMailer::Base.mandrill_settings = old_settings.merge(:template_name => 'default')
+
+          email = mailer.welcome.deliver_now
+          email.delivery_method.template_name.should == 'default'
+
+          ActionMailer::Base.mandrill_settings = old_settings
+        end
+      end
+
+      context 'with delivery method options set by a method' do
+        it 'should send a message' do
+          email = mailer.welcome.deliver_now
+          email.delivery_method.template_name.should == nil
+
+          email = mailer_with_delivery_method_options_set_by_method.welcome.deliver_now
+          email.delivery_method.template_name.should == 'default'
+        end
+      end
+
+      context 'with delivery method options set by an action' do
+        it 'should send a message' do
+          email = mailer.welcome.deliver_now
+          email.delivery_method.template_name.should == nil
+
+          email = mailer_with_delivery_method_options_set_by_action.welcome.deliver_now
+          email.delivery_method.template_name.should == 'default'
+        end
       end
     end
   end

data/spec/spec_helper.rb

@@ -11,6 +11,7 @@ require 'digest/sha1'
 require 'net/http'
 require 'yaml'
 
+require 'action_mailer'
 require 'rspec'
 require 'rack'
 require File.dirname(__FILE__) + '/../lib/multi_mail'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: multi_mail
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - James McKinney
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: actionmailer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.2.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.2.1
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -178,6 +192,7 @@ files:
 - lib/multi_mail/version.rb
 - multi_mail.gemspec
 - spec/cloudmailin/receiver_spec.rb
+- spec/fixtures/anonymous/welcome.erb
 - spec/fixtures/cloudmailin/json/attachment_store.txt
 - spec/fixtures/cloudmailin/json/spam.txt
 - spec/fixtures/cloudmailin/json/valid.txt
@@ -257,6 +272,7 @@ specification_version: 4
 summary: Easily switch between email APIs
 test_files:
 - spec/cloudmailin/receiver_spec.rb
+- spec/fixtures/anonymous/welcome.erb
 - spec/fixtures/cloudmailin/json/attachment_store.txt
 - spec/fixtures/cloudmailin/json/spam.txt
 - spec/fixtures/cloudmailin/json/valid.txt