resque_mail_queue 0.3.0 → 0.4.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    resque_mail_queue (0.2.0)
+    resque_mail_queue (0.3.0)
       actionmailer (>= 3.1)
       resque (>= 1.1.0)
 

data/lib/resque_mail_queue.rb

@@ -17,29 +17,30 @@ module Resque
       mailer.send(method, *options['args']).deliver
     end
 
-    def enqueue
-      EnqueueProxy.new(self)
+    def enqueue(options = {})
+      enqueue_to(nil, options)
     end
 
-    def enqueue_to(queue)
-      EnqueueProxy.new(self, queue)
+    def enqueue_to(queue, options = {})
+      EnqueueProxy.new(self, queue, options)
     end
 
     class EnqueueProxy
 
-      def initialize(klass, queue = nil)
+      def initialize(klass, queue, options = {})
         @klass = klass
         @queue = queue
+        @options = options
       end
 
       def method_missing(method, *args, &block)
         if @klass.respond_to? method
-          options = {'klass' => @klass.to_s, 'method' => method, 'args' => args}
+          @options.merge!({'klass' => @klass.to_s, 'method' => method, 'args' => args})
 
           if @queue
-            Resque.enqueue_to(@queue, @klass, options)
+            Resque.enqueue_to(@queue, @klass, @options)
           else
-            Resque.enqueue(@klass, options)
+            Resque.enqueue(@klass, @options)
           end
         else
           super
@@ -48,7 +49,7 @@ module Resque
 
     end
 
-    VERSION = '0.3.0'
+    VERSION = '0.4.0'
   end
 end
 

data/spec/resque_mail_queue_spec.rb

@@ -26,6 +26,11 @@ describe Resque::MailQueue do
     DumbMailer.should have_queued('klass' => 'DumbMailer', 'method' => :send_mail, 'args' => [3]).in(:mail)
   end
 
+  it 'should pass on any job arguments' do
+    DumbMailer.enqueue(:test => 'test argument').send_mail(3)
+    DumbMailer.should have_queued('klass' => 'DumbMailer', 'method'=> :send_mail, 'args' => [3], :test => 'test argument')
+  end
+
   it 'should be able to override the queue from the mailer class (not default)' do
     DumbMailer2.enqueue.send_mail(3)
     DumbMailer2.should have_queued('klass' => 'DumbMailer2', 'method'=> :send_mail, 'args' => [3]).in(:not_default)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque_mail_queue
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-04 00:00:00.000000000 Z
+date: 2012-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
-  requirement: &70213812346660 !ruby/object:Gem::Requirement
+  requirement: &70236497893160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70213812346660
+  version_requirements: *70236497893160
 - !ruby/object:Gem::Dependency
   name: resque
-  requirement: &70213812346160 !ruby/object:Gem::Requirement
+  requirement: &70236497977480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70213812346160
+  version_requirements: *70236497977480
 - !ruby/object:Gem::Dependency
   name: resque_spec
-  requirement: &70213812345780 !ruby/object:Gem::Requirement
+  requirement: &70236497988400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70213812345780
+  version_requirements: *70236497988400
 description: Simple asynchronous emails with Resque
 email:
 - scottwater@gmail.com