resque_mail_queue 0.2.0 → 0.3.0

data/Gemfile.lock

@@ -1,78 +1,84 @@
 PATH
   remote: .
   specs:
-    resque_mail_queue (0.0.10)
-      actionmailer (>= 3.0.0)
+    resque_mail_queue (0.2.0)
+      actionmailer (>= 3.1)
       resque (>= 1.1.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    abstract (1.0.0)
-    actionmailer (3.0.10)
-      actionpack (= 3.0.10)
-      mail (~> 2.2.19)
-    actionpack (3.0.10)
-      activemodel (= 3.0.10)
-      activesupport (= 3.0.10)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.5.0)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.14)
-      rack-test (~> 0.5.7)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.10)
-      activesupport (= 3.0.10)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activesupport (3.0.10)
-    builder (2.1.2)
+    actionmailer (3.2.5)
+      actionpack (= 3.2.5)
+      mail (~> 2.4.4)
+    actionpack (3.2.5)
+      activemodel (= 3.2.5)
+      activesupport (= 3.2.5)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.1)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.1.3)
+    activemodel (3.2.5)
+      activesupport (= 3.2.5)
+      builder (~> 3.0.0)
+    activesupport (3.2.5)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    builder (3.0.0)
     diff-lcs (1.1.3)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    i18n (0.5.0)
-    mail (2.2.19)
-      activesupport (>= 2.3.6)
+    erubis (2.7.0)
+    hike (1.2.1)
+    i18n (0.6.0)
+    journey (1.0.3)
+    mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.16)
-    multi_json (1.0.3)
-    polyglot (0.3.2)
-    rack (1.2.3)
-    rack-mount (0.6.14)
-      rack (>= 1.0.0)
-    rack-test (0.5.7)
+    mime-types (1.18)
+    multi_json (1.3.6)
+    polyglot (0.3.3)
+    rack (1.4.1)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-protection (1.2.0)
+      rack
+    rack-test (0.6.1)
       rack (>= 1.0)
     redis (2.2.2)
     redis-namespace (1.0.3)
       redis (< 3.0.0)
-    resque (1.19.0)
+    resque (1.20.0)
       multi_json (~> 1.0)
       redis-namespace (~> 1.0.2)
       sinatra (>= 0.9.2)
       vegas (~> 0.1.2)
-    resque_spec (0.7.0)
-      resque (>= 1.15.0)
+    resque_spec (0.12.1)
+      resque (>= 1.19.0)
       rspec (>= 2.5.0)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
-    sinatra (1.2.6)
-      rack (~> 1.1)
-      tilt (>= 1.2.2, < 2.0)
+    rspec (2.10.0)
+      rspec-core (~> 2.10.0)
+      rspec-expectations (~> 2.10.0)
+      rspec-mocks (~> 2.10.0)
+    rspec-core (2.10.1)
+    rspec-expectations (2.10.0)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.10.1)
+    sinatra (1.3.2)
+      rack (~> 1.3, >= 1.3.6)
+      rack-protection (~> 1.2)
+      tilt (~> 1.3, >= 1.3.3)
+    sprockets (2.1.3)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
     tilt (1.3.3)
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.29)
-    vegas (0.1.8)
+    vegas (0.1.11)
       rack (>= 1.0.0)
 
 PLATFORMS
@@ -80,4 +86,4 @@ PLATFORMS
 
 DEPENDENCIES
   resque_mail_queue!
-  resque_spec (>= 0.7.0)
+  resque_spec

data/lib/resque_mail_queue.rb

@@ -3,8 +3,8 @@ require 'action_mailer'
 
 module Resque
   module MailQueue
-       
-    include Resque::Helpers 
+
+    include Resque::Helpers
     extend self
 
     def queue
@@ -17,20 +17,30 @@ module Resque
       mailer.send(method, *options['args']).deliver
     end
 
-    def enqueue()
+    def enqueue
       EnqueueProxy.new(self)
     end
 
+    def enqueue_to(queue)
+      EnqueueProxy.new(self, queue)
+    end
+
     class EnqueueProxy
 
-      def initialize(klass)
+      def initialize(klass, queue = nil)
         @klass = klass
+        @queue = queue
       end
 
-      def method_missing(m, *args, &block)
-        if @klass.respond_to? m
-          options = {'klass' => @klass.to_s, 'method' => m, 'args' => args}
-          Resque.enqueue(@klass, options)
+      def method_missing(method, *args, &block)
+        if @klass.respond_to? method
+          options = {'klass' => @klass.to_s, 'method' => method, 'args' => args}
+
+          if @queue
+            Resque.enqueue_to(@queue, @klass, options)
+          else
+            Resque.enqueue(@klass, options)
+          end
         else
           super
         end
@@ -38,10 +48,10 @@ module Resque
 
     end
 
-    VERSION = '0.2.0'
+    VERSION = '0.3.0'
   end
 end
 
 class ActionMailer::Base
   extend Resque::MailQueue
-end
+end

data/readme.md

@@ -29,7 +29,7 @@ Then anytime you want to push an email asynchronously add _enqueue_ before the m
 	
 ## Why use this instead of ResqueMailer
 
-I initially started using [ResqueMailer](https://github.com/zapnap/resque_mailer) and it worked well. However, I preferred being more explicit (and simple) on when emails where being sent asynchronously (by calling enqueue).
+I initially started using [ResqueMailer](https://github.com/zapnap/resque_mailer) and it worked well. However, I preferred being more explicit (and simple) on when emails were sent asynchronously (by calling enqueue).
 
 More clearly, if ResqueMailer works for you and you like it, stick with it. 
 

data/resque_mail_queue.gemspec

@@ -18,9 +18,9 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-	s.add_dependency 'actionmailer', '>= 3.0.0'
+	s.add_dependency 'actionmailer', '>= 3.1'
 	
 	s.add_dependency 'resque', '>= 1.1.0'
-	s.add_development_dependency 'resque_spec', '>= 0.7.0'
+	s.add_development_dependency 'resque_spec'
 
 end

data/spec/resque_mail_queue_spec.rb

@@ -8,34 +8,38 @@ class DumbMailer
   end
 end
 
-class DumbMailer2  < DumbMailer  
+class DumbMailer2  < DumbMailer
   def self.queue
     :not_default
   end
 end
-  
 
-describe Resque::MailQueue do 
-  
-  before(:each) do 
+
+describe Resque::MailQueue do
+
+  before(:each) do
     ResqueSpec.reset!
   end
-  
-  it 'should find a dummy mail in the default queue' do 
+
+  it 'should find a dummy mail in the default queue' do
     DumbMailer.enqueue.send_mail(3)
-    DumbMailer.should have_queued('klass' => 'DumbMailer', 'method' => :send_mail, 'args' => [3]).in(:default)
+    DumbMailer.should have_queued('klass' => 'DumbMailer', 'method' => :send_mail, 'args' => [3]).in(:mail)
   end
-  
-  it 'should be able to override the queue (not default)' do 
+
+  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)
+  end
 
+  it 'should be able to override the queue when enqueueing (also not default)' do
+    DumbMailer2.enqueue_to(:also_not_default).send_mail(3)
+    DumbMailer2.should have_queued('klass' => 'DumbMailer2', 'method'=> :send_mail, 'args' => [3]).in(:also_not_default)
   end
 
-  it 'should call deliver when pulling an item from the queue' do 
+  it 'should call deliver when pulling an item from the queue' do
     mail_message = double('mail_message')
     DumbMailer.stub(:send_mail).and_return(mail_message)
-    mail_message.should_receive(:deliver)    
+    mail_message.should_receive(:deliver)
     Resque::MailQueue.perform('klass' => 'DumbMailer', 'method' => :send_mail, 'args' => [3])
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque_mail_queue
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-05 00:00:00.000000000Z
+date: 2012-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
-  requirement: &70272696466380 !ruby/object:Gem::Requirement
+  requirement: &70213812346660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70272696466380
+  version_requirements: *70213812346660
 - !ruby/object:Gem::Dependency
   name: resque
-  requirement: &70272696464360 !ruby/object:Gem::Requirement
+  requirement: &70213812346160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,18 +32,18 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70272696464360
+  version_requirements: *70213812346160
 - !ruby/object:Gem::Dependency
   name: resque_spec
-  requirement: &70272696463180 !ruby/object:Gem::Requirement
+  requirement: &70213812345780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70272696463180
+  version_requirements: *70213812345780
 description: Simple asynchronous emails with Resque
 email:
 - scottwater@gmail.com
@@ -52,7 +52,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- .rbenv-gemsets
 - Gemfile
 - Gemfile.lock
 - Rakefile
@@ -80,9 +79,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: resque_mail_queue
-rubygems_version: 1.8.7
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Simple asynchronous emails with Resque
 test_files:
 - spec/resque_mail_queue_spec.rb
+has_rdoc: 

data/.rbenv-gemsets

@@ -1 +0,0 @@
-resque_mail_queue global