resque_mailer 2.2.5 → 2.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f40dbac9ee7d5c35ab40500a905a8a0ef29c92c
-  data.tar.gz: 151b4ed348d9e7c276316381a2e3f9189732c6e5
+  metadata.gz: 53a54447608a2968256ef39072f6308d1dbc2169
+  data.tar.gz: e9ff62895bacee201cca55e7f3cb5ed805302cb4
 SHA512:
-  metadata.gz: 7ab3baa2fdae11bc4c44fa9849c5e766d43d68f376abb76ce66e7cd41716858944534cbd7798509103c33b2ef12260e9ff0cd9b92fa39c7e02455ec17b9c658d
-  data.tar.gz: 17c8260b7eb423f7086af7a0e65f0a1a44c7872ba45907fe2cf92f523a279510b91d86581ba77b20ee82bc5bbb96c95ac0cf890cfbe6fa230903f4294ca3f5ce
+  metadata.gz: c49ea092064b92528689c38ac49eac32d1c0f451c4e56701a27ac0b3c713609d9bd6daaf1b0e1d6e2245c05168f2ae2dd84fa979d4ba6dfe7f06dca4fdf14de4
+  data.tar.gz: 6be3cbf5e72deba7c4950f22f01effb46e0c6f2a7a20a02b83eaca5be5218166f7bfead4ae8ed75b4050a7359b502091c2b4b192f2be0cb363fb54470da42c94

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+### EDGE / 2013-11-12
+* Add action and args as arguments to the error handler lambda for 
+  requeuing (Ellis Berner, Austen Ito)
+* Redis client v3 support; fix unhandled exception when offline
+  (Yoav Matchulsky)
+
 ### 2.2.5 / 2013-10-10
 * Travis Integration (Peter Goldstein)
 * ActionMailer 4.0 test compatibility (Peter Goldstein)
@@ -15,7 +21,7 @@
 
 ### 2.2.2 / 2013-01-27
 * Fall back to deliver (not deliver!) on actual message, expected
-  behavios when perform_deliveries is false, etc.
+  behavior when perform_deliveries is false, etc.
 
 ### 2.2.1 / 2012-12-09
 * Added optional support for synchronous fallback (Lee Edwards and

data/README.md

@@ -3,7 +3,7 @@
 [![Build Status](https://secure.travis-ci.org/zapnap/resque_mailer.png)](http://travis-ci.org/zapnap/resque_mailer)
 
 A gem plugin which allows messages prepared by ActionMailer to be delivered
-asynchronously. Assumes you're using Resque (http://github.com/defunkt/resque)
+asynchronously. Assumes you're using [Resque](https://github.com/resque/resque)
 for your background jobs.
 
 Note that recent (2.0+) versions of Resque::Mailer only work with Rails 3.x or 4.x.
@@ -58,15 +58,33 @@ name when starting your workers.
 
     QUEUE=application_specific_mailer rake environment resque:work
 
-Custom handling of errors that arise when sending a message is possible by 
+Custom handling of errors that arise when sending a message is possible by
 assigning a lambda to the `error_hander` attribute.
 
+There are two supported lambdas for backwards compatiability:
+
+The first lamba will be deprecated in a future release:
+
 ```ruby
 Resque::Mailer.error_handler = lambda { |mailer, message, error|
   # some custom error handling code here in which you optionally re-raise the error
 }
 ```
 
+The new lamba contains two other arguments, action and args, which allows
+mailers to be requeued on failure:
+
+```ruby
+Resque::Mailer.error_handler = lambda { |mailer, message, error, action, args|
+  # Necessary to re-enqueue jobs that receieve the SIGTERM signal
+  if exception.is_a?(Resque::TermException)
+    Resque.enqueue(mailer, action, *args)
+  else
+    raise exception
+  end
+}
+```
+
 ### Resque::Mailer as a Project Default
 
 If you have a variety of mailers in your application and want all of them to use

data/lib/resque_mailer.rb

@@ -49,7 +49,12 @@ module Resque
           message.deliver
         rescue Exception => ex
           if Mailer.error_handler
-            Mailer.error_handler.call(self, message, ex)
+            if Mailer.error_handler.arity == 3
+              warn "WARNING: error handlers with 3 arguments are deprecated and will be removed in the next release"
+              Mailer.error_handler.call(self, message, ex)
+            else
+              Mailer.error_handler.call(self, message, ex, action, args)
+            end
           else
             if logger
               logger.error "Unable to deliver email [#{action}]: #{ex}"
@@ -122,7 +127,7 @@ module Resque
         if @mailer_class.deliver?
           begin
             resque.enqueue(@mailer_class, @method_name, *@args)
-          rescue Errno::ECONNREFUSED
+          rescue Errno::ECONNREFUSED, Redis::CannotConnectError
             logger.error "Unable to connect to Redis; falling back to synchronous mail delivery" if logger
             deliver!
           end

data/lib/resque_mailer/version.rb

@@ -1,5 +1,5 @@
 module Resque
   module Mailer
-    VERSION = "2.2.5"
+    VERSION = "2.2.6"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resque_mailer
 version: !ruby/object:Gem::Version
-  version: 2.2.5
+  version: 2.2.6
 platform: ruby
 authors:
 - Nick Plante
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-11 00:00:00.000000000 Z
+date: 2013-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer