backports 1.6.8 → 1.7.0

data/lib/backports/enumerable.rb

@@ -9,68 +9,80 @@ module Enumerable
     end
   end unless method_defined? :sum
 
-  # Standard in ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/Enumerable.html]
-  def count(*arg)
-    result = 0
-    if block_given?
-      each{|o| result += 1 if yield o}
-    elsif arg.empty?
-      each{|o| result += 1}
+  # Standard in Ruby 1.8.7+. See official documentation[http://ruby-doc.org/core-1.9/classes/Enumerable.html]
+  def count(item = Undefined)
+    seq = 0
+    if item != Undefined
+      each { |o| seq += 1 if item == o }
+    elsif block_given?
+      each { |o| seq += 1 if yield(o) }
     else
-      obj = arg.first
-      each{|o| result += 1 if obj == o}
+      each { seq += 1 }
     end
-    result
+    seq
   end unless method_defined? :count
   
-  # Standard in ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/Enumerable.html]
-  def cycle(*arg, &block)
-    return to_enum(:cycle, *arg) unless block_given?
-    to_a.cycle(*arg, &block)
+  # Standard in Ruby 1.8.7+. See official documentation[http://ruby-doc.org/core-1.9/classes/Enumerable.html]
+  def cycle(n = nil, &block)
+    return to_enum(:cycle, n) unless block_given?
+    return loop(&block) if nil == n
+    n = Type.coerce_to(n, Fixnum, :to_int)
+    if n >= 1
+      cache = []
+      each do |elem|
+        cache << elem
+        block.call(elem)
+      end
+      cache.cycle(n-1, &block)
+    end
   end unless method_defined? :cycle
   
-  make_block_optional :detect, :find, :test_on => [42]
+  make_block_optional :detect, :find, :find_all, :select, :sort_by, :partition, :reject, :test_on => 1..2
   
-  # Standard in ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/Enumerable.html]
+  # Standard in Ruby 1.8.7+. See official documentation[http://ruby-doc.org/core-1.9/classes/Enumerable.html]
   def drop(n)
-    array = to_a
-    array[n...array.size] || []
+    n = Type.coerce_to(n, Fixnum, :to_int)
+    raise ArgumentError, "attempt to drop negative size" if n < 0
+    ary = to_a
+    return [] if n > ary.size
+    ary[n...ary.size]
   end unless method_defined? :drop
   
-  # Standard in ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/Enumerable.html]
+  # Standard in Ruby 1.8.7+. See official documentation[http://ruby-doc.org/core-1.9/classes/Enumerable.html]
   def drop_while(&block)
     return to_enum(:drop_while) unless block_given?
-    array = to_a
-    array.each_with_index do |element, i|
-      return array.drop(i) unless yield(element)
+    ary = []
+    dropping = true
+    each do |obj|
+      ary << obj unless dropping &&= yield(obj)
     end
-    []
+    ary
   end unless method_defined? :drop_while
   
-  # Standard in ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/Enumerable.html]
+  # Standard in Ruby 1.8.7+. See official documentation[http://ruby-doc.org/core-1.9/classes/Enumerable.html]
   make_block_optional :each_cons, :each_slice, :test_on => 1..2, :arg => 1
 
-  # Standard in ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/Enumerable.html]
+  # Standard in Ruby 1.8.7+. See official documentation[http://ruby-doc.org/core-1.9/classes/Enumerable.html]
   if instance_method(:each_with_index).arity.zero?
     def each_with_index_with_optional_args_and_block(*args, &block)
       return to_enum(:each_with_index, *args) unless block_given?
-      to_enum(:each, *args).each_with_index_without_optional_args_and_block(&block)
+      idx = 0
+      each(*args) { |o| yield(o, idx); idx += 1 }
+      self
     end
     alias_method_chain :each_with_index, :optional_args_and_block
   end
   
-  # Standard in ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/Enumerable.html]
+  # Standard in Ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/Enumerable.html]
   def each_with_object(memo, &block)
     return to_enum(:each_with_object, memo) unless block_given?
     each {|obj| block.call(obj, memo)}
     memo
   end unless method_defined? :each_with_object
 
