backports 2.8.1 → 2.8.2

data/lib/backports/1.8.7/enumerator.rb

@@ -7,7 +7,7 @@ if (Enumerable::Enumerator rescue false)
 
       def next
         require 'generator'
-        @generator ||= Generator.new(self)
+        @generator ||= ::Generator.new(self)
         raise StopIteration unless @generator.next?
         @generator.next
       end unless method_defined? :next
@@ -15,10 +15,10 @@ if (Enumerable::Enumerator rescue false)
       def rewind
         @object.rewind if @object.respond_to? :rewind
         require 'generator'
-        @generator ||= Generator.new(self)
+        @generator ||= ::Generator.new(self)
         @generator.rewind
         self
       end unless method_defined? :rewind
     end if const_defined? :Enumerator
   end
-end
+end

data/lib/backports/1.9.1/enumerator.rb

@@ -7,12 +7,7 @@ class Enumerator
       # A simple class which allows the construction of Enumerator from a block
     class Yielder
       def initialize(&block)
-        @main_block = block
-      end
-
-      def each(&block)
         @final_block = block
-        @main_block.call(self)
       end
 
       def yield(*arg)
@@ -25,12 +20,22 @@ class Enumerator
       end
     end
 
+    class Generator
+      def initialize(&block)
+        @main_block = block
+      end
+
+      def each(&block)
+        @main_block.call(Yielder.new(&block))
+      end
+    end
+
     def initialize_with_optional_block(*arg, &block)
       return initialize_without_optional_block(*arg, &nil) unless arg.empty?  # Ruby 1.9 apparently ignores the block if any argument is present
-      initialize_without_optional_block(Yielder.new(&block))
+      initialize_without_optional_block(Generator.new(&block))
     end
     Backports.alias_method_chain self, :initialize, :optional_block
   end
 
   Backports.alias_method self, :with_object, :each_with_object
-end
+end

data/lib/backports/2.0.0/array.rb

@@ -1,6 +1,6 @@
 class Array
   def bsearch
-    return to_enum __method__ unless block_given?
+    return to_enum(__method__) unless block_given?
     from = 0
     to   = size - 1
     satisfied = nil

data/lib/backports/2.0.0/enumerable.rb

@@ -5,5 +5,5 @@ module Enumerable
 end
 
 class Enumerator
-  autoload :Lazy, File.expand_path(File.dirname(__FILE__) + "/enumerator/lazy")
+  require_relative 'enumerator/lazy' unless const_defined? :Lazy
 end

data/lib/backports/2.0.0/enumerator/lazy.rb

@@ -9,7 +9,7 @@ class Enumerator
   end
 
   class Lazy < Enumerator
-    @@done = Object.new   # used internally to bail out of an iteration
+    @@done = :__backports_lazy_enumeration_done__   # used internally to bail out of an iteration
 
     alias_method :non_lazy_cycle, :cycle # cycle must be handled in a tricky way
     @@cycler = Struct.new(:object, :n)
@@ -75,7 +75,7 @@ class Enumerator
     def drop(n)
       n = Backports::coerce_to_int(n)
       Lazy.new(self) do |yielder, *values|
-        data = yielder.backports_memo ||= {remain: n}
+        data = yielder.backports_memo ||= {:remain => n}
         if data[:remain] > 0
           data[:remain] -= 1
         else
@@ -87,7 +87,7 @@ class Enumerator
     def drop_while
       raise ArgumentError, "tried to call lazy drop_while without a block" unless block_given?
       Lazy.new(self) do |yielder, *values|
-        data = yielder.backports_memo ||= {dropping: true}
+        data = yielder.backports_memo ||= {:dropping => true}
         yielder.yield(*values) unless data[:dropping] &&= yield(*values)
       end
     end
@@ -97,7 +97,7 @@ class Enumerator
       raise ArgumentError, 'attempt to take negative size' if n < 0
       return Lazy.new([]){} if n == 0
       Lazy.new(self) do |yielder, *values|
-        data = yielder.backports_memo ||= {remain: n}
+        data = yielder.backports_memo ||= {:remain => n}
         yielder.yield(*values)
         throw @@done if (data[:remain] -= 1) == 0
       end
@@ -137,7 +137,7 @@ class Enumerator
         # Handle trivial case of multiple array arguments separately
         # by avoiding Enumerator#next for efficiency & compatibility
         Lazy.new(self) do |yielder, *values|
-          data = yielder.backports_memo ||= {iter: 0}
+          data = yielder.backports_memo ||= {:iter => 0}
           values = values.first unless values.size > 1
           yielder << arys.map{|ary| ary[data[:iter]]}.unshift(values)
           data[:iter] += 1

data/lib/backports/2.0.0/range.rb

@@ -1,6 +1,6 @@
 class Range
   def bsearch
-    return to_enum __method__ unless block_given?
+    return to_enum(__method__) unless block_given?
     from = self.begin
     to   = self.end
     unless from.is_a?(Numeric) && to.is_a?(Numeric)
@@ -9,9 +9,9 @@ class Range
 
     midpoint = nil
     if from.is_a?(Integer) && to.is_a?(Integer)
-      convert = ->{ midpoint }
+      convert = Proc.new{ midpoint }
     else
-      map = ->(pk, unpk, nb) do
+      map = Proc.new do |pk, unpk, nb|
         result, = [nb.abs].pack(pk).unpack(unpk)
         nb < 0 ? -result : result
       end.curry
@@ -19,7 +19,7 @@ class Range
       f2i = map['D', 'q']
       from = f2i[from.to_f]
       to = f2i[to.to_f]
-      convert = -> { i2f[midpoint] }
+      convert = Proc.new{ i2f[midpoint] }
     end
     to -= 1 if exclude_end?
     satisfied = nil

data/lib/backports/version.rb

@@ -1,3 +1,3 @@
 module Backports
-  VERSION = "2.8.1"
+  VERSION = "2.8.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: backports
 version: !ruby/object:Gem::Version
-  version: 2.8.1
+  version: 2.8.2
   prerelease: 
 platform: ruby
 authors: