rescue_each 1.1.4 → 1.1.6

data/.rvmrc

@@ -0,0 +1 @@
+rvm --create 1.9.2@rescue_each

data/Gemfile

@@ -0,0 +1,12 @@
+source :gemcutter
+
+gem 'activesupport', '>= 2.3'
+
+group :development do
+  gem 'activerecord'
+  gem 'i18n'
+  gem 'jeweler'
+  gem 'test-unit'
+  gem 'rcov'
+  gem 'sqlite3'
+end

data/Rakefile

@@ -1,6 +1,8 @@
 require 'rubygems'
-require 'rake'
+require 'bundler/setup'
 require 'rake/testtask'
+require 'jeweler'
+require 'rcov/rcovtask'
 
 desc 'Default: run unit tests.'
 task :default => :test
@@ -13,48 +15,34 @@ Rake::TestTask.new(:test) do |t|
   t.verbose = true
 end
 
-task :test => :check_dependencies
+Jeweler::Tasks.new do |gem|
+  gem.name = "rescue_each"
+  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"]
+  gem.has_rdoc = false
+end
+Jeweler::GemcutterTasks.new
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "rescue_each"
-    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"]
-    gem.has_rdoc = false
-    gem.add_dependency 'activesupport'
-    gem.add_development_dependency 'activerecord'
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+task :lib do
+  $: << 'lib'
+  require 'rescue_each'
 end
+task :console => :lib
 
-desc "Open an IRB session with this library loaded"
-task :console do
-  sh "irb -rrubygems -I lib -r rescue_each.rb"
+Rcov::RcovTask.new do |t|
+  t.libs << "test"
+  t.rcov_opts = [
+    "--exclude '^(?!lib)'"
+  ]
+  t.test_files = FileList[
+    'test/**/*_test.rb'
+  ]
+  t.output_dir = 'coverage'
+  t.verbose = true
 end
 
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |t|
-    t.libs << "test"
-    t.rcov_opts = [
-      "--exclude '^(?!lib)'"
-    ]
-    t.test_files = FileList[
-      'test/**/*_test.rb'
-    ]
-    t.output_dir = 'coverage'
-    t.verbose = true
-  end
-  task :rcov do
-    system "open coverage/index.html"
-  end
-rescue LoadError
-  task :rcov do
-    raise "You must install the 'rcov' gem"
-  end
+task :rcov do
+  system "open coverage/index.html"
 end

data/VERSION

@@ -1 +1 @@
-1.1.4
+1.1.6

data/lib/rescue_each.rb

@@ -17,6 +17,7 @@ module RescueEach
       def title
         "#{exception.message} (#{exception.class})"
       end
+      
       def args_short
         args_str = args.map do |arg|
           str = arg.inspect
@@ -29,11 +30,17 @@ module RescueEach
         end
         "args: " + args_str.join(", ")
       end
+      
       def args_full
         "args: #{args.inspect}"
       end
+      
+      def backtrace_lines
+        exception.backtrace.take_while { |line| !line.index(__FILE__) }
+      end
+      
       def backtrace_s
-        "\t#{exception.backtrace.join "\n\t"}"
+        "\t#{backtrace_lines.join "\n\t"}"
       end
       
       def short_message
@@ -64,6 +71,10 @@ module RescueEach
     
   end
   
+  def self.pass_through_exception?(exception)
+    %w(Interrupt IRB::Abort SignalException).include? exception.class.name
+  end
+  
   module CoreExt
     
     module Object
@@ -79,7 +90,7 @@ module RescueEach
         errors = []
         retval = __send__ options[:method], *options[:args] do |*args|
           begin
-            block.call *args.dup
+            block.call(*args.dup)
           rescue Exception => e
             
             item = RescueEach::Error::Item.new e, args
@@ -89,8 +100,8 @@ module RescueEach
               $stderr.puts "rescue_each error: #{item.short_message}"
             end
             
-            # should fail immediately on Interrupt exceptions (i.e. Ctrl-C)
-            if %w(Interrupt IRB::Abort).include? e.class.name
+            # should fail immediately on interrupt exceptions (i.e. Ctrl-C)
+            if RescueEach.pass_through_exception? e
               if errors.empty?
                 raise
               else
@@ -114,8 +125,8 @@ module RescueEach
         
         args = args.dup
         options = args.extract_options!
-        rescue_options = options.slice *RESCUE_EACH_OPTIONS
-        options.except! *RESCUE_EACH_OPTIONS
+        rescue_options = options.slice(*RESCUE_EACH_OPTIONS)
+        options.except!(*RESCUE_EACH_OPTIONS)
         args << options unless options.empty?
         
         rescue_options[:method] = method

data/test/rescue_each_test.rb

@@ -12,7 +12,7 @@ class RescueEachTest < ActiveSupport::TestCase
     (1..5).rescue_each do |x|
       output << x
     end
-    assert_equal (1..5).collect, output
+    assert_equal((1..5).to_a, output)
   end
   
   test "continues after an error" do
@@ -26,9 +26,9 @@ class RescueEachTest < ActiveSupport::TestCase
     rescue RescueEach::Error => e
       error_object = e
     end
-    assert_equal (1..5).collect, output
+    assert_equal((1..5).to_a, output)
     assert_false error_object.aborted
-    assert_no_match /and then aborted/, error_object.to_s.lines.collect.last
+    assert_no_match(/and then aborted/, error_object.to_s.lines.to_a.last)
   end
   
   test "stops after error limit" do
@@ -42,9 +42,9 @@ class RescueEachTest < ActiveSupport::TestCase
     rescue RescueEach::Error => e
       error_object = e
     end
