resque_mailer 2.0.0 → 2.0.1

data/CHANGELOG.md

@@ -1,4 +1,9 @@
-### 2.0.0
+### 2.0.1 / 2011-08-19
+
+* Restore the mailer proxy object so mailer method bodies never get
+  invoked more than once accidentally (not required to be idempotent)
+
+### 2.0.0 / 2011-06-24
 
 * Removed support for legacy Rails 2.x applications (please use v1.x)
 * Removed mailer proxy, return Mail::Message object

data/VERSION

@@ -1 +1 @@
-2.0.0
+2.0.1

data/lib/resque_mailer.rb

@@ -26,16 +26,7 @@ module Resque
         return super if environment_excluded?
 
         if action_methods.include?(method_name.to_s)
-          resque = self.resque
-          mailer_class = self
-          super.tap do |resque_mail|
-            resque_mail.class_eval do
-              define_method(:deliver) do
-                resque.enqueue(mailer_class, method_name, *args)
-                self
-              end
-            end
-          end
+          MessageDecoy.new(self, method_name, *args)
         else
           super
         end
@@ -61,5 +52,33 @@ module Resque
         ::Resque::Mailer.excluded_environments && ::Resque::Mailer.excluded_environments.include?(name.to_sym)
       end
     end
+
+    class MessageDecoy
+      def initialize(mailer_class, method_name, *args)
+        @mailer_class = mailer_class
+        @method_name = method_name
+        *@args = *args
+      end
+
+      def resque
+        ::Resque::Mailer.default_queue_target
+      end
+
+      def actual_message
+        @actual_message ||= @mailer_class.send(:new, @method_name, *@args).message
+      end
+
+      def deliver
+        resque.enqueue(@mailer_class, @method_name, *@args)
+      end
+
+      def deliver!
+        actual_message.deliver
+      end
+
+      def method_missing(method_name, *args)
+        actual_message.send(method_name, *args)
+      end
+    end
   end
 end

data/resque_mailer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{resque_mailer}
-  s.version = "2.0.0"
+  s.version = "2.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nick Plante"]
-  s.date = %q{2011-06-24}
+  s.date = %q{2011-08-19}
   s.description = %q{Rails plugin for sending asynchronous email with ActionMailer and Resque}
   s.email = %q{nap@zerosum.org}
   s.extra_rdoc_files = [

data/spec/resque_mailer_spec.rb

@@ -10,6 +10,7 @@ class Rails3Mailer < ActionMailer::Base
   MAIL_PARAMS = { :to => "crafty@example.org" }
 
   def test_mail(*params)
+    Resque::Mailer.success!
     mail(*params)
   end
 end
@@ -19,6 +20,7 @@ describe Resque::Mailer do
 
   before do
     Resque::Mailer.default_queue_target = resque
+    Resque::Mailer.stub(:success!)
     Rails3Mailer.stub(:current_env => :test)
   end
 
@@ -64,6 +66,11 @@ describe Resque::Mailer do
         @delivery.call
       end
     end
+
+    it 'should not invoke the method body more than once' do
+      Resque::Mailer.should_not_receive(:success!)
+      Rails3Mailer.test_mail(Rails3Mailer::MAIL_PARAMS).deliver
+    end
   end
 
   describe '#deliver!' do
@@ -72,7 +79,7 @@ describe Resque::Mailer do
     end
   end
 
-  describe "perform" do
+  describe 'perform' do
     it 'should perform a queued mailer job' do
       lambda {
         Rails3Mailer.perform(:test_mail, Rails3Mailer::MAIL_PARAMS)
@@ -80,11 +87,16 @@ describe Resque::Mailer do
     end
   end
 
-  describe "original mail methods" do
-    it "should be preserved" do
+  describe 'original mail methods' do
+    it 'should be preserved' do
       Rails3Mailer.test_mail(Rails3Mailer::MAIL_PARAMS).subject.should == 'Subject'
       Rails3Mailer.test_mail(Rails3Mailer::MAIL_PARAMS).from.should include('from@example.org')
       Rails3Mailer.test_mail(Rails3Mailer::MAIL_PARAMS).to.should include('crafty@example.org')
     end
+
+    it 'should require execution of the method body prior to queueing' do
+      Resque::Mailer.should_receive(:success!).once
+      Rails3Mailer.test_mail(Rails3Mailer::MAIL_PARAMS).subject
+    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: resque_mailer
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 2
   - 0
-  - 0
-  version: 2.0.0
+  - 1
+  version: 2.0.1
 platform: ruby
 authors: 
 - Nick Plante
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-24 00:00:00 -04:00
+date: 2011-08-19 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency