rescue_each 1.0.1 → 1.1.0

data/README.markdown

@@ -10,7 +10,7 @@ Once of these tasks fails, perhaps there's a corrupt image. Normally this would
 
 #### Basics
 
-Simply replace your `each` and `each_with_index` calls with `rescue_each` and `rescue_each_with_index` respectively:
+Simply replace your `each` calls with `rescue_each`:
 
     BatchTasks.all.each &:process!
 
@@ -29,6 +29,13 @@ transforms into:
 
 You'll probably find this handy if your batch task normally has its own status output.
 
+#### 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`:
+
+    odds = (1..5).rescue_send(:reject) { |i| i%2 == 0 }
+
 ### Note on Patches/Pull Requests
  
 * Fork the project.

data/Rakefile

@@ -30,3 +30,8 @@ begin
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
+
+desc "Open an IRB session with this library loaded"
+task :console do
+  sh "irb -rrubygems -I lib -r rescue_each.rb"
+end

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.1.0

data/lib/rescue_each.rb

@@ -62,32 +62,72 @@ end
 
 module Enumerable
   
+  RESCUE_EACH_OPTIONS = [:stderr]
+  
   def rescue_each(options = {})
     
-    options.assert_valid_keys :stderr, :method
+    options.assert_valid_keys :method, :args, *RESCUE_EACH_OPTIONS
     options.reverse_merge! :method => :each
+    options.reverse_merge! :args => []
     
     errors = []
-    send options[:method] do |*args|
+    retval = send options[:method], *options[:args] do |*args|
       begin
         yield *args.dup
       rescue Exception => e
+        
         item = RescueEach::Error::Item.new e, args
         if options[:stderr] == :full
           $stderr.puts "rescue_each error: #{item}" if options[:stderr]
         elsif options[:stderr]
           $stderr.puts "rescue_each error: #{item.short_message}"
         end
+        
+        if e.class.name == 'IRB::Abort'
+          if errors.empty?
+            raise
+          else
+            raise ::IRB::Abort, e.message + "\n" + RescueEach::Error.new(errors).to_s
+          end
+        end
+        
         errors << item
+        
       end
     end
     raise RescueEach::Error, errors unless errors.empty?
-    self
+    return retval
+  end
+  
+  def rescue_send(method, *args, &block)
+    
+    args = args.dup
+    options = args.extract_options!
+    rescue_options = options.reject { |k,v| !RESCUE_EACH_OPTIONS.include? k }
+    options.except! *RESCUE_EACH_OPTIONS
+    args << options unless options.empty?
+    
+    rescue_options[:method] = method
+    rescue_options[:args] = args
+    
+    rescue_each rescue_options, &block
+    
+  end
+  
+  def rescue_map(*args, &block)
+    rescue_send :map, *args, &block
+  end
+  
+  def rescue_each_with_index(*args, &block)
+    rescue_send :each_with_index, *args, &block
+  end
+  
+  def rescue_find_each(*args, &block)
+    rescue_send :find_each, *args, &block
   end
   
-  def rescue_each_with_index(options = {}, &block)
-    options = options.reverse_merge :method => :each_with_index
-    rescue_each(options, &block)
+  def rescue_find_in_batches(*args, &block)
+    rescue_send :find_in_batches, *args, &block
   end
   
 end

data/test/rescue_each_test.rb

@@ -107,4 +107,72 @@ class RescueEachTest < ActiveSupport::TestCase
     
   end
   
+  test "Ctrl-C in IRB should break out of the loop" do
+    
+    module ::IRB
+      class Abort < Exception; end
+    end
+    
+    error_object = nil
+    output = []
+    begin
+      (1..5).rescue_each do |i|
+        raise 'foo bar' if i == 2
+        output << i
+        raise ::IRB::Abort, 'abort then interrupt!!' if i == 4
+      end
+    rescue ::IRB::Abort => e
+      error_object = e
+    end
+    
+    assert_equal [1,3,4], output
+    assert_kind_of ::IRB::Abort, error_object
+    assert_match /abort then interrupt/, error_object.message
+    assert_match /foo bar/, error_object.message
+    
+  end
+  
+  test "no stderr option doesn't output to stderr" do
+    err = capture_stderr do
+      assert_raise RescueEach::Error do
+        [42].rescue_each do
+          raise 'foo bar'
+        end
+      end
+    end
+    assert_equal '', err
+  end
+  
+  test "stderr option outputs to stderr" do
+    err = capture_stderr do
+      assert_raise RescueEach::Error do
+        [42].rescue_each :stderr => true do
+          raise 'foo bar'
+        end
+      end
+    end
+    assert_match /foo bar/, err
+  end
+  
+  test "rescue_send passes through args" do
+    assert_true (1..5).rescue_send :include?, 3
+    assert_false (1..5).rescue_send :include?, 6
+  end
+  
+  test "rescue_send handles rescue_each options" do
+    err = capture_stderr do
+      assert_raise RescueEach::Error do
+        [42].rescue_send :each, :stderr => true do
+          raise 'lorem ipsum'
+        end
+      end
+    end
+    assert_match /lorem ipsum/, err
+  end
+  
+  test "rescue_send returns output of proxied method" do
+    output = (1..5).rescue_map { |x| x*x }
+    assert_equal [1,4,9,16,25], output
+  end
+  
 end

data/test/test_helper.rb

@@ -4,3 +4,13 @@ require 'test/unit'
 require 'active_support'
 require 'active_support/test_case'
 require 'rescue_each'
+
+def capture_stderr
+  s = StringIO.new
+  oldstderr = $stderr
+  $stderr = s
+  yield
+  s.string
+ensure
+  $stderr = oldstderr
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rescue_each
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors: 
 - Jason Weathered