resque-async_deliver 1.1.1 → 1.2.0

data/lib/async_deliver/proxy.rb

@@ -3,19 +3,23 @@
 module Resque::Plugins::AsyncDeliver
   class Proxy
     def initialize(klass)
-      @klass = klass.name
+      @klass = klass
     end
 
-    def method_missing(method, *args)
-      arguments = [ @klass, method ]
-      args.each do |a|
-        if a.class < ::ActiveRecord::Base
-          arguments << { :async_deliver_class => a.class.to_s, :async_deliver_id => a.id }
-        else
-          arguments << a
+    def method_missing(method_name, *args)
+      if Resque.inline?
+        @klass.__send__(method_name, *args).deliver
+      else
+        arguments = [ @klass.name, method_name ]
+        args.each do |a|
+          if a.class < ::ActiveRecord::Base
+            arguments << { :async_deliver_class => a.class.to_s, :async_deliver_id => a.id }
+          else
+            arguments << a
+          end
         end
+        Resque.enqueue(MailJob, *arguments)
       end
-      Resque.enqueue(MailJob, *arguments)
     end
   end
 end

data/lib/async_deliver/version.rb

@@ -1,7 +1,7 @@
 module Resque
   module Plugins
     module AsyncDeliver
-      VERSION = '1.1.1'
+      VERSION = '1.2.0'
     end
   end
 end

data/spec/async_deliver/mail_job_spec.rb

@@ -4,35 +4,19 @@ require 'spec_helper'
 
 describe Resque::Plugins::AsyncDeliver::MailJob do
   describe '.perform' do
-    let(:user)     { TestUser.instance }
-    let(:resource) { TestResource.instance }
-
     before do
       message = mock()
       message.expects(:deliver)
 
-      TestMailer.expects(:test_message).with(
-        user,
-        123,
-        "a string",
-        %q[ an array ],
-        { :a => 'hash' },
-        resource
-      ).returns(message)
+      TestMailer.expects(:test_message).with(*arguments).returns(message)
     end
 
     it 'should instantiate a mail and deliver it' do
       Resque::Plugins::AsyncDeliver::MailJob.perform(
         'TestMailer',
         :test_message,
-        { :async_deliver_class => 'TestUser',
-          :async_deliver_id    => user.id },
-        123,
-        "a string",
-        %q[ an array ],
-        { :a => 'hash' },
-        { :async_deliver_class => 'TestResource',
-          :async_deliver_id    => resource.id })
+        *serialized_arguments
+      )
     end
   end
 end

data/spec/async_deliver/proxy_spec.rb

@@ -5,34 +5,35 @@ require 'spec_helper'
 describe Resque::Plugins::AsyncDeliver::Proxy do
   describe '#method_missing' do
     let(:proxy)    { Resque::Plugins::AsyncDeliver::Proxy.new(TestMailer) }
-    let(:user)     { TestUser.instance }
-    let(:resource) { TestResource.instance }
 
-    before do
-      Resque.expects(:enqueue).with(
-        Resque::Plugins::AsyncDeliver::MailJob,
-        'TestMailer',
-        :test_message,
-        { :async_deliver_class => 'TestUser',
-          :async_deliver_id    => user.id },
-          123,
-          "a string",
-          %q[ an array ],
-          { :a => 'hash' },
-          { :async_deliver_class => 'TestResource',
-            :async_deliver_id    => resource.id }
-      )
+    context 'when Resque.inline? == false' do
+      before do
+        Resque.expects(:enqueue).with(
+          Resque::Plugins::AsyncDeliver::MailJob,
+          'TestMailer',
+          :test_message,
+          *serialized_arguments
+        )
+      end
+
+      it 'should enqueue a MailJob in Resque' do
+        proxy.test_message(*arguments)
+      end
     end
 
-    it 'should enqueue a MailJob in Resque' do
-      proxy.test_message(
-        user,
-        123,
-        "a string",
-        %q[ an array ],
-        { :a => 'hash' },
-        resource
-      )
+    context 'when Resque.inline? == true' do
+      before do
+        Resque.inline = true
+        Resque.expects(:enqueue).never
+
+        message = mock()
+        message.expects(:deliver)
+        TestMailer.expects(:test_message).with(*arguments).returns(message)
+      end
+
+      it 'should deliver the mail instantly' do
+        proxy.test_message(*arguments)
+      end
     end
   end
 end

data/spec/support.rb

@@ -22,3 +22,27 @@ class TestMailer < ActionMailer::Base
   extend Resque::Plugins::AsyncDeliver::ActionMailerExtension
   def test_message; end
 end
+
+def arguments
+  [
+    TestUser.instance,
+    123,
+    "a string",
+    %q[ an array ],
+    { :a => 'hash' },
+    TestResource.instance
+  ]
+end
+
+def serialized_arguments
+  [
+    { :async_deliver_class => 'TestUser',
+      :async_deliver_id    => TestUser.instance.id },
+    123,
+    "a string",
+    %q[ an array ],
+    { :a => 'hash' },
+    { :async_deliver_class => 'TestResource',
+      :async_deliver_id    => TestResource.instance.id }
+  ]
+end

metadata

@@ -2,7 +2,7 @@
 name: resque-async_deliver
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors: 
 - Philipe Fatio
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-07 00:00:00 +02:00
+date: 2011-07-08 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency