rescue_each 1.1.2 → 1.1.3

data/VERSION

@@ -1 +1 @@
-1.1.2
+1.1.3

data/lib/rescue_each.rb

@@ -69,7 +69,7 @@ module RescueEach
       
       RESCUE_EACH_OPTIONS = [:stderr, :error_limit]
       
-      def rescue_each(options = {})
+      def rescue_each(options = {}, &block)
         
         options.assert_valid_keys :method, :args, *RESCUE_EACH_OPTIONS
         options.reverse_merge! :method => :each
@@ -78,7 +78,7 @@ module RescueEach
         errors = []
         retval = __send__ options[:method], *options[:args] do |*args|
           begin
-            yield *args.dup
+            block.call *args.dup
           rescue Exception => e
             
             item = RescueEach::Error::Item.new e, args
@@ -88,11 +88,12 @@ module RescueEach
               $stderr.puts "rescue_each error: #{item.short_message}"
             end
             
-            if e.class.name == 'IRB::Abort'
+            # should fail immediately on Interrupt exceptions (i.e. Ctrl-C)
+            if %w(Interrupt IRB::Abort).include? e.class.name
               if errors.empty?
                 raise
               else
-                raise ::IRB::Abort, e.message + "\n" + RescueEach::Error.new(errors).to_s
+                raise e.class, e.message + "\n" + RescueEach::Error.new(errors).to_s
               end
             end
             
@@ -112,7 +113,7 @@ module RescueEach
         
         args = args.dup
         options = args.extract_options!
-        rescue_options = options.reject { |k,v| !RESCUE_EACH_OPTIONS.include? k }
+        rescue_options = options.slice *RESCUE_EACH_OPTIONS
         options.except! *RESCUE_EACH_OPTIONS
         args << options unless options.empty?
         

data/test/rescue_each_test.rb

@@ -66,7 +66,7 @@ class RescueEachTest < ActiveSupport::TestCase
     end
   end
   
-  test "each_with_index args pass through correctly" do
+  test "rescue_each_with_index args pass through correctly with 2 params" do
     output = []
     [:foo, :bar].rescue_each_with_index do |obj,i|
       output << [obj,i]
@@ -75,6 +75,33 @@ class RescueEachTest < ActiveSupport::TestCase
     assert_equal expected, output
   end
   
+  test "rescue_each_with_index args pass through correctly args param" do
+    output = []
+    [:foo, :bar].rescue_each_with_index do |*args|
+      output << args
+    end
+    expected = [[:foo, 0], [:bar, 1]]
+    assert_equal expected, output
+  end
+  
+  test "Hash#rescue_each args for single block param" do
+    input = {:foo => 42, :bar => 12}
+    output = []
+    input.rescue_each do |args|
+      output << args
+    end
+    assert_equal input.to_a, output
+  end
+  
+  test "Hash#rescue_each args for key/value block params" do
+    input = {:foo => 42, :bar => 12}
+    output = []
+    input.rescue_each do |k, v|
+      output << [k,v]
+    end
+    assert_equal input.to_a, output
+  end
+  
   test "error object contains args that triggered error" do
     error_object = nil
     begin
@@ -153,6 +180,26 @@ class RescueEachTest < ActiveSupport::TestCase
     
   end
   
+  test "Ctrl-C from outside IRB should break out of the loop" do
+    
+    error_object = nil
+    output = []
+    begin
+      (1..5).rescue_each do |i|
+        raise 'foo bar' if i == 2
+        output << i
+        raise ::Interrupt if i == 4
+      end
+    rescue ::Interrupt => e
+      error_object = e
+    end
+    
+    assert_equal [1,3,4], output
+    assert_kind_of ::Interrupt, error_object
+    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
@@ -215,10 +262,13 @@ class RescueEachTest < ActiveSupport::TestCase
     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}"
-      assert_true ActiveRecord::Base.methods.include? "rescue_#{method}"
+  test "rescued find methods exist on active record objects" do
+    [:find_each, :find_in_batches].each do |method_base|
+      ["#{method_base}", "rescue_#{method_base}"].each do |method|
+        [ActiveRecord::Base, ActiveRecord::Base.scoped(:limit => 42)].each do |object|
+          assert_true object.respond_to? method
+        end
+      end
     end
   end
   

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rescue_each
 version: !ruby/object:Gem::Version 
-  version: 1.1.2
+  prerelease: false
+  segments: 
+  - 1
+  - 1
+  - 3
+  version: 1.1.3
 platform: ruby
 authors: 
 - Jason Weathered
@@ -9,29 +14,33 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-15 00:00:00 +10:00
+date: 2010-05-02 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: activerecord
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id002
 description: 
 email: jason@jasoncodes.com
 executables: []
@@ -63,18 +72,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Rescue multiple exceptions when enumerating over Enumerable or ActiveRecord objects