Merge branch 'refinement-changes'

Author: jfelchner

lib/ruby-progressbar/refinements.rb

@@ -1 +1 @@
-require 'ruby-progressbar/refinements/enumerator'
+require 'ruby-progressbar/refinements/progress_enumerator'

lib/ruby-progressbar/refinements/enumerator.rb

@@ -0,0 +1,28 @@
+class  ProgressBar
+module Refinements
+module Enumerator
+  ARITY_ERROR_MESSAGE = 'Only two arguments allowed to be passed to ' \
+                        'with_progressbar (item, progress_bar)'.freeze
+
+  refine ::Enumerator do
+    def with_progressbar(options = {}, &block)
+      progress_bar = ProgressBar.create(options.merge(:starting_at => 0, :total => size))
+
+      each do |item|
+        progress_bar.increment
+
+        next unless block
+
+        yielded_args = []
+        yielded_args << item         if block.arity > 0
+        yielded_args << progress_bar if block.arity > 1
+
+        fail ::ArgumentError, ARITY_ERROR_MESSAGE if block.arity > 2
+
+        yield(*yielded_args)
+      end
+    end
+  end
+end
+end
+end

lib/ruby-progressbar/refinements/progress_enumerator.rb

@@ -1,7 +1,7 @@
 if Module.private_instance_methods.include?(:using)
 
 require 'spec_helper'
-require 'ruby-progressbar/refinements/enumerator'
+require 'ruby-progressbar/refinements/progress_enumerator'
 
 class    ProgressBar
 module   Refinements
@@ -84,6 +84,16 @@ module   Refinements
 
     expect(enumerator.map(&transform)).to eql((0...10).map(&transform))
   end
+
+  it 'passes the progressbar instance to the block when two arguments are requested for the block' do
+    progress     = 0
+    current_item = -1
+
+    (0...10).each.with_progressbar do |item, progress_bar|
+      expect(progress_bar.progress).to be(progress += 1)
+      expect(item).to be(current_item += 1)
+    end
+  end
 end
 end
 end