-  # Standard in ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/Enumerable.html]
-  def find_index(*args)
-    raise ArgumentError, "Wrong number of arguments (#{args.size} for 1)" if args.size > 1
-    if args.size == 1
-      obj = args.first
+  # Standard in Ruby 1.8.7+. See official documentation[http://ruby-doc.org/core-1.9/classes/Enumerable.html]
+  def find_index(obj = Undefined)
+    if obj != Undefined
       each_with_index do |element, i|
         return i if element == obj
       end
@@ -78,19 +90,20 @@ module Enumerable
       each_with_index do |element, i|
         return i if yield element
       end
-      each_with_index{|o,i| return i if yield o}
     else
       return to_enum(:find_index)
     end
     nil
   end unless method_defined? :find_index
   
-  # Standard in ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/Enumerable.html]
-  def first(*arg)
-    arg.empty? ? take(1)[0] : take(arg.first)
+  # Standard in Ruby 1.8.7+. See official documentation[http://ruby-doc.org/core-1.9/classes/Enumerable.html]
+  def first(n = Undefined)
+    return take(n) unless n == Undefined
+    each{|obj| return obj}
+    nil
   end unless method_defined? :first
 
-  # Standard in ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/Enumerable.html]
+  # Standard in Ruby 1.8.7+. See official documentation[http://ruby-doc.org/core-1.9/classes/Enumerable.html]
   def group_by
     return to_enum(:group_by) unless block_given?
     returning({}) do |result|
@@ -100,13 +113,11 @@ module Enumerable
     end
   end unless method_defined? :group_by
   
-  # Standard in ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/Enumerable.html]
+  # Standard in Ruby 1.8.7+. See official documentation[http://ruby-doc.org/core-1.9/classes/Enumerable.html]
   unless ((1..2).inject(:+) rescue false)
     def inject_with_symbol(*args, &block)
-      return inject_without_symbol(*args, &block) if block_given?
+      return inject_without_symbol(*args, &block) if block_given? && args.size <= 1
       method = args.pop
-      raise TypeError, "#{method} is not a symbol" unless method.respond_to? :to_sym
-      method = method.to_sym
       inject_without_symbol(*args) {|memo, obj| memo.send(method, obj)}
     end
     alias_method_chain :inject, :symbol
@@ -123,19 +134,19 @@ module Enumerable
     end
   end
 
-  # Standard in ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/Enumerable.html]
+  # Standard in Ruby 1.8.7+. See official documentation[http://ruby-doc.org/core-1.9/classes/Enumerable.html]
   def max_by(&block)
     return to_enum(:max_by) unless block_given?
     minmax_by(&block)[1]
   end unless method_defined? :max_by
 
-  # Standard in ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/Enumerable.html]
+  # Standard in Ruby 1.8.7+. See official documentation[http://ruby-doc.org/core-1.9/classes/Enumerable.html]
   def min_by(&block)
     return to_enum(:min_by) unless block_given?
     minmax_by(&block).first
   end unless method_defined? :min_by
 
-  # Standard in ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/Enumerable.html]
+  # Standard in Ruby 1.8.7+. See official documentation[http://ruby-doc.org/core-1.9/classes/Enumerable.html]
   def minmax
     return minmax{|a,b| a <=> b} unless block_given?
     first_time = true
@@ -145,14 +156,14 @@ module Enumerable
         min = max = object
         first_time = false
       else
-        min = object if yield(min, object) > 0
-        max = object if yield(max, object) < 0
+        min = object if Type.coerce_to_comparison(min, object, yield(min, object)) > 0
+        max = object if Type.coerce_to_comparison(max, object, yield(max, object)) < 0
       end
     end
     [min, max]
   end unless method_defined? :minmax
   
-  # Standard in ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/Enumerable.html]
+  # Standard in Ruby 1.8.7+. See official documentation[http://ruby-doc.org/core-1.9/classes/Enumerable.html]
   def minmax_by(&block)
     return to_enum(:minmax_by) unless block_given?
     min_object, min_result = nil, MOST_EXTREME_OBJECT_EVER
@@ -165,20 +176,35 @@ module Enumerable
     [min_object, max_object]
   end unless method_defined? :minmax_by
 
-  # Standard in ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/Enumerable.html]
+  # Standard in Ruby 1.8.7+. See official documentation[http://ruby-doc.org/core-1.9/classes/Enumerable.html]
   def none?(&block)
     !any?(&block)
   end unless method_defined? :none?
 
-  # Standard in ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/Enumerable.html]
+  # Standard in Ruby 1.8.7+. See official documentation[http://ruby-doc.org/core-1.9/classes/Enumerable.html]
   def one?(&block)
-    return one?{|o| o} unless block_given?
-    1 == count(&block)
+    found_one = false
+    if block_given?
+      each do |o|
+        if yield(o)
+          return false if found_one
+          found_one = true
+        end
+      end
+    else
+      each do |o|
+        if o
+          return false if found_one
+          found_one = true
+        end
+      end
+    end
+    found_one
   end unless method_defined? :one?
 
   alias_method :reduce, :inject unless method_defined? :reduce
   
-  # Standard in ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/Enumerable.html]
+  # Standard in Ruby 1.8.7+. See official documentation[http://ruby-doc.org/core-1.9/classes/Enumerable.html]
   def reverse_each(&block)
     return to_enum(:reverse_each) unless block_given?
     # There is no other way then to convert to an array first... see 1.9's source.
@@ -186,17 +212,19 @@ module Enumerable
     self
   end unless method_defined? :reverse_each
   
-  # Standard in ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/Enumerable.html]
+  # Standard in Ruby 1.8.7+. See official documentation[http://ruby-doc.org/core-1.9/classes/Enumerable.html]
   def take(n)
+    n = Type.coerce_to(n, Fixnum, :to_int)
+    raise ArgumentError, "attempt to take negative size: #{n}" if n < 0
     returning([]) do |array|
       each do |elem|
-        array << elem
         break if array.size >= n
+        array << elem
       end unless n <= 0
     end
   end unless method_defined? :take
   
-  # Standard in ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/Enumerable.html]
+  # Standard in Ruby 1.8.7+. See official documentation[http://ruby-doc.org/core-1.9/classes/Enumerable.html]
   def take_while
     return to_enum(:take_while) unless block_given?
     inject([]) do |array, elem|
@@ -205,7 +233,7 @@ module Enumerable
     end
   end unless method_defined? :take_while
 
-  # Standard in ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/Enumerable.html]
+  # Standard in Ruby 1.8.7+. See official documentation[http://ruby-doc.org/core-1.9/classes/Enumerable.html]
   if instance_method(:to_a).arity.zero?
     def to_a_with_optional_arguments(*args)
       return to_a_without_optional_arguments if args.empty?
@@ -214,4 +242,13 @@ module Enumerable
     alias_method_chain :to_a, :optional_arguments
   end
   
+  # alias_method gives a warning, so instead copy-paste:
+  if instance_method(:entries).arity.zero?
+    def entries_with_optional_arguments(*args)
+      return entries_without_optional_arguments if args.empty?
+      to_enum(:each, *args).entries
+    end
+    alias_method_chain :entries, :optional_arguments
+  end
+  
 end

data/lib/backports/enumerator.rb

@@ -1,38 +1,40 @@
 class Enumerator
   alias_method :with_object, :each_with_object unless method_defined? :with_object
-   
+
   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
-  
+
   # new with block, standard in Ruby 1.9
   unless (self.new{} rescue false)
     class Yielder
       def initialize(&block)
         @main_block = block
       end
-  
+
       def each(&block)
         @final_block = block
         @main_block.call(self)
       end
-  
+
       def yield(*arg)
         @final_block.yield(*arg)
       end
     end
-    
+
     def initialize_with_optional_block(*arg, &block)
+      @object = arg.first
       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))
     end

data/lib/backports/env.rb

@@ -0,0 +1,3 @@
+class << ENV
+  make_block_optional :delete_if, :each, :each_key, :each_pair, :each_value, :reject!, :select, :test_on => ENV
+end

data/lib/backports/fixnum.rb

@@ -1,7 +1,7 @@
 class Fixnum
   # Standard in ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/Fixnum.html]
   def div(n)
-    (self / n).round
+    (self / n).to_i
   end unless method_defined? :div
 
   # Standard in ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/Fixnum.html]

data/lib/backports/float.rb

@@ -0,0 +1,4 @@
+class Fixnum
+  # Standard in ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/Fixnum.html]
+  alias_method :fdiv, :/ unless method_defined? :fdiv
+end

data/lib/backports/gc.rb

@@ -0,0 +1,9 @@
+module GC
+  def self.stress
+    false
+  end
+
+  def self.stress=(flag)
+    raise NotImplementedError
+  end
+end

data/lib/backports/hash.rb

@@ -1,41 +1,47 @@
 class Hash
-  # New ruby 1.9 constructor -- not documented?
+  # New Ruby 1.8.7+ constructor -- not documented, see redmine # 1385
   # <tt>Hash[[[:foo, :bar],[:hello, "world"]]] ==> {:foo => :bar, :hello => "world"}</tt>
   class << self
     alias_method :original_constructor, :[]
-    def [](*arg)
-      return original_constructor(*arg) unless arg.length == 1 && arg.first.is_a?(Array)
+    def [](*args)
+      return original_constructor(*args) unless args.length == 1 && args.first.is_a?(Array)
       returning({}) do |h|
-        arg.first.each{|key, value| h[key] = value}
+        args.first.each do |arr|
+          next unless arr.respond_to? :to_ary
+          arr = arr.to_ary
+          next unless (1..2).include? arr.size
+          h[arr.at(0)] = arr.at(1)
+        end
       end
     end unless (Hash[[[:test, :test]]] rescue false)
-    
+
+    # Standard in Ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/Hash.html]
     def try_convert(x)
       return nil unless x.respond_to? :to_hash
       x.to_hash
     end unless method_defined? :to_hash
   end
 
-  make_block_optional :delete_if, :each, :each_key, :each_pair, :each_value, :reject!, :select, :test_on => {:hello => "world!"}
-  
-  # Standard in ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/Hash.html]
+  make_block_optional :delete_if, :each, :each_key, :each_pair, :each_value, :reject, :reject!, :select, :test_on => {:hello => "world!"}
+
+  # Standard in Ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/Hash.html]
   def default_proc=(proc)
-    replace(Hash.new(&proc).merge!(self))
+    replace(Hash.new(&Type.coerce_to(proc, Proc, :to_proc)).merge!(self))
   end unless method_defined? :default_proc=
 
-  # Standard in ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/Hash.html]
+  # Standard in Ruby 1.8.7+. See official documentation[http://ruby-doc.org/core-1.9/classes/Hash.html]
   alias_method :key, :index unless method_defined? :key
-  
+
   # Standard in rails. See official documentation[http://api.rubyonrails.org/classes/ActiveSupport/CoreExtensions/Hash/Keys.html]
   def reverse_merge(other_hash)
     other_hash.merge(self)
   end
-  
+
   # Standard in rails. See official documentation[http://api.rubyonrails.org/classes/ActiveSupport/CoreExtensions/Hash/Keys.html]
   def reverse_merge!(other_hash)
     replace(reverse_merge(other_hash))
   end
-  
+
   # Standard in rails. See official documentation[http://api.rubyonrails.org/classes/ActiveSupport/CoreExtensions/Hash/Keys.html]
   def symbolize_keys
     Hash[map{|key,value| [(key.to_sym rescue key) || key, value] }]
@@ -55,8 +61,4 @@ class Hash
   def stringify_keys!
     self.replace(self.stringify_keys)
   end unless method_defined? :stringify_keys!
-end
-
-class << ENV
-  make_block_optional :delete_if, :each, :each_key, :each_pair, :each_value, :reject!, :select, :test_on => ENV
 end

data/lib/backports/integer.rb

@@ -12,23 +12,14 @@ class Integer
   # Standard in ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/Fixnum.html]
   def ord
     self
-  end
-
-  # Standard in ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/Fixnum.html]
-  def succ
-    self + 1
-  end unless method_defined? :succ
+  end unless method_defined? :ord
 
   # Standard in ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/Fixnum.html]
   def pred
     self - 1
-  end unless method_defined? :succ
-  
+  end unless method_defined? :pred
+
   alias_method :magnitude, :abs unless method_defined? :magnitude
-  
-  make_block_optional :downto, :times, :upto, :test_on => 42, :arg => 42
-end
 
-class Numeric
-  make_block_optional :step, :test_on => 42, :arg => [100, 6]
+  make_block_optional :downto, :times, :upto, :test_on => 42, :arg => 42
 end