resque_mailer 2.2.3 → 2.2.4

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+### EDGE / 2013-05-06
+* Compatibility for Rails 4 pre-release (Ben Woosley)
+* Fallback to synchronous is default when connection to Redis fails
+* Avoid lazy evaluation of mail when excluded, for use with mail_view 
+  (gingerlime)
+
 ### 2.2.3 / 2013-02-27
 * MessageDecoy should handle non rails current_env (Hunter Haydel)
 

data/README.md

@@ -7,6 +7,17 @@ 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.
 
+## Installation
+
+Install the gem:
+
+    gem install resque_mailer
+
+If you're using Bundler to manage your dependencies, you should add it to your Gemfile:
+
+    gem 'resque' # or a compatible alternative / fork
+    gem 'resque_mailer'
+
 ## Usage
 
 Include Resque::Mailer in your ActionMailer subclass(es) like this:
@@ -54,20 +65,7 @@ Resque::Mailer.error_handler = lambda { |mailer, message, error|
 }
 ```
 
-### Using with Resque Scheduler
-
-If [resque-scheduler](https://github.com/bvandenbos/resque-scheduler) is
-installed, two extra methods will be available: `deliver_at` and `deliver_in`.
-These will enqueue mail for delivery at a specified time in the future.
-
-    # Delivers on the 25th of December, 2013
-    MyMailer.reminder_email(params).deliver_at(Time.parse('2013-12-25'))
-
-    # Delivers in 7 days
-    MyMailer.reminder_email(params).deliver_in(7.days)
-
-
-## Resque::Mailer as a Project Default
+### 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
@@ -85,16 +83,17 @@ other mailers inherit from an AsyncMailer:
       end
     end
 
-## Installation
-
-Install the gem:
+### Using with Resque Scheduler
 
-    gem install resque_mailer
+If [resque-scheduler](https://github.com/bvandenbos/resque-scheduler) is
+installed, two extra methods will be available: `deliver_at` and `deliver_in`.
+These will enqueue mail for delivery at a specified time in the future.
 
-If you're using Bundler to manage your dependencies, you should add it to your Gemfile:
+    # Delivers on the 25th of December, 2013
+    MyMailer.reminder_email(params).deliver_at(Time.parse('2013-12-25'))
 
-    gem 'resque' # or a compatible alternative / fork
-    gem 'resque_mailer'
+    # Delivers in 7 days
+    MyMailer.reminder_email(params).deliver_in(7.days)
 
 ## Testing
 

data/lib/resque_mailer.rb

@@ -3,7 +3,7 @@ require 'resque_mailer/version'
 module Resque
   module Mailer
     class << self
-      attr_accessor :default_queue_name, :default_queue_target, :current_env, :logger, :fallback_to_synchronous, :error_handler
+      attr_accessor :default_queue_name, :default_queue_target, :current_env, :logger, :error_handler
       attr_reader :excluded_environments
 
       def excluded_environments=(envs)
@@ -13,9 +13,14 @@ module Resque
       def included(base)
         base.extend(ClassMethods)
       end
+
+      # Deprecated
+      def fallback_to_synchronous=(val)
+        warn "WARNING: fallback_to_synchronous option is deprecated and will be removed in the next release"
+      end
     end
 
-    self.logger = nil
+    self.logger ||= (defined?(Rails) ? Rails.logger : nil)
     self.default_queue_target = ::Resque
     self.default_queue_name = "mailer"
     self.excluded_environments = [:test]
@@ -84,6 +89,7 @@ module Resque
         @mailer_class = mailer_class
         @method_name = method_name
         *@args = *args
+        actual_message if environment_excluded?
       end
 
       def resque
@@ -117,6 +123,7 @@ module Resque
           begin
             resque.enqueue(@mailer_class, @method_name, *@args)
           rescue Errno::ECONNREFUSED
+            logger.error "Unable to connect to Redis; falling back to synchronous mail delivery" if logger
             deliver!
           end
         end
@@ -153,6 +160,10 @@ module Resque
       def method_missing(method_name, *args)
         actual_message.send(method_name, *args)
       end
+
+      def logger
+        @mailer_class.logger
+      end
     end
   end
 end

data/lib/resque_mailer/version.rb

@@ -1,5 +1,5 @@
 module Resque
   module Mailer
-    VERSION = "2.2.3"
+    VERSION = "2.2.4"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque_mailer
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,14 +9,14 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-28 00:00:00.000000000 Z
+date: 2013-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
@@ -24,7 +24,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
@@ -88,7 +88,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3399216281292573074
+      hash: 937321504006937956
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -97,10 +97,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3399216281292573074
+      hash: 937321504006937956
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Rails plugin for sending asynchronous email with ActionMailer and Resque.