rescue_each 1.1.1 → 1.1.2

data/README.markdown

@@ -1,5 +1,5 @@
 # `rescue_each`
-## Rescue multiple exceptions when working with Enumerable objects.
+## Rescue multiple exceptions when enumerating over Enumerable or ActiveRecord objects.
 
 Say you have a batch rake task which runs from cron which consists of many independent tasks ran in a loop.
 These tasks could be anything from updating cached database entries to file conversions.
@@ -33,12 +33,12 @@ transforms into:
       raise 'example'
     end
 
-You'll probably find this handy if your batch task normally has its own status output.
+You'll probably find this handy if your batch task has its own status output as this mode will output an error summary inline.
 
 #### Other Methods
 
-`rescue_each` provides proxies for `each_with_index`, `find_each` and `find_in_batches`.
-If you want to call another method on an `Enumerable`, you can use `rescue_send`:
+`rescue_each` also provides proxies for `map`, `each_with_index`, `find_each` and `find_in_batches`.
+You can also use `rescue_each` on any method taking a block by calling `rescue_send`:
 
     odds = (1..5).rescue_send(:reject) { |i| i%2 == 0 }
 

data/Rakefile

@@ -19,7 +19,7 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "rescue_each"
-    gem.summary = "Rescue multiple exceptions when working with Enumerable objects"
+    gem.summary = "Rescue multiple exceptions when enumerating over Enumerable or ActiveRecord objects"
     gem.email = "jason@jasoncodes.com"
     gem.homepage = "http://github.com/jasoncodes/rescue_each"
     gem.authors = ["Jason Weathered"]

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.1.2

data/lib/rescue_each.rb

@@ -4,10 +4,11 @@ module RescueEach
   
   class Error < StandardError
     
-    attr_reader :errors
+    attr_reader :errors, :aborted
     
-    def initialize(errors)
+    def initialize(errors, aborted=false)
       @errors = errors
+      @aborted = aborted
     end
     
     class Item < Struct.new :exception, :args
@@ -56,6 +57,7 @@ module RescueEach
         msg << "\n"
       end
       msg << "rescue_each caught #{errors.size} errors"
+      msg << ", and then aborted." if aborted
       msg.join
     end
     
@@ -65,7 +67,7 @@ module RescueEach
     
     module Object
       
-      RESCUE_EACH_OPTIONS = [:stderr]
+      RESCUE_EACH_OPTIONS = [:stderr, :error_limit]
       
       def rescue_each(options = {})
         
@@ -96,6 +98,10 @@ module RescueEach
             
             errors << item
             
+            if options[:error_limit] && errors.size >= options[:error_limit]
+              raise RescueEach::Error.new(errors, true)
+            end
+            
           end
         end
         raise RescueEach::Error, errors unless errors.empty?

data/test/rescue_each_test.rb

@@ -16,14 +16,35 @@ class RescueEachTest < ActiveSupport::TestCase
   end
   
   test "continues after an error" do
+    error_object = nil
     output = []
-    assert_raise RescueEach::Error do
+    begin
       (1..5).rescue_each do |x|
         output << x
         raise 'test' if x == 3
       end
+    rescue RescueEach::Error => e
+      error_object = e
     end
     assert_equal (1..5).collect, output
+    assert_false error_object.aborted
+    assert_no_match /and then aborted/, error_object.to_s.lines.collect.last
+  end
+  
+  test "stops after error limit" do
+    error_object = nil
+    output = []
+    begin
+      (1..10).rescue_each :error_limit => 3 do |x|
+        output << x
+        raise 'test' if x%2 == 0
+      end
+    rescue RescueEach::Error => e
+      error_object = e
+    end
+    assert_equal (1..6).collect, output
+    assert_true error_object.aborted
+    assert_match /and then aborted/, error_object.to_s.lines.collect.last
   end
   
   test "empty array doesn't call block" do
@@ -183,11 +204,17 @@ class RescueEachTest < ActiveSupport::TestCase
     assert_match /lorem ipsum/, err
   end
   
-  test "rescue_send returns output of proxied method" do
+  test "rescue_map returns output of proxied method" do
     output = (1..5).rescue_map { |x| x*x }
     assert_equal [1,4,9,16,25], output
   end
   
+  test "rescue_send calls correct method and returns result" do
+    odds = (1..5).rescue_send(:reject) { |i| i%2 == 0 }
+    assert_false odds.empty?
+    assert_true odds.all? &:odd?
+  end
+  
   test "find_each exists on active record objects" do
     [:find_each, :find_in_batches].each do |method|
       assert_true ActiveRecord::Base.methods.include? "#{method}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rescue_each
 version: !ruby/object:Gem::Version 
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors: 
 - Jason Weathered
@@ -77,7 +77,7 @@ rubyforge_project:
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: Rescue multiple exceptions when working with Enumerable objects
+summary: Rescue multiple exceptions when enumerating over Enumerable or ActiveRecord objects
 test_files: 
 - test/rescue_each_test.rb
 - test/test_helper.rb