-    assert_equal (1..6).collect, output
+    assert_equal((1..6).to_a, output)
     assert_true error_object.aborted
-    assert_match /and then aborted/, error_object.to_s.lines.collect.last
+    assert_match(/and then aborted/, error_object.to_s.lines.to_a.last)
   end
   
   test "empty array doesn't call block" do
@@ -117,7 +117,7 @@ class RescueEachTest < ActiveSupport::TestCase
   test "error object contains args for Symbol#to_proc sugar" do
     error_object = nil
     begin
-      [42].rescue_each &:foo
+      [42].rescue_each(&:foo)
     rescue RescueEach::Error => e
       error_object = e
     end
@@ -150,8 +150,33 @@ class RescueEachTest < ActiveSupport::TestCase
     assert_equal 'baz', the_exception.message
     
     assert_true the_exception.backtrace.size > 2
-    assert_match /:in `bar_def'\Z/, the_exception.backtrace[0]
-    assert_match /:in `foo_abc'\Z/, the_exception.backtrace[1]
+    assert_match(/:in `bar_def'\Z/, the_exception.backtrace[0])
+    assert_match(/:in `foo_abc'\Z/, the_exception.backtrace[1])
+    
+  end
+  
+  test "backtrace in message should not duplicate main exception lines" do
+    
+    error_object = nil
+    begin
+      [42].rescue_each do |i|
+        foo_abc
+      end
+    rescue RescueEach::Error => e
+      error_object = e
+    end
+    
+    assert_match(/foo_abc/, error_object.message)
+    assert_match(/bar_def/, error_object.message)
+    
+    assert_no_match(/foo_abc/, error_object.backtrace.join("\n"))
+    assert_no_match(/bar_def/, error_object.backtrace.join("\n"))
+    
+    assert_match(/rescue_each\.rb/, error_object.backtrace.join("\n"))
+    assert_no_match(/rescue_each\.rb/, error_object.message)
+    
+    assert_match(/activesupport/, error_object.backtrace.join("\n"))
+    assert_no_match(/activesupport/, error_object.message)
     
   end
   
@@ -175,8 +200,8 @@ class RescueEachTest < ActiveSupport::TestCase
     
     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
+    assert_match(/abort then interrupt/, error_object.message)
+    assert_match(/foo bar/, error_object.message)
     
   end
   
@@ -196,10 +221,21 @@ class RescueEachTest < ActiveSupport::TestCase
     
     assert_equal [1,3,4], output
     assert_kind_of ::Interrupt, error_object
-    assert_match /foo bar/, error_object.message
+    assert_match(/foo bar/, error_object.message)
     
   end
   
+  test "signal should break out of loop" do
+    output = []
+    assert_raise SignalException do
+      (1..5).rescue_each do |i|
+        raise SignalException.new('TERM') if i == 3
+        output << i
+      end
+    end
+    assert_equal [1,2], output
+  end
+  
   test "no stderr option doesn't output to stderr" do
     err = capture_stderr do
       assert_raise RescueEach::Error do
@@ -219,7 +255,7 @@ class RescueEachTest < ActiveSupport::TestCase
         end
       end
     end
-    assert_match /foo bar/, err
+    assert_match(/foo bar/, err)
   end
   
   test "stderr output truncates long args" do
@@ -236,8 +272,8 @@ class RescueEachTest < ActiveSupport::TestCase
   end
   
   test "rescue_send passes through args" do
-    assert_true (1..5).rescue_send :include?, 3
-    assert_false (1..5).rescue_send :include?, 6
+    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
@@ -248,7 +284,7 @@ class RescueEachTest < ActiveSupport::TestCase
         end
       end
     end
-    assert_match /lorem ipsum/, err
+    assert_match(/lorem ipsum/, err)
   end
   
   test "rescue_map returns output of proxied method" do
@@ -259,13 +295,13 @@ class RescueEachTest < ActiveSupport::TestCase
   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?
+    assert_true odds.all?(&:odd?)
   end
   
   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|
+        [Post, Post.scoped(:limit => 42)].each do |object|
           assert_true object.respond_to? method
         end
       end

data/test/test_helper.rb

@@ -15,3 +15,10 @@ def capture_stderr
 ensure
   $stderr = oldstderr
 end
+
+class Post < ActiveRecord::Base
+  establish_connection :adapter => 'sqlite3', :database => ':memory:'
+  connection.create_table :post do |t|
+    t.string :name
+  end
+end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: rescue_each
 version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: false
-  segments: 
-  - 1
-  - 1
-  - 4
-  version: 1.1.4
+  prerelease: 
+  version: 1.1.6
 platform: ruby
 authors: 
 - Jason Weathered
@@ -15,37 +10,86 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-10 00:00:00 +10:00
+date: 2011-03-24 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+        version: "2.3"
   type: :runtime
+  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: activerecord
-  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
+  prerelease: false
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: i18n
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: test-unit
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: rcov
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: sqlite3
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id007
 description: 
 email: jason@jasoncodes.com
 executables: []
@@ -56,7 +100,8 @@ extra_rdoc_files:
 - LICENSE
 - README.markdown
 files: 
-- .gitignore
+- .rvmrc
+- Gemfile
 - LICENSE
 - README.markdown
 - Rakefile
@@ -69,8 +114,8 @@ homepage: http://github.com/jasoncodes/rescue_each
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -78,7 +123,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: -1762151594371980548
       segments: 
       - 0
       version: "0"
@@ -87,14 +132,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Rescue multiple exceptions when enumerating over Enumerable or ActiveRecord objects

data/.gitignore

@@ -1,3 +0,0 @@
-*.gemspec
-pkg
-coverage