backports 1.10.0 → 1.10.1

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 1
 :minor: 10
-:patch: 0
+:patch: 1

data/backports.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{backports}
-  s.version = "1.10.0"
+  s.version = "1.10.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marc-Andr\303\251 Lafortune"]
-  s.date = %q{2009-09-29}
+  s.date = %q{2009-10-03}
   s.description = %q{      Essential backports that enable some of the really nice features of ruby 1.8.7, ruby 1.9 and rails from ruby 1.8.6 and earlier.
 }
   s.email = %q{github@marc-andre.ca}

data/lib/backports/1.8.7/enumerator.rb

@@ -1,19 +1,21 @@
 require 'enumerator'
-module Enumerable
-  class Enumerator
-    def next
-      require 'generator'
-      @generator ||= Generator.new(self)
-      raise StopIteration unless @generator.next?
-      @generator.next
-    end unless method_defined? :next
+if (Enumerable::Enumerator rescue false)
+  module Enumerable
+    class Enumerator
+      def next
+        require 'generator'
+        @generator ||= Generator.new(self)
+        raise StopIteration unless @generator.next?
+        @generator.next
+      end unless method_defined? :next
 
-    def rewind
-      @object.rewind if @object.respond_to? :rewind
-      require 'generator'
-      @generator ||= Generator.new(self)
-      @generator.rewind
-      self
-    end unless method_defined? :rewind
+      def rewind
+        @object.rewind if @object.respond_to? :rewind
+        require 'generator'
+        @generator ||= Generator.new(self)
+        @generator.rewind
+        self
+      end unless method_defined? :rewind
+    end if const_defined? :Enumerator
   end
 end

data/lib/backports/1.9/enumerable.rb

@@ -7,30 +7,36 @@ module Enumerable
   end unless method_defined? :each_with_object
 
   def chunk(initial_state = nil, &original_block)
-    Enumerator.new do |yielder|
-      previous = Backports::Undefined
+    raise ArgumentError, "no block given" unless block_given?
+    ::Enumerator.new do |yielder|
+      previous = nil
       accumulate = []
       block = initial_state.nil? ? original_block : Proc.new{|val| original_block.yield(val, initial_state.clone)}
       each do |val|
-        case key = block.yield(val)
-        when nil, :_separator
-          next
-        when :_singleton
-          yielder.yield previous, accumulate unless accumulate.empty?
-          yielder.yield key, [val]
+        key = block.yield(val)
+        if key.nil? || (key.is_a?(Symbol) && key.to_s[0,1] == "_")
+          yielder.yield [previous, accumulate] unless accumulate.empty?
           accumulate = []
-          previous = Backports::Undefined
-        when previous, Backports::Undefined
-          accumulate << val
-          previous = key
+          previous = nil
+          case key
+          when nil, :_separator
+          when :_singleton
+            yielder.yield [key, [val]]
+          else
+            raise RuntimeError, "symbol beginning with an underscore are reserved"
+          end
         else
-          yielder.yield previous, accumulate unless accumulate.empty?
-          accumulate = [val]
+          if previous.nil? || previous == key
+            accumulate << val
+          else
+            yielder.yield [previous, accumulate] unless accumulate.empty?
+            accumulate = [val]
+          end
           previous = key
         end
       end
       # what to do in case of a break?
-      yielder.yield previous, accumulate unless accumulate.empty?
+      yielder.yield [previous, accumulate] unless accumulate.empty?
     end
-  end
+  end unless method_defined? :chunk
 end

data/lib/backports/1.9/method.rb

@@ -79,8 +79,8 @@ unless Kernel.method_defined? :respond_to_missing?
       false
     end
 
-    def respond_to_with_call_to_respond_to_missing? method
-      respond_to_without_call_to_respond_to_missing?(method) || respond_to_missing?(method)
+    def respond_to_with_call_to_respond_to_missing? method, include_priv=false
+      respond_to_without_call_to_respond_to_missing?(method, include_priv) || respond_to_missing?(method)
     end
     Backports.alias_method_chain self, :respond_to?, :call_to_respond_to_missing
 

data/test/enumerable_test.rb

@@ -199,7 +199,30 @@ class EnumerableTest < Test::Unit::TestCase
             [1, [3,4,5]],
             [0, [6,7]]], e.to_a
         end
+
+        should "should pass two arguments to the block" do
+          e = (1..7).chunk{|i| (i/3) % 2}
+          e.each do |key, val|
+            assert_equal 0, key
+            assert_equal [1,2], val
+            break
+          end
+        end
+
+        should "handles nil & :_symbol" do
+          a = [1,1,nil,1,:_separator, 1, :_singleton, 1]
+          e = a.size.times.chunk{|i| a[i]}
+          assert_equal [
+            [1,[0,1]],
+            [1,[3]],
+            [1,[5]],
+            [:_singleton, [6]],
+            [1,[7]]
+          ], e.to_a
+        end
+
       end
+
       context "given an initial_state argument" do
         should "give a new copy" do
           a = []

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: backports
 version: !ruby/object:Gem::Version 
-  version: 1.10.0
+  version: 1.10.1
 platform: ruby
 authors: 
 - "Marc-Andr\xC3\xA9 Lafortune"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-29 00:00:00 -04:00
+date: 2009-10-03 00:00:00 -04:00
 default_executable: 
 dependencies: []