Merge pull request nfedyashev#6 from jondruse/master

nfedyashev · nfedyashev · commit e3c93cf9a8d2 · 2014-01-31T17:56:42.000-08:00
add an exception callback option
diff --git a/lib/retryable.rb b/lib/retryable.rb
@@ -3,7 +3,7 @@
 
 module Kernel
   def retryable(options = {}, &block)
-    opts = {:tries => 2, :sleep => 1, :on => StandardError, :matching  => /.*/, :ensure => Proc.new {}}
+    opts = {:tries => 2, :sleep => 1, :on => StandardError, :matching  => /.*/, :ensure => Proc.new {}, :exception_cb => Proc.new {}}
     check_for_invalid_options(options, opts)
     opts.merge!(options)
 
@@ -28,6 +28,7 @@ def retryable(options = {}, &block)
 
       retries += 1
       retry_exception = exception
+      opts[:exception_cb].call(retry_exception)
       retry
     ensure
       opts[:ensure].call(retries)
diff --git a/spec/lib/retryable_spec.rb b/spec/lib/retryable_spec.rb
@@ -107,4 +107,12 @@
       retryable(:bad_option => 2) { raise "this is bad" }
     end.should raise_error ArgumentError, '[Retryable] Invalid options: bad_option'
   end
+
+  it 'accepts a callback to run after an exception is rescued' do
+    lambda do
+      retryable(:sleep => 0, :exception_cb => Proc.new {|e| @raised = e.to_s }) {|tries, ex| raise StandardError.new("this is fun!") if tries < 1 }
+    end.should_not raise_error
+
+    @raised.should == "this is fun!"
+  end
 end
