resque_mailer 2.0.2 → 2.0.3

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+### 2.0.3 / 2012-02-17
+
+* Added ability to override local queue name (example scenario: using
+  two different queues for different mail priority levels)
+
 ### 2.0.2 / 2011-08-20
 
 * Fixed deliver vs deliver! issue so mail interceptors will work as

data/VERSION

@@ -1 +1 @@
-2.0.2
+2.0.3

data/lib/resque_mailer.rb

@@ -41,7 +41,11 @@ module Resque
       end
 
       def queue
-        ::Resque::Mailer.default_queue_name
+        @queue || ::Resque::Mailer.default_queue_name
+      end
+
+      def queue=(name)
+        @queue = name
       end
 
       def resque
@@ -51,6 +55,10 @@ module Resque
       def excluded_environment?(name)
         ::Resque::Mailer.excluded_environments && ::Resque::Mailer.excluded_environments.include?(name.to_sym)
       end
+
+      def deliver?
+        true
+      end
     end
 
     class MessageDecoy
@@ -69,7 +77,9 @@ module Resque
       end
 
       def deliver
-        resque.enqueue(@mailer_class, @method_name, *@args)
+        if @mailer_class.deliver?
+          resque.enqueue(@mailer_class, @method_name, *@args)
+        end
       end
 
       def deliver!

data/resque_mailer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{resque_mailer}
-  s.version = "2.0.2"
+  s.version = "2.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Nick Plante"]
-  s.date = %q{2011-08-20}
+  s.authors = [%q{Nick Plante}]
+  s.date = %q{2012-02-17}
   s.description = %q{Rails plugin for sending asynchronous email with ActionMailer and Resque}
   s.email = %q{nap@zerosum.org}
   s.extra_rdoc_files = [
@@ -33,12 +33,11 @@ Gem::Specification.new do |s|
     "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/zapnap/resque_mailer}
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.require_paths = [%q{lib}]
+  s.rubygems_version = %q{1.8.9}
   s.summary = %q{Rails plugin for sending asynchronous email with ActionMailer and Resque}
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/spec/resque_mailer_spec.rb

@@ -15,6 +15,10 @@ class Rails3Mailer < ActionMailer::Base
   end
 end
 
+class PriorityMailer < Rails3Mailer
+  self.queue = 'priority_mailer'
+end
+
 describe Resque::Mailer do
   let(:resque) { FakeResque }
 
@@ -40,6 +44,10 @@ describe Resque::Mailer do
       Resque::Mailer.default_queue_name = "postal"
       Rails3Mailer.queue.should == "postal"
     end
+
+    it "allows overriding of the local queue name" do
+      PriorityMailer.queue.should == "priority_mailer"
+    end
   end
 
   describe '#deliver' do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: resque_mailer
 version: !ruby/object:Gem::Version 
-  hash: 11
-  prerelease: false
+  hash: 9
+  prerelease: 
   segments: 
   - 2
   - 0
-  - 2
-  version: 2.0.2
+  - 3
+  version: 2.0.3
 platform: ruby
 authors: 
 - Nick Plante
@@ -15,11 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-20 00:00:00 -04:00
-default_executable: 
+date: 2012-02-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -30,12 +29,12 @@ dependencies:
         - 2
         - 3
         version: 1.2.3
-  type: :runtime
+  requirement: *id001
   prerelease: false
   name: resque
-  version_requirements: *id001
+  type: :runtime
 - !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -46,12 +45,12 @@ dependencies:
         - 0
         - 0
         version: 3.0.0
-  type: :runtime
+  requirement: *id002
   prerelease: false
   name: actionmailer
-  version_requirements: *id002
+  type: :runtime
 - !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -62,12 +61,12 @@ dependencies:
         - 6
         - 0
         version: 2.6.0
-  type: :development
+  requirement: *id003
   prerelease: false
   name: rspec
-  version_requirements: *id003
+  type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -78,12 +77,12 @@ dependencies:
         - 6
         - 0
         version: 0.6.0
-  type: :development
+  requirement: *id004
   prerelease: false
   name: yard
-  version_requirements: *id004
+  type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -94,12 +93,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  type: :development
+  requirement: *id005
   prerelease: false
   name: bundler
-  version_requirements: *id005
+  type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -110,12 +109,12 @@ dependencies:
         - 6
         - 2
         version: 1.6.2
-  type: :development
+  requirement: *id006
   prerelease: false
   name: jeweler
-  version_requirements: *id006
+  type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -126,12 +125,12 @@ dependencies:
         - 6
         - 0
         version: 2.6.0
-  type: :development
+  requirement: *id007
   prerelease: false
   name: rspec
-  version_requirements: *id007
+  type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -142,12 +141,12 @@ dependencies:
         - 2
         - 3
         version: 1.2.3
-  type: :development
+  requirement: *id008
   prerelease: false
   name: resque
-  version_requirements: *id008
+  type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -158,10 +157,10 @@ dependencies:
         - 0
         - 0
         version: 3.0.0
-  type: :development
+  requirement: *id009
   prerelease: false
   name: actionmailer
-  version_requirements: *id009
+  type: :development
 description: Rails plugin for sending asynchronous email with ActionMailer and Resque
 email: nap@zerosum.org
 executables: []
@@ -186,7 +185,6 @@ files:
 - spec/resque_mailer_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/zapnap/resque_mailer
 licenses: []
 
@@ -216,7 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.9
 signing_key: 
 specification_version: 3
 summary: Rails plugin for sending asynchronous email with ActionMailer and Resque