resque_mailer 1.0.1 → 2.0.0

data/CHANGELOG.md

@@ -0,0 +1,15 @@
+### 2.0.0
+
+* Removed support for legacy Rails 2.x applications (please use v1.x)
+* Removed mailer proxy, return Mail::Message object
+* Reorganize and modernize gem structure, add bundler and move to RSpec 2.x
+* Queue target (::Resque) can now be overridden for testing (Joshua
+  Clayton)
+
+### 1.0.1 / 2010-12-21
+
+* Respect ActionMailer::Base.perform_deliveries
+
+### v1.0.0 / 2010-07-28
+
+* Added support for Rails 3.x (Marcin Kulik)

data/Gemfile

@@ -0,0 +1,17 @@
+source 'http://rubygems.org'
+
+# Add dependencies required to use your gem here.
+# Example:
+#   gem 'activesupport', '>= 2.3.5'
+
+gem 'resque', '>= 1.2.3'
+gem 'actionmailer', '>= 3.0.0'
+
+# Add dependencies to develop your gem here.
+# Include everything needed to run rake, tests, features, etc.
+group :development do
+  gem 'rspec', '>= 2.6.0'
+  gem 'yard', '>= 0.6.0'
+  gem 'bundler', '~> 1.0.0'
+  gem 'jeweler', '~> 1.6.2'
+end

data/Gemfile.lock

