sidekiq_mailer 0.0.1 → 0.0.2

data/lib/sidekiq_mailer/proxy.rb

@@ -12,36 +12,13 @@ class Sidekiq::Mailer::Proxy
   end
 
   def deliver
-    params = {
-      'class' => Sidekiq::Mailer::Worker,
-      'args' => [@mailer_class.to_s, @method_name, *@args]
-    }
-    Sidekiq::Mailer::Worker.client_push(params.merge(@mailer_class.get_sidekiq_options))
+    return deliver! if Sidekiq::Mailer.excludes_current_environment?
+    Sidekiq::Mailer::Worker.client_push(to_sidekiq)
   end
 
-  # def deliver_at(time)
-  #   return deliver! if environment_excluded?
-
-  #   unless resque.respond_to? :enqueue_at
-  #     raise "You need to install resque-scheduler to use deliver_at"
-  #   end
-
-  #   if @mailer_class.deliver?
-  #     resque.enqueue_at(time, @mailer_class, @method_name, *@args)
-  #   end
-  # end
-
-  # def deliver_in(time)
-  #   return deliver! if environment_excluded?
-
-  #   unless resque.respond_to? :enqueue_in
-  #     raise "You need to install resque-scheduler to use deliver_in"
-  #   end
-
-  #   if @mailer_class.deliver?
-  #     resque.enqueue_in(time, @mailer_class, @method_name, *@args)
-  #   end
-  # end
+  def excluded_environment?
+    Sidekiq::Mailer.excludes_current_environment?
+  end
 
   def deliver!
     actual_message.deliver!
@@ -50,4 +27,12 @@ class Sidekiq::Mailer::Proxy
   def method_missing(method_name, *args)
     actual_message.send(method_name, *args)
   end
+
+  def to_sidekiq
+    params = {
+      'class' => Sidekiq::Mailer::Worker,
+      'args' => [@mailer_class.to_s, @method_name, *@args]
+    }
+    params.merge(@mailer_class.get_sidekiq_options)
+  end
 end

data/lib/sidekiq_mailer/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Mailer
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/lib/sidekiq_mailer.rb

@@ -4,6 +4,18 @@ require 'sidekiq_mailer/proxy'
 
 module Sidekiq
   module Mailer
+    def self.excluded_environments=(envs)
+      @@excluded_environments = [*envs].map { |e| e.to_sym }
+    end
+
+    def self.excluded_environments
+      @@excluded_environments
+    end
+
+    def self.excludes_current_environment?
+      !ActionMailer::Base.perform_deliveries || (excluded_environments && excluded_environments.include?(ENV['RAILS_ENV'].to_sym))
+    end
+
     def self.included(base)
       base.extend(ClassMethods)
       base.class_attribute :sidekiq_options_hash

data/test/sidekiq_mailer_test.rb

@@ -27,6 +27,7 @@ end
 
 class SidekiqMailerTest < Test::Unit::TestCase
   def setup
+    Sidekiq::Mailer.excluded_environments = []
     ActionMailer::Base.deliveries.clear
     Sidekiq::Mailer::Worker.jobs.clear
   end
@@ -65,4 +66,11 @@ class SidekiqMailerTest < Test::Unit::TestCase
     Sidekiq::Mailer::Worker.new.perform('BasicMailer', 'welcome', 'test@test.com')
     assert_equal 1, ActionMailer::Base.deliveries.size
   end
+
+  def test_delivers_syncronously_if_running_in_a_excluded_environment
+    Sidekiq::Mailer.excluded_environments = [:test]
+    BasicMailer.welcome('test@test.com').deliver
+    assert_equal 0, Sidekiq::Mailer::Worker.jobs.size
+    assert_equal 1, 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.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors: