backports 1.7.1 → 1.8.0

data/lib/backports/1.8.7/dir.rb

@@ -0,0 +1,7 @@
+class Dir
+  Backports.make_block_optional self, :each, :test_on => Dir.new(".")
+  class << self
+    Backports.make_block_optional self, :foreach, :test_on => Dir, :arg => "."
+  end
+end
+  

data/lib/backports/{enumerable.rb → 1.8.7/enumerable.rb}

@@ -1,18 +1,9 @@
+require 'enumerator'
 module Enumerable
-  # Standard in rails... See official documentation[http://api.rubyonrails.org/classes/Enumerable.html]
-  # Modified from rails 2.3 to not rely on size
-  def sum(identity = 0, &block)
-    if block_given?
-      map(&block).sum(identity)
-    else
-      inject { |sum, element| sum + element } || identity
-    end
-  end unless method_defined? :sum
-
   # Standard in Ruby 1.8.7+. See official documentation[http://ruby-doc.org/core-1.9/classes/Enumerable.html]
-  def count(item = Undefined)
+  def count(item = Backports::Undefined)
     seq = 0
-    if item != Undefined
+    if item != Backports::Undefined
       each { |o| seq += 1 if item == o }
     elsif block_given?
       each { |o| seq += 1 if yield(o) }
@@ -26,7 +17,7 @@ module Enumerable
   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)
+    n = Backports.coerce_to(n, Fixnum, :to_int)
     if n >= 1
       cache = []
       each do |elem|
@@ -37,11 +28,14 @@ module Enumerable
     end
   end unless method_defined? :cycle
   
-  make_block_optional :detect, :find, :find_all, :select, :sort_by, :partition, :reject, :test_on => 1..2
+  # Standard in Ruby 1.8.7+. See official documentation[http://ruby-doc.org/core-1.9/classes/Enumerable.html]
+  Backports.make_block_optional self, :each_cons, :each_slice, :test_on => 1..2, :arg => 1
+
+  Backports.make_block_optional self, :detect, :find, :find_all, :select, :sort_by, :partition, :reject, :test_on => 1..2
   
   # Standard in Ruby 1.8.7+. See official documentation[http://ruby-doc.org/core-1.9/classes/Enumerable.html]
   def drop(n)
-    n = Type.coerce_to(n, Fixnum, :to_int)
+    n = Backports.coerce_to(n, Fixnum, :to_int)
     raise ArgumentError, "attempt to drop negative size" if n < 0
     ary = to_a
     return [] if n > ary.size
@@ -59,9 +53,6 @@ module Enumerable
     ary
   end unless method_defined? :drop_while
   
-  # 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.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)
@@ -70,19 +61,12 @@ module Enumerable
       each(*args) { |o| yield(o, idx); idx += 1 }
       self
     end
-    alias_method_chain :each_with_index, :optional_args_and_block
+    Backports.alias_method_chain self, :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]
-  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.8.7+. See official documentation[http://ruby-doc.org/core-1.9/classes/Enumerable.html]
-  def find_index(obj = Undefined)
-    if obj != Undefined
+  def find_index(obj = Backports::Undefined)
+    if obj != Backports::Undefined
       each_with_index do |element, i|
         return i if element == obj
       end
@@ -97,8 +81,8 @@ module Enumerable
   end unless method_defined? :find_index
   
   # 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
+  def first(n = Backports::Undefined)
+    return take(n) unless n == Backports::Undefined
     each{|obj| return obj}
     nil
   end unless method_defined? :first
@@ -106,7 +90,7 @@ module Enumerable
   # 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|
+    {}.tap do |result|
       each do |o|
         result.fetch(yield(o)){|key| result[key] = []} << o
       end
@@ -120,7 +104,7 @@ module Enumerable
       method = args.pop
       inject_without_symbol(*args) {|memo, obj| memo.send(method, obj)}
     end
-    alias_method_chain :inject, :symbol
+    Backports.alias_method_chain self, :inject, :symbol
   end
   
   MOST_EXTREME_OBJECT_EVER = Object.new # :nodoc:
@@ -156,8 +140,8 @@ module Enumerable
         min = max = object
         first_time = false
       else
-        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
+        min = object if Backports.coerce_to_comparison(min, object, yield(min, object)) > 0
+        max = object if Backports.coerce_to_comparison(max, object, yield(max, object)) < 0
       end
     end
     [min, max]
@@ -214,9 +198,9 @@ module Enumerable
   
   # 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)
+    n = Backports.coerce_to(n, Fixnum, :to_int)
     raise ArgumentError, "attempt to take negative size: #{n}" if n < 0
-    returning([]) do |array|
+    [].tap do |array|
       each do |elem|
         array << elem
         break if array.size >= n
@@ -239,7 +223,7 @@ module Enumerable
       return to_a_without_optional_arguments if args.empty?
       to_enum(:each, *args).to_a
     end
-    alias_method_chain :to_a, :optional_arguments
+    Backports.alias_method_chain self, :to_a, :optional_arguments
   end
   
   # alias_method gives a warning, so instead copy-paste:
@@ -248,7 +232,7 @@ module Enumerable
       return entries_without_optional_arguments if args.empty?
       to_enum(:each, *args).entries
     end
-    alias_method_chain :entries, :optional_arguments
+    Backports.alias_method_chain self, :entries, :optional_arguments
   end
   
 end

data/lib/backports/1.8.7/enumerator.rb

@@ -0,0 +1,19 @@
+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
+
+    def rewind
+      @object.rewind if @object.respond_to? :rewind
+      require 'generator'
+      @generator ||= Generator.new(self)
+      @generator.rewind
+      self
+    end unless method_defined? :rewind
+  end
+end

data/lib/backports/1.8.7/env.rb

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

data/lib/backports/1.8.7/fixnum.rb

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

data/lib/backports/1.8.7/float.rb

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

data/lib/backports/1.8.7/hash.rb

@@ -0,0 +1,23 @@
+class Hash
+  # 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 [](*args)
+      return original_constructor(*args) unless args.length == 1 && args.first.is_a?(Array)
+      {}.tap do |h|
+        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)
+  end
+
+  Backports.make_block_optional self, :delete_if, :each, :each_key, :each_pair, :each_value, :reject, :reject!, :select, :test_on => {:hello => "world!"}
+
+  # 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
+end

data/lib/backports/1.8.7/integer.rb

@@ -0,0 +1,23 @@
+class Integer
+  Backports.make_block_optional self, :downto, :times, :upto, :test_on => 42, :arg => 42
+
+  # Standard in ruby 1.8.7+. See official documentation[http://ruby-doc.org/core-1.9/classes/Fixnum.html]
+  def even?
+    self[0].zero?
+  end unless method_defined? :even?
+
+  # Standard in ruby 1.8.7+. See official documentation[http://ruby-doc.org/core-1.9/classes/Fixnum.html]
+  def odd?
+    !even?
+  end unless method_defined? :odd?
+
+  # Standard in ruby 1.8.7+. See official documentation[http://ruby-doc.org/core-1.9/classes/Fixnum.html]
+  def ord
+    self
+  end unless method_defined? :ord
+
+  # Standard in ruby 1.8.7+. See official documentation[http://ruby-doc.org/core-1.9/classes/Fixnum.html]
+  def pred
+    self - 1
+  end unless method_defined? :pred
+end

data/lib/backports/{io.rb → 1.8.7/io.rb}

@@ -1,22 +1,22 @@
-if RUBY_VERSION < '1.8.7'
-  class IO
-    make_block_optional :each, :each_line, :each_byte
+class IO
+  if RUBY_VERSION < '1.8.7'
+    Backports.make_block_optional self, :each, :each_line, :each_byte
     class << self
-      make_block_optional :foreach
+      Backports.make_block_optional self, :foreach
     end
   end
 
-end
-
-class IO
+  # Standard in ruby 1.8.7+. See official documentation[http://ruby-doc.org/core-1.9/classes/IO.html]
   def bytes
     to_enum :each_byte
   end unless method_defined? :bytes
   
+  # Standard in ruby 1.8.7+. See official documentation[http://ruby-doc.org/core-1.9/classes/IO.html]
   def chars
     to_enum :each_char
   end unless method_defined? :chars
   
+  # Standard in ruby 1.8.7+. See official documentation[http://ruby-doc.org/core-1.9/classes/IO.html]
   def each_char
     return to_enum(:each_char) unless block_given?
     if $KCODE == "UTF-8"
@@ -47,6 +47,7 @@ class IO
   alias_method :getbyte, :getc  unless method_defined? :getbyte
   alias_method :readbyte, :readchar unless method_defined? :readchar
   
+  # Standard in ruby 1.8.7+. See official documentation[http://ruby-doc.org/core-1.9/classes/IO.html]
   def lines(*args)
     to_enum :each_line, *args
   end unless method_defined? :lines

data/lib/backports/1.8.7/kernel.rb

@@ -0,0 +1,39 @@
+module Kernel
+
+  def __method__
+    m = caller(1).first[/`(.*)'/,1]
+    m.to_sym if m
+  end unless (__method__ || true rescue false)
+
+  # Standard in ruby 1.8.7+. See official documentation[http://ruby-doc.org/core-1.9/classes/Object.html]
+  def define_singleton_method(*args, &block)
+    class << self
+      self
+    end.send(:define_method, *args, &block)
+  end unless method_defined? :define_singleton_method
+
+  # Standard in ruby 1.8.7+. See official documentation[http://ruby-doc.org/core-1.9/classes/Object.html]
+  def instance_exec(*arg, &block)
+    define_singleton_method(:"temporary method for instance_exec", &block)
+    send(:"temporary method for instance_exec", *arg)
+  end unless method_defined? :instance_exec
+
+  # Loop. Standard in ruby 1.8.7+. See official documentation[http://ruby-doc.org/core-1.9/classes/Object.html]
+  unless const_defined? :StopIteration
+    class StopIteration < IndexError; end
+
+    def loop_with_stop_iteration(&block)
+      loop_without_stop_iteration(&block)
+    rescue StopIteration
+      # ignore silently
+    end
+    Backports.alias_method_chain self, :loop, :stop_iteration
+  end
+
+  # Standard in ruby 1.8.7. See official documentation[http://ruby-doc.org/core-1.9/classes/Object.html]
+  def tap
+    yield self
+    self
+  end unless method_defined? :tap
+
+end

data/lib/backports/{method.rb → 1.8.7/method.rb}

@@ -3,45 +3,45 @@ unless Method.method_defined? :name
     attr_accessor :name, :receiver, :owner  
     
     def unbind_with_additional_info
-      returning unbind_without_additional_info do |unbound|
+      unbind_without_additional_info.tap do |unbound|
         unbound.name = name
         unbound.owner = owner
       end
     end
-    alias_method_chain :unbind, :additional_info
+    Backports.alias_method_chain self, :unbind, :additional_info
   end
 
   class UnboundMethod
     attr_accessor :name, :owner
     
     def bind_with_additional_info(to)
-      returning bind_without_additional_info(to) do |bound|
+      bind_without_additional_info(to).tap do |bound|
         bound.name = name
         bound.owner = owner
         bound.receiver = to
       end
     end
-    alias_method_chain :bind, :additional_info
+    Backports.alias_method_chain self, :bind, :additional_info
   end
 
   class Object
     def method_with_additional_info(name)
-      returning method_without_additional_info(name) do |bound|
+      method_without_additional_info(name).tap do |bound|
         bound.name = name.to_sym
         bound.receiver = self
         bound.owner = self.class.ancestors.find{|mod| mod.instance_methods(false).include? name.to_s}
       end
     end
-    alias_method_chain :method, :additional_info
+    Backports.alias_method_chain self, :method, :additional_info
   end
 
   class Module
     def instance_method_with_additional_info(name)
-      returning instance_method_without_additional_info(name) do |unbound|
+      instance_method_without_additional_info(name).tap do |unbound|
         unbound.name = name.to_sym
         unbound.owner = ancestors.find{|mod| mod.instance_methods(false).include? name.to_s}
       end
     end
-    alias_method_chain :instance_method, :additional_info
+    Backports.alias_method_chain self, :instance_method, :additional_info
   end
 end

data/lib/backports/1.8.7/module.rb

@@ -0,0 +1,7 @@
+class Module
+  # Can't use alias_method here because of jruby (see http://jira.codehaus.org/browse/JRUBY-2435 )
+  def module_exec(*arg, &block)
+    instance_exec(*arg, &block)
+  end unless method_defined? :module_exec
+  alias_method :class_exec, :module_exec unless method_defined? :class_exec
+end

data/lib/backports/1.8.7/numeric.rb

@@ -0,0 +1,3 @@
+class Numeric
+  Backports.make_block_optional self, :step, :test_on => 42, :arg => [100, 6]
+end

data/lib/backports/1.8.7/object_space.rb

@@ -0,0 +1,5 @@
+module ObjectSpace
+  class << self
+    Backports.make_block_optional self, :each_object, :test_on => ObjectSpace
+  end
+end

data/lib/backports/1.8.7/range.rb

@@ -0,0 +1,4 @@
+class Range
+  Backports.make_block_optional self, :each, :test_on => 69..666
+  Backports.make_block_optional self, :step, :test_on => 69..666, :arg => 42
+end

data/lib/backports/{regexp.rb → 1.8.7/regexp.rb}

@@ -1,11 +1,12 @@
 class Regexp
+  # Standard in Ruby 1.8.7+. See official documentation[http://www.ruby-doc.org/core-1.8.7/classes/Regexp.html]
   class << self
     unless (union(%w(a b)) rescue false)
       def union_with_array_argument(*arg)
         return union_without_array_argument(*arg) unless arg.size == 1
         union_without_array_argument(*arg.first)
       end
-      alias_method_chain :union, :array_argument
+      Backports.alias_method_chain self, :union, :array_argument
     end
   end
 end

data/lib/backports/1.8.7/string.rb

@@ -0,0 +1,90 @@
+class String
+  # Standard in Ruby 1.8.7+. See official documentation[http://ruby-doc.org/core-1.9/classes/String.html]
+  alias_method :bytesize, :length unless method_defined? :bytesize
+
+  # Standard in Ruby 1.8.7+. See official documentation[http://ruby-doc.org/core-1.9/classes/String.html]
+  def chr
+    chars.first
+  end unless method_defined? :chr
+
+  Backports.make_block_optional self, :each_byte, :each, :each_line, :test_on => "abc"
+  
+  # gsub: Left alone because of $~, $1, etc... which needs to be "pushed" up one level
+  # It's possible to do so, but gsub is used everywhere so i felt
+  # the performance hit was too big compared to the dubious gain.
+  
+  # Standard in Ruby 1.8.7+. See official documentation[http://ruby-doc.org/core-1.9/classes/String.html]
+  unless method_defined? :each_char
+    def each_char(&block)
+      return to_enum(:each_char) unless block_given?
+      scan(/./, &block)
+    end 
+
+    alias_method :chars, :each_char unless method_defined? :chars
+  end
+  
+  # Standard in Ruby 1.8.7+. See official documentation[http://ruby-doc.org/core-1.9/classes/String.html]
+  def end_with?(*suffixes)
+    suffixes.each do |suffix|
+      next unless suffix.respond_to? :to_str
+      suffix = suffix.to_str
+      return true if self[-suffix.length, suffix.length] == suffix
+    end
+    false
+  end unless method_defined? :end_with?
+  
+  # Standard in Ruby 1.8.7+. See official documentation[http://ruby-doc.org/core-1.9/classes/String.html]
+  unless ("check partition".partition(" ") rescue false)
+    def partition_with_new_meaning(pattern = Backports::Undefined, &block)
+      return partition_without_new_meaning(&block) if pattern == Backports::Undefined
+      pattern = Backports.coerce_to(pattern, String, :to_str) unless pattern.is_a? Regexp      
+      i = index(pattern)
+      return [self, "", ""] unless i
+      if pattern.is_a? Regexp
+        match = Regexp.last_match
+        [match.pre_match, match[0], match.post_match]
+      else
+        last = i+pattern.length
+        [self[0...i], self[i...last], self[last...length]]
+      end
+    end
+    Backports.alias_method_chain self, :partition, :new_meaning
+  end
+
+  # Standard in Ruby 1.8.7+. See official documentation[http://ruby-doc.org/core-1.9/classes/String.html]
+  def rpartition(pattern)
+    pattern = Backports.coerce_to(pattern, String, :to_str) unless pattern.is_a? Regexp
+    i = rindex(pattern)
+    return ["", "", self] unless i
+    
+    if pattern.is_a? Regexp
+      match = Regexp.last_match
+      [match.pre_match, match[0], match.post_match]
+    else
+      last = i+pattern.length
+      [self[0...i], self[i...last], self[last...length]]
+    end
+  end unless method_defined? :rpartition
+ 
+  # Standard in Ruby 1.8.7+. See official documentation[http://ruby-doc.org/core-1.9/classes/String.html]
+  def start_with?(*prefixes)
+    prefixes.each do |prefix|
+      next unless prefix.respond_to? :to_str
+      prefix = prefix.to_str
+      return true if self[0, prefix.length] == prefix
+    end
+    false
+  end unless method_defined? :start_with?
+  
+  # Standard in Ruby 1.8.7+. See official documentation[http://ruby-doc.org/core-1.9/classes/String.html]
+  unless ("abc".upto("def", true) rescue false)
+    def upto_with_exclusive(to, excl=false, &block)
+      return upto_without_exclusive(to, &block) if block_given? && !excl
+      enum = Range.new(self, to, excl).to_enum
+      return enum unless block_given?
+      enum.each(&block)
+      self
+    end
+    Backports.alias_method_chain self, :upto, :exclusive
+  end
+end