catch_all 0.0.1 → 0.0.2

data/lib/catch_all/version.rb

@@ -1,5 +1,5 @@
 module ActionMailer
   module CatchAll
-    VERSION = '0.0.1'
+    VERSION = '0.0.2'
   end
 end

data/lib/catch_all.rb

@@ -9,13 +9,17 @@ module ActionMailer
       end
 
       def enable(*to_addresses)
-        to_addresses = to_addresses.flatten
+        to_addresses = to_addresses.flatten.compact
 
-        ActionMailer::Base.class_eval do
-          if instance_methods.include?(:mail_aliased_from_action_mailer_staging)
-            ActionMailerStaging.disable
-          end
+        if to_addresses.length == 0
+          Kernel.warn("No email addresses passed to ActionMailer::CatchAll!")
+        end
 
+        if enabled?
+          disable
+        end
+
+        ActionMailer::Base.class_eval do
           alias_method :mail_aliased_from_action_mailer_staging, :mail
 
           define_method :mail do |*args, &block|

data/spec/catch_all_spec.rb

@@ -16,6 +16,10 @@ class Notifier < ActionMailer::Base
   def notify_no_address
     mail()
   end
+
+  def notify_with_empty_to
+    mail(:to => [])
+  end
 end
 
 describe ActionMailer::CatchAll do
@@ -93,4 +97,25 @@ describe ActionMailer::CatchAll do
     ActionMailer::CatchAll.disable
     ActionMailer::CatchAll.should_not be_enabled
   end
+
+  it "should warn and use [] if passed an empty list" do
+    Kernel.should_receive(:warn).with("No email addresses passed to ActionMailer::CatchAll!")
+    ActionMailer::CatchAll.enable([])
+    mailer = Notifier.notify
+    mailer.to.should == []
+  end
+
+  it "should warn and use [] if passed a nil" do
+    Kernel.should_receive(:warn).with("No email addresses passed to ActionMailer::CatchAll!")
+    ActionMailer::CatchAll.enable(nil)
+    mailer = Notifier.notify
+    mailer.to.should == []
+  end
+
+  it "should warn and use [] if passed nothing" do
+    Kernel.should_receive(:warn).with("No email addresses passed to ActionMailer::CatchAll!")
+    ActionMailer::CatchAll.enable()
+    mailer = Notifier.notify
+    mailer.to.should == []
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: catch_all
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors: