mandrill_mailer 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f49c59c5f497b38f55180880f6f32101ab993cf1
-  data.tar.gz: 041619bafe686899e7f6e63fa4f0aa8b41960ab8
+  metadata.gz: db83dd2cbc825c2c3f08e744629adafa42883d00
+  data.tar.gz: 7f829bc19555e3f6988b0bdf897f5d3dddcd83d2
 SHA512:
-  metadata.gz: e6c7baeff76a0fefb88d27af5452348e52676c28da4c5557a1a3b153f669153231a0118bf058b6c8f4bf0640576ef175c4618def99e2ed1d459b977dfddb81f5
-  data.tar.gz: 42092ee4de2138c8d416dc6d16c9c31ebe98791f85b5aa7ce8dadcb1457ba86927e98f066bd59992cdc343dd39f2258489f55682551a5eab6825c35d43f69c79
+  metadata.gz: 4507163ed0e75d8b2c2bec260bc3d0481f1ff83efd3d3f0f019bc2ce1b796ef9d31189004bf2d905cb1ef7ea63aae79c88f6a5fda84234139192d367297562f2
+  data.tar.gz: eb526bb48f908ee0f30311613232451364f5797a698d6de944aff97ab00d7a083475077d79855992070b552539a4cc5f60aa30745201fb23c025a7875fa780fb

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.5.0 - 2017-03-20
+- Update offline adapter for testing to be more compatible with Rails 5 via @eric1234
+
 ## 1.4.0 - 2016-04-28
 ### Changed
 - Update deprecated RSpec failure methods in RSpec helpers.

data/README.md

@@ -220,7 +220,7 @@ You can send the email by using the familiar syntax:
 
 `InvitationMailer.invite(invitation).deliver_now`
 `InvitationMailer.invite(invitation).deliver_later(wait: 1.hour)`
-For deliver_later, Active Job will need to be configured 
+For deliver_later, Active Job will need to be configured
 
 ## Creating a test method
 When switching over to Mandrill for transactional emails we found that it was hard to setup a mailer in the console to send test emails easily (those darn designers), but really, you don't want to have to setup test objects everytime you want to send a test email. You can set up a testing 'mock' once and then call the `.test` method to send the test email.
@@ -270,7 +270,7 @@ require 'mandrill_mailer/offline'
 And then if you wish you can look at the contents of `MandrillMailer.deliveries` to see whether an email was queued up by your test:
 
 ```ruby
-email = MandrillMailer::deliveries.detect { |mail|
+email = MandrillMailer.deliveries.detect { |mail|
   mail.template_name == 'my-template' &&
   mail.message['to'].any? { |to| to[:email] == 'my@email.com' }
 }
@@ -284,7 +284,7 @@ before :each { MandrillMailer.deliveries.clear }
 ```
 
 ## Using Delayed Job
-The typical Delayed Job mailer syntax won't work with this as of now. Either create a custom job or que the mailer as you would que a method. Take a look at the following examples:
+The typical Delayed Job mailer syntax won't work with this as of now. Either create a custom job or queue the mailer as you would queue a method. Take a look at the following examples:
 
 ```ruby
 def send_hallpass_expired_mailer
@@ -369,11 +369,11 @@ Example that adds multiple bcc recipients:
 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" }
+    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
   }
 end

data/lib/mandrill_mailer/offline.rb

@@ -26,10 +26,6 @@ module MandrillMailer
   end
 
   class TemplateMailer
-    def deliver
-      deliver_now
-    end
-    
     def deliver_now
       MandrillMailer::Mock.new({
         :template_name    => template_name,
@@ -42,24 +38,9 @@ module MandrillMailer
          MandrillMailer.deliveries << mock
       end
     end
-    def deliver_later
-      MandrillMailer::Mock.new({
-        :template_name    => template_name,
-        :template_content => template_content,
-        :message          => message,
-        :async            => async,
-        :ip_pool          => ip_pool,
-        :send_at          => send_at
-      }).tap do |mock|
-         MandrillMailer.deliveries << mock
-      end
-    end
   end
 
   class MessageMailer
-    def deliver
-      deliver_now
-    end
     def deliver_now
       MandrillMailer::Mock.new({
         :message          => message,
@@ -70,15 +51,5 @@ module MandrillMailer
          MandrillMailer.deliveries << mock
       end
     end
-    def deliver_later
-      MandrillMailer::Mock.new({
-        :message          => message,
-        :async            => async,
-        :ip_pool          => ip_pool,
-        :send_at          => send_at
-      }).tap do |mock|
-         MandrillMailer.deliveries << mock
-      end
-    end
   end
 end

data/lib/mandrill_mailer/version.rb

@@ -1,3 +1,3 @@
 module MandrillMailer
-  VERSION = "1.4.0"
+  VERSION = "1.5.0"
 end

data/spec/core_mailer_spec.rb

@@ -179,7 +179,7 @@ describe MandrillMailer::CoreMailer do
 
     context 'Rails is not defined' do
       it 'should raise an exception' do
-        expect{subject}.to raise_error
+        expect{subject}.to raise_error NoMethodError
       end
     end
   end
@@ -212,7 +212,7 @@ describe MandrillMailer::CoreMailer do
 
     context 'Rails does not exist' do
       it 'should raise exception' do
-        expect{ subject }.to raise_error
+        expect{ subject }.to raise_error NoMethodError
       end
     end
   end

data/spec/spec_helper.rb

@@ -8,6 +8,9 @@ require 'pry'
 # in ./support/ and its subdirectories.
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
+ActiveJob::Base.queue_adapter = :inline
+ActiveJob::Base.logger.level = Logger::WARN
+
 RSpec.configure do |config|
   config.mock_with :rspec
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mandrill_mailer
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Adam Rensel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-28 00:00:00.000000000 Z
+date: 2017-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -153,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Transactional Mailer for Mandrill