@@ -0,0 +1,83 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    abstract (1.0.0)
+    actionmailer (3.0.9)
+      actionpack (= 3.0.9)
+      mail (~> 2.2.19)
+    actionpack (3.0.9)
+      activemodel (= 3.0.9)
+      activesupport (= 3.0.9)
+      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.9)
+      activesupport (= 3.0.9)
+      builder (~> 2.1.2)
+      i18n (~> 0.5.0)
+    activesupport (3.0.9)
+    builder (2.1.2)
+    diff-lcs (1.1.2)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
+    git (1.2.5)
+    i18n (0.5.0)
+    jeweler (1.6.2)
+      bundler (~> 1.0)
+      git (>= 1.2.5)
+      rake
+    json (1.5.3)
+    mail (2.2.19)
+      activesupport (>= 2.3.6)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.16)
+    polyglot (0.3.1)
+    rack (1.2.3)
+    rack-mount (0.6.14)
+      rack (>= 1.0.0)
+    rack-test (0.5.7)
+      rack (>= 1.0)
+    rake (0.9.2)
+    redis (2.2.1)
+    redis-namespace (1.0.3)
+      redis (< 3.0.0)
+    resque (1.17.1)
+      json (>= 1.4.6, < 1.6)
+      redis-namespace (~> 1.0.2)
+      sinatra (>= 0.9.2)
+      vegas (~> 0.1.2)
+    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)
+    tilt (1.3.2)
+    treetop (1.4.9)
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.28)
+    vegas (0.1.8)
+      rack (>= 1.0.0)
+    yard (0.7.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  actionmailer (>= 3.0.0)
+  bundler (~> 1.0.0)
+  jeweler (~> 1.6.2)
+  resque (>= 1.2.3)
+  rspec (>= 2.6.0)
+  yard (>= 0.6.0)

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010 Nick Plante
+Copyright (c) 2011 Nick Plante
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -0,0 +1,97 @@
+# ResqueMailer
+
+A gem plugin which allows messages prepared by ActionMailer to be delivered
+asynchronously. Assumes you're using Resque (http://github.com/defunkt/resque)
+for your background jobs.
+
+Note that recent (2.0+) versions of Resque::Mailer only work with Rails 3.x.
+For a version compatible with Rails 2, specify v1.x in your Gemfile.
+
+## Usage
+
+Include Resque::Mailer in your ActionMailer subclass(es) like this:
+
+    class MyMailer < ActionMailer::Base
+      include Resque::Mailer
+    end
+
+Now, when <tt>MyMailer.subject_email(params).deliver</tt> is called, an entry
+will be created in the job queue. Your Resque workers will be able to deliver
+this message for you. The queue we're using is imaginatively named +mailer+,
+so just make sure your workers know about it and are loading your environment:
+
+    QUEUE=mailer rake environment resque:work
+
+Note that you can still have mail delivered synchronously by using the bang
+method variant:
+
+    MyMailer.subject_email(params).deliver!
+
+Oh, by the way. Don't forget that your async mailer jobs will be processed by
+a separate worker. This means that you should resist the temptation to pass
+database-backed objects as parameters in your mailer and instead pass record
+identifiers. Then, in your delivery method, you can look up the record from
+the id and use it as needed.
+
+If you want to set a different default queue name for your mailer, you can 
+change the <tt>default_queue_name</tt> property like so:
+
+    # config/initializers/resque_mailer.rb
+    Resque::Mailer.default_queue_name = 'application_specific_mailer'
+
+This is useful when you are running more than one application using
+resque_mailer in a shared environment. You will need to use the new queue
+name when starting your workers.
+
+    QUEUE=application_specific_mailer rake environment resque:work
+
+## Resque::Mailer as a Project Default
+
+If you have a variety of mailers in your application and want all of them to use
+Resque::Mailer by default, you can subclass ActionMailer::Base and have your
+other mailers inherit from an AsyncMailer:
+
+    # config/initializers/resque_mailer.rb
+    class AsyncMailer < ActionMailer::Base
+      include Resque::Mailer
+    end
+
+    # app/mailers/example_mailer.rb
+    class ExampleMailer < AsyncMailer
+      def say_hello(user)
+        # ...
+      end
+    end
+
+## Installation
+
+Install it as a plugin or as a gem plugin from Gemcutter:
+
+    gem install resque_mailer
+    script/plugin install git://github.com/zapnap/resque_mailer.git
+
+    # Rails 3: add it to your Gemfile
+    gem 'resque_mailer'
+
+## Testing
+
+You don't want to be sending actual emails in the test environment, so you can
+configure the environments that should be excluded like so:
+
+    # config/initializers/resque_mailer.rb
+    Resque::Mailer.excluded_environments = [:test, :cucumber]
+
+## Note on Patches / Pull Requests
+
+* Fork the project.
+* Make your feature addition or bug fix.
+* Add tests for it. This is important so I don't break it in a future version unintentionally.
+* Commit, do not mess with rakefile, version, or history.
+  (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
+* Send me a pull request. Bonus points for topic branches.
+
+## Credits
+
+This work was originally inspired by delayed_job_mailer
+(http://github.com/andersondias/delayed_job_mailer) by Anderson Dias. Enhanced
+and modified to work with Resque by Nick Plante.

data/Rakefile

@@ -1,4 +1,16 @@
+# encoding: utf-8
+
 require 'rubygems'
+require 'bundler'
+
+begin
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
+end
+
 require 'rake'
 
 begin
@@ -9,52 +21,25 @@ begin
     gem.description = %Q{Rails plugin for sending asynchronous email with ActionMailer and Resque}
     gem.email = "nap@zerosum.org"
     gem.homepage = "http://github.com/zapnap/resque_mailer"
-    gem.authors = ["Nick Plante", "Marcin Kulik"]
-    gem.add_development_dependency "rspec", ">= 1.2.9"
+    gem.authors = ["Nick Plante"]
+    gem.add_development_dependency "rspec", ">= 2.6.0"
     gem.add_development_dependency "resque", ">= 1.2.3"
-    gem.add_development_dependency "actionmailer", ">= 2.3.4"
+    gem.add_development_dependency "actionmailer", ">= 3.0.0"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
-  Jeweler::GemcutterTasks.new
+  Jeweler::RubygemsDotOrgTasks.new
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
-begin
-  require 'spec/rake/spectask'
-
-  puts "Using RSpec 1.x / Rails 2.x"
-
-  desc "Run specs for Rails 2.x"
-  Spec::Rake::SpecTask.new(:spec) do |spec|
-    spec.spec_files = FileList['spec/common_spec.rb', 'spec/rails2_spec.rb']
-  end
-rescue LoadError
-  puts "RSpec 1.x unavailable"
-end
-
-begin
-  require 'rspec/core'
-  require 'rspec/core/rake_task'
-
-  puts "Using RSpec 2.x / Rails 3.x"
+require 'rspec/core'
+require 'rspec/core/rake_task'
 
-  desc "Run specs for Rails 3.x"
-  RSpec::Core::RakeTask.new(:spec) do |spec|
-    spec.pattern = ["spec/common_spec.rb","spec/rails3_spec.rb"]
-  end
-rescue LoadError
-  puts "RSpec 2.x unavailable"
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = ["spec/resque_mailer_spec.rb"]
 end
 
 task :default => :spec
 
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "resque_mailer #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+require 'yard'
+YARD::Rake::YardocTask.new

data/VERSION

@@ -1 +1 @@
-1.0.1
+2.0.0

data/lib/resque_mailer.rb

@@ -1,7 +1,65 @@
-require "resque_mailer/common"
+module Resque
+  module Mailer
+    class << self
+      attr_accessor :default_queue_name, :default_queue_target
+      attr_reader :excluded_environments
 
-if defined?(Rails.version) && Rails.version.to_i >= 3
-  require "resque_mailer/rails3"
-else
-  require "resque_mailer/rails2"
+      def excluded_environments=(envs)
+        @excluded_environments = [*envs].map { |e| e.to_sym }
+      end
+
+      def included(base)
+        base.extend(ClassMethods)
+      end
+    end
+
+    self.default_queue_target = ::Resque
+    self.default_queue_name = "mailer"
+    self.excluded_environments = [:test]
+
+    module ClassMethods
+      def current_env
+        ::Rails.env
+      end
+
+      def method_missing(method_name, *args)
+        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
+        else
+          super
+        end
+      end
+
+      def perform(action, *args)
+        self.send(:new, action, *args).message.deliver!
+      end
+
+      def environment_excluded?
+        !ActionMailer::Base.perform_deliveries || excluded_environment?(current_env)
+      end
+
+      def queue
+        ::Resque::Mailer.default_queue_name
+      end
+
+      def resque
+        ::Resque::Mailer.default_queue_target
+      end
+
+      def excluded_environment?(name)
+        ::Resque::Mailer.excluded_environments && ::Resque::Mailer.excluded_environments.include?(name.to_sym)
+      end
+    end
+  end
 end

data/resque_mailer.gemspec

@@ -0,0 +1,77 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{resque_mailer}
+  s.version = "2.0.0"
+
+  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.description = %q{Rails plugin for sending asynchronous email with ActionMailer and Resque}
+  s.email = %q{nap@zerosum.org}
+  s.extra_rdoc_files = [
+    "LICENSE",
+    "README.md"
+  ]
+  s.files = [
+    ".document",
+    "CHANGELOG.md",
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE",
+    "README.md",
+    "Rakefile",
+    "VERSION",
+    "lib/resque_mailer.rb",
+    "rails/init.rb",
+    "resque_mailer.gemspec",
+    "spec/resque_mailer_spec.rb",
+    "spec/spec.opts",
+    "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.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
+      s.add_runtime_dependency(%q<resque>, [">= 1.2.3"])
+      s.add_runtime_dependency(%q<actionmailer>, [">= 3.0.0"])
+      s.add_development_dependency(%q<rspec>, [">= 2.6.0"])
+      s.add_development_dependency(%q<yard>, [">= 0.6.0"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.6.2"])
+      s.add_development_dependency(%q<rspec>, [">= 2.6.0"])
+      s.add_development_dependency(%q<resque>, [">= 1.2.3"])
+      s.add_development_dependency(%q<actionmailer>, [">= 3.0.0"])
+    else
+      s.add_dependency(%q<resque>, [">= 1.2.3"])
+      s.add_dependency(%q<actionmailer>, [">= 3.0.0"])
+      s.add_dependency(%q<rspec>, [">= 2.6.0"])
+      s.add_dependency(%q<yard>, [">= 0.6.0"])
+      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.6.2"])
+      s.add_dependency(%q<rspec>, [">= 2.6.0"])
+      s.add_dependency(%q<resque>, [">= 1.2.3"])
+      s.add_dependency(%q<actionmailer>, [">= 3.0.0"])
+    end
+  else
+    s.add_dependency(%q<resque>, [">= 1.2.3"])
+    s.add_dependency(%q<actionmailer>, [">= 3.0.0"])
+    s.add_dependency(%q<rspec>, [">= 2.6.0"])
+    s.add_dependency(%q<yard>, [">= 0.6.0"])
+    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.6.2"])
+    s.add_dependency(%q<rspec>, [">= 2.6.0"])
+    s.add_dependency(%q<resque>, [">= 1.2.3"])
+    s.add_dependency(%q<actionmailer>, [">= 3.0.0"])
+  end
+end
+

data/spec/{rails3_spec.rb → resque_mailer_spec.rb}

@@ -1,26 +1,45 @@
 require File.join(File.expand_path(File.dirname(__FILE__)), 'spec_helper')
 
-gem     'actionmailer', '>=3.0.0.beta4'
-require 'action_mailer'
-require 'resque_mailer/rails3'
-
-ActionMailer::Base.delivery_method = :test
+class FakeResque
+  def self.enqueue(*args); end
+end
 
 class Rails3Mailer < ActionMailer::Base
   include Resque::Mailer
   default :from => "from@example.org", :subject => "Subject"
-  MAIL_PARAMS = { :to => "misio@example.org" }
+  MAIL_PARAMS = { :to => "crafty@example.org" }
 
   def test_mail(*params)
     mail(*params)
   end
 end
 
-describe Rails3Mailer do
+describe Resque::Mailer do
+  let(:resque) { FakeResque }
+
   before do
+    Resque::Mailer.default_queue_target = resque
     Rails3Mailer.stub(:current_env => :test)
   end
 
+  describe "resque" do
+    it "allows overriding of the default queue target (for testing)" do
+      Resque::Mailer.default_queue_target = FakeResque
+      Rails3Mailer.resque.should == FakeResque
+    end
+  end
+
+  describe "queue" do
+    it "defaults to the 'mailer' queue" do
+      Rails3Mailer.queue.should == "mailer"
+    end
+
+    it "allows overriding of the default queue name" do
+      Resque::Mailer.default_queue_name = "postal"
+      Rails3Mailer.queue.should == "postal"
+    end
+  end
+
   describe '#deliver' do
     before(:all) do
       @delivery = lambda {
@@ -28,16 +47,12 @@ describe Rails3Mailer do
       }
     end
 
-    before(:each) do
-      Resque.stub(:enqueue)
-    end
-
     it 'should not deliver the email synchronously' do
       lambda { @delivery.call }.should_not change(ActionMailer::Base.deliveries, :size)
     end
 
     it 'should place the deliver action on the Resque "mailer" queue' do
-      Resque.should_receive(:enqueue).with(Rails3Mailer, :test_mail, Rails3Mailer::MAIL_PARAMS)
+      resque.should_receive(:enqueue).with(Rails3Mailer, :test_mail, Rails3Mailer::MAIL_PARAMS)
       @delivery.call
     end
 
@@ -45,7 +60,7 @@ describe Rails3Mailer do
       it 'should not deliver through Resque for excluded environments' do
         Resque::Mailer.stub(:excluded_environments => [:custom])
         Rails3Mailer.should_receive(:current_env).and_return(:custom)
-        Resque.should_not_receive(:enqueue)
+        resque.should_not_receive(:enqueue)
         @delivery.call
       end
     end
@@ -57,11 +72,19 @@ describe Rails3Mailer 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)
       }.should change(ActionMailer::Base.deliveries, :size).by(1)
     end
   end
+
+  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
+  end
 end

data/spec/spec_helper.rb

@@ -1,12 +1,9 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
-require 'resque_mailer/common'
-
-begin
-  require 'rspec/autorun'
-rescue LoadError
-  require 'spec/autorun'
-end
+require 'action_mailer'
+require 'resque_mailer'
+require 'rspec/autorun'
 
 Resque::Mailer.excluded_environments = []
+ActionMailer::Base.delivery_method = :test

metadata

@@ -1,44 +1,137 @@
 --- !ruby/object:Gem::Specification 
 name: resque_mailer
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 15
   prerelease: false
   segments: 
-  - 1
+  - 2
   - 0
-  - 1
-  version: 1.0.1
+  - 0
+  version: 2.0.0
 platform: ruby
 authors: 
 - Nick Plante
-- Marcin Kulik
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-12-21 00:00:00 -05:00
+date: 2011-06-24 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 25
         segments: 
         - 1
         - 2
-        - 9
-        version: 1.2.9
-  type: :development
+        - 3
+        version: 1.2.3
+  type: :runtime
+  prerelease: false
+  name: resque
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: resque
-  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        - 0
+        version: 3.0.0
+  type: :runtime
+  prerelease: false
+  name: actionmailer
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 2
+        - 6
+        - 0
+        version: 2.6.0
+  type: :development
+  prerelease: false
+  name: rspec
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 0
+        - 6
+        - 0
+        version: 0.6.0
+  type: :development
+  prerelease: false
+  name: yard
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  type: :development
+  prerelease: false
+  name: bundler
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 1
+        - 6
+        - 2
+        version: 1.6.2
+  type: :development
+  prerelease: false
+  name: jeweler
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 2
+        - 6
+        - 0
+        version: 2.6.0
+  type: :development
+  prerelease: false
+  name: rspec
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -50,23 +143,25 @@ dependencies:
         - 3
         version: 1.2.3
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: actionmailer
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  name: resque
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 7
         segments: 
-        - 2
         - 3
-        - 4
-        version: 2.3.4
+        - 0
+        - 0
+        version: 3.0.0
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  name: actionmailer
+  version_requirements: *id009
 description: Rails plugin for sending asynchronous email with ActionMailer and Resque
 email: nap@zerosum.org
 executables: []
@@ -75,21 +170,20 @@ extensions: []
 
 extra_rdoc_files: 
 - LICENSE
-- README.rdoc
+- README.md
 files: 
 - .document
+- CHANGELOG.md
+- Gemfile
+- Gemfile.lock
 - LICENSE
-- README.rdoc
+- README.md
 - Rakefile
 - VERSION
 - lib/resque_mailer.rb
-- lib/resque_mailer/common.rb
-- lib/resque_mailer/rails2.rb
-- lib/resque_mailer/rails3.rb
 - rails/init.rb
-- spec/common_spec.rb
-- spec/rails2_spec.rb
-- spec/rails3_spec.rb
+- resque_mailer.gemspec
+- spec/resque_mailer_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: true
@@ -126,8 +220,5 @@ rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Rails plugin for sending asynchronous email with ActionMailer and Resque
-test_files: 
-- spec/common_spec.rb
-- spec/rails2_spec.rb
-- spec/rails3_spec.rb
-- spec/spec_helper.rb
+test_files: []
+

data/README.rdoc

@@ -1,78 +0,0 @@
-= ResqueMailer
-
-A gem plugin which allows messages prepared by ActionMailer to be delivered
-asynchronously. Assumes you're using Resque (http://github.com/defunkt/resque)
-for your background jobs.
-
-Works in both Rails 2.x and Rails 3.x.
-
-== Usage
-
-Include Resque::Mailer in your ActionMailer subclass(es) like this:
-
- class MyMailer < ActionMailer::Base
-   include Resque::Mailer
- end
-
-Now, when <tt>MyMailer.deliver_subject_email</tt> is called, an entry will be
-created in the job queue. Your Resque workers will be able to deliver this
-message for you. The queue we're using is imaginatively named +mailer+, so
-just make sure your workers know about it and are loading your environment:
-
- QUEUE=mailer rake environment resque:work
-
-Note that you can still have mail delivered synchronously by using the bang
-method variant:
-
- MyMailer.deliver_subject_email!
-
-Oh, by the way. Don't forget that your async mailer jobs will be processed by
-a separate worker. This means that you should resist the temptation to pass
-database-backed objects as parameters in your mailer and instead pass record
-identifiers. Then, in your delivery method, you can look up the record from
-the id and use it as needed.
-
-== Rails 3 Support
-
-Rails 3 has made some changes to the ActionMailer interface. Instead of
-calling <tt>MyMailer.deliver_subject_email(params)</tt>, you'll want to call
-<tt>MyMailer.subject_email(params).deliver</tt>.
-
-You still need to include <tt>Resque::Mailer</tt> in your mailer as described
-above. Everything else should work as expected.
-
-== Installation
-
-Install it as a plugin or as a gem plugin from Gemcutter:
-
- gem install resque_mailer
- script/plugin install git://github.com/zapnap/resque_mailer.git
-
- # Rails 2: edit config/environment.rb
- config.gem 'resque_mailer'
-
- # Rails 3: add it to your Gemfile
- gem 'resque_mailer'
-
-== Testing
-
-You don't want to be sending actual emails in the test environment, so you can
-configure the environments that should be excluded like so:
-
- # config/initializers/resque_mailer.rb
- Resque::Mailer.excluded_environments = [:test, :cucumber]
-
-== Note on Patches / Pull Requests
- 
-* Fork the project.
-* Make your feature addition or bug fix.
-* Add tests for it. This is important so I don't break it in a future version unintentionally.
-* Commit, do not mess with rakefile, version, or history.
-  (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
-* Send me a pull request. Bonus points for topic branches.
-
-== Credits
-
-This work is essentially a forked version of delayed_job_mailer
-(http://github.com/andersondias/delayed_job_mailer) by Anderson Dias. Enhanced
-and modified to work with Resque by Nick Plante.

data/lib/resque_mailer/common.rb

@@ -1,34 +0,0 @@
-module Resque
-  module Mailer
-
-    class << self
-      attr_accessor :default_queue_name
-      attr_reader :excluded_environments
-
-      def excluded_environments=(envs)
-        @excluded_environments = [*envs].map { |e| e.to_sym }
-      end
-
-      def included(base)
-        base.extend(ClassMethods)
-      end
-    end
-
-    self.default_queue_name = "mailer"
-    self.excluded_environments = [:test]
-
-    module ClassMethods
-      def environment_excluded?
-        !ActionMailer::Base.perform_deliveries || excluded_environment?(current_env)
-      end
-
-      def queue
-        ::Resque::Mailer.default_queue_name
-      end
-
-      def excluded_environment?(name)
-        ::Resque::Mailer.excluded_environments && ::Resque::Mailer.excluded_environments.include?(name.to_sym)
-      end
-    end
-  end
-end

data/lib/resque_mailer/rails2.rb

@@ -1,25 +0,0 @@
-module Resque
-  module Mailer
-    module ClassMethods
-
-      def current_env
-        RAILS_ENV
-      end
-
-      def method_missing(method_name, *args)
-        return super if environment_excluded?
-
-        case method_name.id2name
-        when /^deliver_([_a-z]\w*)\!/ then super(method_name, *args)
-        when /^deliver_([_a-z]\w*)/ then ::Resque.enqueue(self, "#{method_name}!", *args)
-        else super(method_name, *args)
-        end
-      end
-
-      def perform(cmd, *args)
-        send(cmd, *args)
-      end
-
-    end
-  end
-end

data/lib/resque_mailer/rails3.rb

@@ -1,42 +0,0 @@
-module Resque
-  module Mailer
-
-    class Rails3MailerProxy
-      def initialize(mailer_class, action, *args)
-        @mailer_class = mailer_class
-        @action = action
-        @args = args
-      end
-
-      def deliver
-        ::Resque.enqueue(@mailer_class, @action, *@args)
-      end
-
-      def deliver!
-        @mailer_class.send(:new, @action, *@args).message.deliver
-      end
-    end
-
-    module ClassMethods
-
-      def current_env
-        ::Rails.env
-      end
-
-      def method_missing(method_name, *args)
-        return super if environment_excluded?
-
-        if action_methods.include?(method_name.to_s)
-          Rails3MailerProxy.new(self, method_name, *args)
-        else
-          super
-        end
-      end
-
-      def perform(action, *args)
-        Rails3MailerProxy.new(self, action, *args).deliver!
-      end
-
-    end
-  end
-end

data/spec/common_spec.rb

@@ -1,26 +0,0 @@
-require File.join(File.expand_path(File.dirname(__FILE__)), 'spec_helper')
-
-class CommonMailer
-  include Resque::Mailer
-end
-
-describe Resque::Mailer do
-  describe ".queue" do
-    context "when not changed" do
-      it "should return 'mailer'" do
-        CommonMailer.queue.should == "mailer"
-      end
-    end
-
-    context "when changed" do
-      before do
-        @my_default_queue = "foobar"
-        Resque::Mailer.should_receive(:default_queue_name).and_return(@my_default_queue)
-      end
-
-      it "should return proper queue name" do
-        CommonMailer.queue.should == @my_default_queue
-      end
-    end
-  end
-end

data/spec/rails2_spec.rb

@@ -1,71 +0,0 @@
-require File.join(File.expand_path(File.dirname(__FILE__)), 'spec_helper')
-
-gem     'actionmailer', '~>2.3.4'
-require 'action_mailer'
-require 'resque_mailer/rails2'
-
-ActionMailer::Base.delivery_method = :test
-
-class Rails2Mailer < ActionMailer::Base
-  include Resque::Mailer
-  MAIL_PARAMS = { :to => "misio@example.org" }
-
-  def test_mail(opts={})
-    @subject    = 'subject'
-    @body       = 'mail body'
-    @recipients = opts[:to]
-    @from       = 'from@example.org'
-    @sent_on    = Time.now
-    @headers    = {}
-  end
-end
-
-describe Rails2Mailer do
-  before do
-    Rails2Mailer.stub(:current_env => :test)
-  end
-
-  describe '#deliver' do
-    before(:all) do
-      @delivery = lambda {
-        Rails2Mailer.deliver_test_mail(Rails2Mailer::MAIL_PARAMS)
-      }
-    end
-
-    before(:each) do
-      Resque.stub(:enqueue)
-    end
-
-    it 'should not deliver the email synchronously' do
-      lambda { @delivery.call }.should_not change(ActionMailer::Base.deliveries, :size)
-    end
-
-    it 'should place the deliver action on the Resque "mailer" queue' do
-      Resque.should_receive(:enqueue).with(Rails2Mailer, "deliver_test_mail!", Rails2Mailer::MAIL_PARAMS)
-      @delivery.call
-    end
-
-    context "when current env is excluded" do
-      it 'should not deliver through Resque for excluded environments' do
-        Resque::Mailer.stub(:excluded_environments => [:custom])
-        Rails2Mailer.should_receive(:current_env).and_return(:custom)
-        Resque.should_not_receive(:enqueue)
-        @delivery.call
-      end
-    end
-  end
-
-  describe '#deliver!' do
-    it 'should deliver the email synchronously' do
-      lambda { Rails2Mailer.deliver_test_mail!(Rails2Mailer::MAIL_PARAMS) }.should change(ActionMailer::Base.deliveries, :size).by(1)
-    end
-  end
-
-  describe ".perform" do
-    it 'should perform a queued mailer job' do
-      lambda {
-        Rails2Mailer.perform("deliver_test_mail!", Rails2Mailer::MAIL_PARAMS)
-      }.should change(ActionMailer::Base.deliveries, :size).by(1)
-    end
-  end
-end