rescue_each 1.1.0 → 1.1.1

data/README.markdown

@@ -6,6 +6,12 @@ These tasks could be anything from updating cached database entries to file conv
 
 Once of these tasks fails, perhaps there's a corrupt image. Normally this would mean the entire batch task fails. But with rescue_each the other items can be processed and any errors will be re-raised at the end to be caught by your cron script.
 
+### Installation
+
+You can install from Gemcutter by running:
+
+    sudo gem install rescue_each
+
 ### Usage
 
 #### Basics

data/Rakefile

@@ -25,6 +25,7 @@ begin
     gem.authors = ["Jason Weathered"]
     gem.has_rdoc = false
     gem.add_dependency 'activesupport'
+    gem.add_development_dependency 'activerecord'
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.1.1

data/lib/rescue_each.rb

@@ -1,6 +1,7 @@
 require 'active_support'
 
 module RescueEach
+  
   class Error < StandardError
     
     attr_reader :errors
@@ -16,11 +17,12 @@ module RescueEach
       end
       def args_short
         args_str = args.map do |arg|
-          lines = arg.inspect.lines.collect
-          if lines.size == 1
-            lines.first
+          str = arg.inspect
+          max_length = 500
+          if str.size > max_length
+            str.slice(0, max_length) + " [#{str.size-max_length} more chars...]"
           else
-            lines.first + " [#{lines.size-1} more...]"
+            str
           end
         end
         "args: " + args_str.join(", ")
@@ -58,76 +60,101 @@ module RescueEach
     end
     
   end
-end
-
-module Enumerable
   
-  RESCUE_EACH_OPTIONS = [:stderr]
-  
-  def rescue_each(options = {})
-    
-    options.assert_valid_keys :method, :args, *RESCUE_EACH_OPTIONS
-    options.reverse_merge! :method => :each
-    options.reverse_merge! :args => []
+  module CoreExt
     
-    errors = []
-    retval = send options[:method], *options[:args] do |*args|
-      begin
-        yield *args.dup
-      rescue Exception => e
+    module Object
+      
+      RESCUE_EACH_OPTIONS = [:stderr]
+      
+      def rescue_each(options = {})
         
-        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
+        options.assert_valid_keys :method, :args, *RESCUE_EACH_OPTIONS
+        options.reverse_merge! :method => :each
+        options.reverse_merge! :args => []
         
-        if e.class.name == 'IRB::Abort'
-          if errors.empty?
-            raise
-          else
-            raise ::IRB::Abort, e.message + "\n" + RescueEach::Error.new(errors).to_s
+        errors = []
+        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?
+        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
         
-        errors << item
+        rescue_each rescue_options, &block
         
       end
+      
     end
-    raise RescueEach::Error, errors unless errors.empty?
-    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
+    module Enumerable
+      def self.included(klass)
+        klass.class_eval do
+          
+          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
+        
+        end
+      end
+    end
     
   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_find_in_batches(*args, &block)
-    rescue_send :find_in_batches, *args, &block
+  module ActiveRecord
+    def self.included(klass)
+      klass.class_eval do
+        
+        def self.rescue_find_each(*args, &block)
+          rescue_send :find_each, *args, &block
+        end
+        
+        def self.rescue_find_in_batches(*args, &block)
+          rescue_send :find_in_batches, *args, &block
+        end
+        
+      end
+    end
   end
   
 end
+
+Object.send(:include, RescueEach::CoreExt::Object)
+Enumerable.send(:include, RescueEach::CoreExt::Enumerable)
+ActiveRecord::Base.send(:include, RescueEach::ActiveRecord) if defined? ActiveRecord

data/test/rescue_each_test.rb

@@ -154,6 +154,19 @@ class RescueEachTest < ActiveSupport::TestCase
     assert_match /foo bar/, err
   end
   
+  test "stderr output truncates long args" do
+    
+    err = capture_stderr do
+      assert_raise RescueEach::Error do
+        ['foo bar '*1000].rescue_each(:stderr => true) { raise 'foo' }
+      end
+    end
+    
+    assert_operator err.size, :>=, 100
+    assert_operator err.size, :<=, 1000
+    
+  end
+  
   test "rescue_send passes through args" do
     assert_true (1..5).rescue_send :include?, 3
     assert_false (1..5).rescue_send :include?, 6
@@ -175,4 +188,11 @@ class RescueEachTest < ActiveSupport::TestCase
     assert_equal [1,4,9,16,25], output
   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}"
+    end
+  end
+  
 end

data/test/test_helper.rb

@@ -3,6 +3,7 @@ gem 'test-unit'
 require 'test/unit'
 require 'active_support'
 require 'active_support/test_case'
+require 'active_record'
 require 'rescue_each'
 
 def capture_stderr

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rescue_each
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors: 
 - Jason Weathered
@@ -22,6 +22,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: activerecord
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: 
 email: jason@jasoncodes.com
 executables: []