sidekiq_mailer 0.0.6 → 0.0.8

data/.travis.yml

@@ -0,0 +1,8 @@
+env:
+  - "RAILS_VERSION=3.1.0"
+  - "RAILS_VERSION=3.2.0"
+  - "RAILS_VERSION=4.0.0"
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - jruby-19mode

data/Gemfile

@@ -2,3 +2,16 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in sidekiq_mailer.gemspec
 gemspec
+
+rails_version = ENV["RAILS_VERSION"] || "default"
+
+rails = case rails_version
+when "master"
+  {github: "rails/rails"}
+when "default"
+  "~> 3.2.0"
+else
+  "~> #{rails_version}"
+end
+
+gem 'actionmailer', rails

data/lib/sidekiq_mailer.rb

@@ -4,12 +4,14 @@ require 'sidekiq_mailer/proxy'
 
 module Sidekiq
   module Mailer
+    @@excluded_environments = nil
+
     def self.excluded_environments=(envs)
       @@excluded_environments = [*envs].map { |e| e && e.to_sym }
     end
 
     def self.excluded_environments
-      @@excluded_environments
+      @@excluded_environments ||= []
     end
 
     def self.current_env

data/lib/sidekiq_mailer/proxy.rb

@@ -21,7 +21,7 @@ class Sidekiq::Mailer::Proxy
   end
 
   def deliver!
-    actual_message.deliver!
+    actual_message.deliver
   end
 
   def method_missing(method_name, *args)
@@ -35,4 +35,4 @@ class Sidekiq::Mailer::Proxy
     }
     params.merge(@mailer_class.get_sidekiq_options)
   end
-end
+end

data/lib/sidekiq_mailer/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Mailer
-    VERSION = "0.0.6"
+    VERSION = "0.0.8"
   end
 end

data/sidekiq_mailer.gemspec

@@ -7,6 +7,7 @@ Gem::Specification.new do |gem|
   gem.description   = %q{Asynchronous mail delivery using sidekiq}
   gem.summary       = %q{Turning ActiveMailer deliveries asynchronous using the power of sidekiq}
   gem.homepage      = "http://github.com/andersondias/sidekiq_mailer"
+  gem.license       = "MIT"
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
@@ -17,5 +18,6 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency("activesupport", ">= 3.0")
   gem.add_dependency("actionmailer", ">= 3.0")
-  gem.add_dependency("sidekiq", "~> 2.3")
+  gem.add_dependency("sidekiq", ">= 2.3")
+  gem.add_development_dependency('rake')
 end

data/test/sidekiq_mailer_test.rb

@@ -31,6 +31,16 @@ class MailerInAnotherQueue < ActionMailer::Base
   end
 end
 
+class PreventSomeEmails
+  def self.delivering_email(message)
+    if message.to.include?("foo@example.com")
+      message.perform_deliveries = false
+    end
+  end
+end
+
+ActionMailer::Base.register_interceptor(PreventSomeEmails)
+
 class SidekiqMailerTest < Test::Unit::TestCase
   def setup
     Sidekiq::Mailer.excluded_environments = []
@@ -39,50 +49,60 @@ class SidekiqMailerTest < Test::Unit::TestCase
   end
 
   def test_queue_a_new_job
-    BasicMailer.hi('test@test.com', 'Tester').deliver
+    BasicMailer.hi('test@example.com', 'Tester').deliver
 
     job_args = Sidekiq::Mailer::Worker.jobs.first['args']
-    expected_args = ['BasicMailer', 'hi', ['test@test.com', 'Tester']]
+    expected_args = ['BasicMailer', 'hi', ['test@example.com', 'Tester']]
     assert_equal expected_args, job_args
   end
 
   def test_queues_at_mailer_queue_by_default
-    BasicMailer.welcome('test@test.com').deliver
+    BasicMailer.welcome('test@example.com').deliver
     assert_equal 'mailer', Sidekiq::Mailer::Worker.jobs.first['queue']
   end
 
   def test_default_sidekiq_options
-    BasicMailer.welcome('test@test.com').deliver
+    BasicMailer.welcome('test@example.com').deliver
     assert_equal 'mailer', Sidekiq::Mailer::Worker.jobs.first['queue']
     assert_equal true, Sidekiq::Mailer::Worker.jobs.first['retry']
   end
 
   def test_enables_sidekiq_options_overriding
-    MailerInAnotherQueue.bye('test@test.com').deliver
+    MailerInAnotherQueue.bye('test@example.com').deliver
     assert_equal 'priority', Sidekiq::Mailer::Worker.jobs.first['queue']
     assert_equal 'false', Sidekiq::Mailer::Worker.jobs.first['retry']
   end
 
   def test_delivers_asynchronously
-    BasicMailer.welcome('test@test.com').deliver
+    BasicMailer.welcome('test@example.com').deliver
     assert_equal 1, Sidekiq::Mailer::Worker.jobs.size
     assert_equal 0, ActionMailer::Base.deliveries.size
   end
 
   def test_can_deliver_now
-    BasicMailer.welcome('test@test.com').deliver!
+    BasicMailer.welcome('test@example.com').deliver!
     assert_equal 1, ActionMailer::Base.deliveries.size
   end
 
-  def test_realy_delivers_email_when_performing_worker_job
-    Sidekiq::Mailer::Worker.new.perform('BasicMailer', 'welcome', 'test@test.com')
+  def test_really_delivers_email_when_performing_worker_job
+    Sidekiq::Mailer::Worker.new.perform('BasicMailer', 'welcome', 'test@example.com')
     assert_equal 1, ActionMailer::Base.deliveries.size
   end
 
   def test_delivers_synchronously_if_running_in_a_excluded_environment
     Sidekiq::Mailer.excluded_environments = [:test]
-    BasicMailer.welcome('test@test.com').deliver
+    BasicMailer.welcome('test@example.com').deliver
     assert_equal 0, Sidekiq::Mailer::Worker.jobs.size
     assert_equal 1, ActionMailer::Base.deliveries.size
   end
-end
+
+  def test_does_not_ignore_interceptors_when_delivering_synchronously
+    BasicMailer.welcome('foo@example.com').deliver!
+    assert_equal 0, ActionMailer::Base.deliveries.size
+  end
+
+  def test_does_not_ignore_interceptors_when_delivering_asynchronously
+    Sidekiq::Mailer::Worker.new.perform('BasicMailer', 'welcome', 'foo@example.com')
+    assert_equal 0, ActionMailer::Base.deliveries.size
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq_mailer
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-25 00:00:00.000000000 Z
+date: 2014-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -48,7 +48,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '2.3'
   type: :runtime
@@ -56,9 +56,25 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '2.3'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Asynchronous mail delivery using sidekiq
 email:
 - andersondaraujo@gmail.com
@@ -67,6 +83,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md
@@ -79,7 +96,8 @@ files:
 - test/sidekiq_mailer_test.rb
 - test/test_helper.rb
 homepage: http://github.com/andersondias/sidekiq_mailer
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -98,10 +116,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Turning ActiveMailer deliveries asynchronous using the power of sidekiq
 test_files:
 - test/sidekiq_mailer_test.rb
 - test/test_helper.rb
+has_rdoc: