marcandre-backports 1.5.0 → 1.6.0

data/CHANGELOG.rdoc

@@ -1,11 +1,88 @@
 = Packable --- History
 
+== Version 1.6 - April 29, 2009
+
+Completed backport to 1.8.7.
+
+* Array
+  * <tt>extract_options!</tt>
+
+* Binding
+  * +eval+
+
+* Dir
+  * +each+, +foreach+
+
+* Enumerator
+  * +new+
+  * +with_object+
+  * +next+, +rewind+
+
+* Hash
+  * Optional block for <tt>delete_if, each, each_key, each_pair, each_value, reject!, select</tt> (and ENV)
+
+* Integer
+  * moved stuff out of Fixnum
+  * Optional block for +downto+, +times+, +upto+
+
+* IO
+  * Optional block for +each+, +each_line+, +each_byte+, +foreach+ (and ARGF)
+
+* Kernel
+  * +loop+, +StopIteration+
+  * +__method__+, +__callee__+
+
+* Method
+  * +name+, +owner+, +receiver+
+
+* Module
+  * +class_exec+, +module_exec+
+
+* Numeric
+  * +step+
+
+* Object
+  * +define_singleton_method+
+  * +instance_exec+
+
+* ObjectSpace
+  * +each_object+
+
+* Range
+  * Optional block for +each+, +step+
+
+* Regexp
+  * +union+
+
+* String
+  * +try_convert+
+  * <tt>ascii_only?</tt>
+  * +bytesize+
+  * +chr+
+  * +clear+
+  * +codepoints+, +each_codepoint+
+  * +stringify_keys+, +stringify_keys!+
+  * +each+, +each_line+, +each_byte+
+  * +gsub+
+  * +upto+
+
+* Struct
+  * +each+, +each_pair+
+
+* Symbol
+  * <tt><=></tt>, +casecmp+
+  * +capitalize+, +downcase+, +next+, +succ+, +swapcase+, +upcase+
+  * <tt>=~, [], empty?, length, match, size</tt>
+
+* UnboundMethod
+  * +name+, +owner+
+
 == Version 1.5 - April 24, 2009
 
 * Array (completed)
   * +combination+
   * +try_convert+
-  * Optional block for collect!, :map!, :each, :each_index, :reject, :reject!, :delete_if
+  * Optional block for <tt>collect!, :map!, :each, :each_index, :reject, :reject!, :delete_if</tt>
   * +pop+, +shift+
   * +product+
 

data/README.rdoc

@@ -30,45 +30,95 @@ Compatible with Ruby 1.8 & 1.9.
 
 = List of backports
 
+== Ruby 1.8.7
+
+Complete Ruby 1.8.7 backporting. Refer to the official list of changes[http://svn.ruby-lang.org/repos/ruby/tags/v1_8_7/NEWS]. All builtin classes are compatible with Ruby 1.8.7: 
+* Array
+* Binding
+* Dir
+* Enumerable
+* Enumerator
+* Fixnum
+* Hash
+* Integer
+* IO (& ARGF)
+* Method
+* Numeric
+* Object
+* ObjectSpace
+* Range
+* Regexp
 * Symbol
-  * +to_proc+ (e.g. <tt>foo.map(&:bar)</tt> )
+* UnboundMethod
+
+Only exceptions:
+* GC.stress=
+* Process.exec
+* recursive data handling (Array and Hash)
+
+As in Ruby 1.8.7+, there is no need to <tt>require 'enumerator'</tt> in older Ruby, and +Enumerator+ can be accessed directly (instead of <tt>Enumerable::Enumerator</tt>)
+
+== Ruby 1.9
+
+Additionally, the following Ruby 1.9 have been backported:
+
+* Array
+  * +sample+
+
+* Enumerable
+  * +each_with_object+
+  * +reverse_each+
+
+* Enumerator
+  * +new+ (with block)
+
+* Hash
+  * <tt>Hash[[[:foo, :bar],[:hello, "world"]]] ==> {:foo => :bar, :hello => "world"}</tt> (see _note_)
+  * <tt>default_proc=</tt>
+
 * Kernel
   * +require_relative+
+
+* Object
+  * +define_singleton_method+
+
+* Proc
+  * +yield+
+
+* String
+  * +try_convert+
+  * <tt>ascii_only?</tt>
+  * +chr+
+  * +clear+
+  * +codepoints+, +each_codepoint+
+
+_note_: This usage of <tt>Hash::[]</tt> is not yet documented[http://redmine.ruby-lang.org/issues/show/1385].
+
+== Rails
+
+Some generic methods from Rails methods have been copied:
+
+* Enumerable
+  * +sum+
+
+* Hash
+  * +symbolize_keys+, <tt>symbolize_keys!</tt>
+  * +reverse_merge+, <tt>reverse_merge!</tt>
+
 * Module
   * +alias_method_chain+
+
 * Object
-  * +tap+, +returning+
   * +try+
+  * +returning+
+
 * String
-  * +each_char+, +chars+
-  * <tt>start_with?</tt>, <tt>end_with?</tt>
   * +camelize+, +underscore+
   * +dasherize+, +demodulize+
   * +constantize+
-  * +partition+, +rpartition+
-* Hash
-  * +symbolize_keys+, <tt>symbolize_keys!</tt>
-  * +reverse_merge+, <tt>reverse_merge!</tt>
-  * <tt>Hash[[[:foo, :bar],[:hello, "world"]]] ==> {:foo => :bar, :hello => "world"}</tt> (see _note_)
-  * +key+
-  * <tt>default_proc=</tt>
-* Enumerable
-  * +sum+
-  * complete Ruby 1.8.7 backport
-* Array
-  * complete Ruby 1.8.7 backport
-* Fixnum
-  * complete Ruby 1.8.7 backport
-* Proc
-  * +yield+
-
-Finally, there is no need to <tt>require 'enumerator'</tt> in older Ruby, and +Enumerator+ can be accessed directly (instead of <tt>Enumerable::Enumerator</tt>)
-
-_note_: This usage of <tt>Hash::[]</tt> is not yet documented[http://redmine.ruby-lang.org/issues/show/1385].
 
 = License
 
 +backports+ is released under the terms of the MIT License, see the included LICENSE file.
-The code for backports was copied from rails when available.
 
 Author::                 Marc-André Lafortune

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 1
-:minor: 5
+:minor: 6
 :patch: 0

data/lib/backports/array.rb

@@ -7,19 +7,7 @@ class Array
   end
 
   # Standard in Ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/Array.html]
-  unless ([42].map! rescue false)
-    # Make block optional for...
-    [:collect!, :map!, :each, :each_index, :reverse_each, :reject, :reject!, :delete_if].each do |selector|
-      alias_method_chain(selector, :optional_block) do |aliased_target, punctuation|
-        module_eval <<-end_eval
-          def #{aliased_target}_with_optional_block#{punctuation}(*args, &block)
-            return to_enum(:#{aliased_target}_without_optional_block#{punctuation}, *args) unless block_given?
-            #{aliased_target}_without_optional_block#{punctuation}(*args, &block)
-          end
-        end_eval
-      end
-    end
-  end
+  make_block_optional :collect!, :map!, :each, :each_index, :reverse_each, :reject, :reject!, :delete_if, :test_on => [42]
   
   # Standard in Ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/Array.html]
   def combination(num)
@@ -47,6 +35,8 @@ class Array
     nb.to_i.times{each(&block)}
   end unless method_defined? :cycle
   
+  # extract_options! in backports.rb
+  
   # flatten & flatten!, standard in ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/Array.html]
   unless ([[]].flatten(1) rescue false)
 
@@ -72,8 +62,7 @@ class Array
     alias_method_chain :flatten, :optional_argument
     alias_method_chain :flatten!, :optional_argument
 
-    # Helper to recurse through flattening since the method
-    # is not allowed to recurse itself. Detects recursive structures.
+    # Helper to recurse through flattening
     # Adapted from rubinius'; recursion guards are not needed because level is finite
     def recursively_flatten_finite(array, out, level)
       ret = nil
@@ -116,19 +105,19 @@ class Array
   end
   
   def product(*arg)
-    arg.unshift(self)
-    arg._partial_cartesian_product(arg.size-1, Array.new(arg.size), [])
+    arrays = [self, *arg].reverse
+    first_enum = Enumerator.new{|yielder| yielder.yield [] }
+    arrays.inject(first_enum) do |enum, array|
+      Enumerator.new do |yielder|
+        array.each do |obj|
+          enum.each do |partial_product|
+            yielder.yield [obj] + partial_product
+          end
+        end
+      end
+    end.to_a
   end unless method_defined? :product
-  
-  def _partial_cartesian_product(combi, iterate_index, result)
-    action = iterate_index.zero? ? Proc.new(result << combi.dup) : Proc.new(_sub(combi, iterate_index-1, &block))
-    self[iterate_index].each do |obj|
-      combi[iterate_index] = obj
-      action.call
-    end
-  end
-  private :_partial_cartesian_product
-  
+
   # rindex
   unless ([1].rindex{true} rescue false)
     def rindex_with_block(*arg)

data/lib/backports/binding.rb

@@ -0,0 +1,6 @@
+class Binding
+  # Standard in ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/Symbol.html]
+  def eval(expr, *arg)
+    Kernel.eval(expr, self, *arg)
+  end unless method_defined? :eval
+end

data/lib/backports/dir.rb

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

data/lib/backports/enumerable.rb

@@ -29,15 +29,7 @@ module Enumerable
     to_a.cycle(*arg, &block)
   end unless method_defined? :cycle
   
-  # Standard in ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/Enumerable.html]
-  unless ([].detect rescue false)
-    def detect_with_optional_block(ifnone = nil, &block)
-      return to_enum(:detect, ifnone) unless block_given?
-      detect_without_optional_block(ifnone, &block)
-    end
-    alias_method_chain :detect, :optional_block
-    alias_method :find, :detect
-  end
+  make_block_optional :detect, :find, :test_on => [42]
   
   # Standard in ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/Enumerable.html]
   def drop(n)
@@ -56,24 +48,7 @@ module Enumerable
   end unless method_defined? :drop_while
   
   # Standard in ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/Enumerable.html]
-  unless ((1..2).each_cons(1) rescue false)
-    def each_cons_with_optional_block(len, &block)
-      raise ArgumentError, "invalid size" if len <= 0
-      return to_enum(:each_cons, len) unless block_given?
-      each_cons_without_optional_block(len, &block)
-    end
-    alias_method_chain :each_cons, :optional_block
-  end
-
-  # Standard in ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/Enumerable.html]
-  unless ((1..2).each_slice(1) rescue false)
-    def each_slice_with_optional_block(len, &block)
-      raise ArgumentError, "invalid slice size" if len <= 0
-      return to_enum(:each_slice, len) unless block_given?
-      each_slice_without_optional_block(len, &block)
-    end
-    alias_method_chain :each_slice, :optional_block
-  end
+  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]
   if instance_method(:each_with_index).arity.zero?
@@ -93,6 +68,7 @@ module Enumerable
 
   # 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
       each_with_index do |element, i|
@@ -104,7 +80,7 @@ module Enumerable
       end
       each_with_index{|o,i| return i if yield o}
     else
-      raise ArgumentError, "Wrong number of arguments (#{args.size} for 1)"
+      return to_enum(:find_index)
     end
     nil
   end unless method_defined? :find_index
@@ -239,7 +215,3 @@ module Enumerable
   end
   
 end
-
-class Enumerator
-  alias_method :with_object, :each_with_object unless method_defined? :with_object
-end

data/lib/backports/enumerator.rb

@@ -0,0 +1,41 @@
+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
+    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)
+      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
+    alias_method_chain :initialize, :optional_block
+  end
+end

data/lib/backports/fixnum.rb

@@ -4,30 +4,8 @@ class Fixnum
     (self / n).round
   end unless method_defined? :div
 
-  # Standard in ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/Fixnum.html]
-  def even?
-    self & 1 == 0
-  end unless method_defined? :even?
-
   # Standard in ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/Fixnum.html]
   def fdiv(n)
     to_f / n
   end unless method_defined? :fdiv
-
-  # Standard in ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/Fixnum.html]
-  def odd?
-    self & 1 == 1
-  end unless method_defined? :odd?
-
-  # 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
-  
-  alias_method :magnitude, :abs unless method_defined? :magnitude
-  
-  
-  
-  
-  
 end

data/lib/backports/hash.rb

@@ -16,16 +16,13 @@ class Hash
     end unless method_defined? :to_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] }]
-  end unless method_defined? :symbolize_keys
-
-  # Standard in rails. See official documentation[http://api.rubyonrails.org/classes/ActiveSupport/CoreExtensions/Hash/Keys.html]
-  def symbolize_keys!
-    self.replace(self.symbolize_keys)
-  end unless method_defined? :symbolize_keys!
+  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]
+  def default_proc=(proc)
+    replace(Hash.new(&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]
   alias_method :key, :index unless method_defined? :key
   
@@ -39,8 +36,27 @@ class Hash
     replace(reverse_merge(other_hash))
   end
   
-  # 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))
-  end unless method_defined? :default_proc=
+  # 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] }]
+  end unless method_defined? :symbolize_keys
+
+  # Standard in rails. See official documentation[http://api.rubyonrails.org/classes/ActiveSupport/CoreExtensions/Hash/Keys.html]
+  def symbolize_keys!
+    self.replace(self.symbolize_keys)
+  end unless method_defined? :symbolize_keys!
+
+  # Standard in rails. See official documentation[http://api.rubyonrails.org/classes/ActiveSupport/CoreExtensions/Hash/Keys.html]
+  def stringify_keys
+    Hash[map{|key,value| [key.to_s, value] }]
+  end unless method_defined? :stringify_keys
+
+  # Standard in rails. See official documentation[http://api.rubyonrails.org/classes/ActiveSupport/CoreExtensions/Hash/Keys.html]
+  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

@@ -0,0 +1,34 @@
+class Integer
+  # Standard in ruby 1.9. 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.9. 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.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
+
+  # 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
+  
+  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]
+end

data/lib/backports/io.rb

@@ -0,0 +1,12 @@
+if RUBY_VERSION < '1.8.7'
+  class IO
+    make_block_optional :each, :each_line, :each_byte
+    class << self
+      make_block_optional :foreach
+    end
+  end
+
+  class << ARGF
+    make_block_optional :each, :each_line, :each_byte
+  end
+end

data/lib/backports/kernel.rb

@@ -0,0 +1,20 @@
+module Kernel
+  unless const_defined? :StopIteration
+    
+    class StopIteration < IndexError; end
+
+    def loop_with_stop_iteration(&block)
+      loop_without_stop_iteration(&block)
+    rescue StopIteration
+      # ignore silently
+    end
+    alias_method_chain :loop, :stop_iteration
+    
+  end
+  
+  def __callee__
+    caller(1).first[/`(.*)'/,1].try(:to_sym)
+  end unless (__callee__ || true rescue false)
+  
+  alias_method :__method__, :__callee__  unless (__method__ || true rescue false)
+end

data/lib/backports/method.rb

@@ -0,0 +1,47 @@
+unless Method.method_defined? :name
+  class Method
+    attr_accessor :name, :receiver, :owner  
+    
+    def unbind_with_additional_info
+      returning unbind_without_additional_info do |unbound|
+        unbound.name = name
+        unbound.owner = owner
+      end
+    end
+    alias_method_chain :unbind, :additional_info
+  end
+
+  class UnboundMethod
+    attr_accessor :name, :owner
+    
+    def bind_with_additional_info(to)
+      returning bind_without_additional_info(to) do |bound|
+        bound.name = name
+        bound.owner = owner
+        bound.receiver = to
+      end
+    end
+    alias_method_chain :bind, :additional_info
+  end
+
+  class Object
+    def method_with_additional_info(name)
+      returning method_without_additional_info(name) 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
+  end
+
+  class Module
+    def instance_method_with_additional_info(name)
+      returning instance_method_without_additional_info(name) 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
+  end
+end

data/lib/backports/module.rb

@@ -20,4 +20,28 @@ class Module
         private target
     end
   end unless method_defined? :alias_method_chain
+  
+  alias_method :module_exec, :instance_exec unless method_defined? :module_exec
+  alias_method :class_exec, :module_exec unless method_defined? :class_exec
+  
+  # Metaprogramming utility to make block optional.
+  # Tests first if block is already optional when given options
+  def make_block_optional(*methods)
+    options = methods.extract_options!
+    methods.each do |selector|
+      next unless method_defined? selector
+      unless options.empty?
+        test_on = options[:test_on] || self.new
+        next if (test_on.send(selector, *options.fetch(:arg, [])) rescue false)
+      end
+      alias_method_chain(selector, :optional_block) do |aliased_target, punctuation|
+        module_eval <<-end_eval
+          def #{aliased_target}_with_optional_block#{punctuation}(*args, &block)
+            return to_enum(:#{aliased_target}_without_optional_block#{punctuation}, *args) unless block_given?
+            #{aliased_target}_without_optional_block#{punctuation}(*args, &block)
+          end
+        end_eval
+      end
+    end
+  end
 end

data/lib/backports/object.rb

@@ -1,6 +1,7 @@
 require 'enumerator'
 
-class Object
+module Kernel # Did you know that object instance methods are defined in Kernel?
+  
   # Standard in rails. See official documentation[http://api.rubyonrails.org/classes/Object.html]
   def try(method_id, *args, &block)
     send(method_id, *args, &block) unless self.nil? #todo: check new def
@@ -19,4 +20,15 @@ class Object
   end unless method_defined? :returning
   
   Enumerator = Enumerable::Enumerator unless const_defined? :Enumerator # Standard in ruby 1.9
-end
+  
+  def define_singleton_method(symbol, &block)
+    class << self
+      self
+    end.send(:define_method, symbol, block)
+  end unless method_defined? :define_singleton_method
+  
+  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
+end

data/lib/backports/object_space.rb

@@ -0,0 +1,6 @@
+
+module ObjectSpace
+  module_eval do
+    make_block_optional :each_object, :test_on => ObjectSpace
+  end
+end

data/lib/backports/range.rb

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

data/lib/backports/regexp.rb

@@ -0,0 +1,11 @@
+class Regexp
+  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
+    end
+  end
+end

data/lib/backports/string.rb

@@ -1,13 +1,93 @@
 class String
+  class << self
+    # Standard in ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/String.html]
+    def try_convert(x)
+      return nil unless x.respond_do(:to_str)
+      x.to_str
+    end unless method_defined? :try_convert
+  end
+
+  def ascii_only?
+    !(self =~ /[^\x00-\x7f]/)
+  end unless method_defined? :ascii_only?
+  
+  alias_method :bytesize, :length unless method_defined? :bytesize
+
+  # Standard in rails. See official documentation[http://api.rubyonrails.org/classes/ActiveSupport/CoreExtensions/String/Inflections.html]
+  def camelize(first_letter = :upper) 
+    if first_letter == :upper
+      gsub(/\/(.?)/) { "::#{$1.upcase}" }.gsub(/(?:^|_)(.)/) { $1.upcase }
+    else
+      first.downcase + camelize[1..-1]
+    end
+  end unless method_defined? :camelize
+  
   # Standard in ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/String.html]
-  def start_with?(*prefixes)
-    prefixes.each do |prefix|
-      prefix = prefix.to_s
-      return true if self[0, prefix.length] == prefix
+  def chr
+    chars.first
+  end unless method_defined? :chr?
+
+
+  # Standard in ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/String.html]
+  def clear
+    self[0,length] = ""
+    self
+  end unless method_defined? :clear?
+
+  # Standard in ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/String.html]
+  def codepoints
+    return to_enum(:codepoints) unless block_given?
+    each_char.each do |s|
+      utf8 = s.each_byte.to_a
+      utf8[0] &= 0xff >> utf8.size # clear high bits (1 to 4, depending of number of bytes used)
+      yield utf8.inject{|result, b| (result << 6) + (b & 0x3f) }
     end
-    false
-  end unless method_defined? :start_with?
+  end unless method_defined? :codepoints
+  
+  # Standard in rails. See official documentation[http://api.rubyonrails.org/classes/ActiveSupport/CoreExtensions/String/Inflections.html]
+  def constantize(camel_cased_word)
+    names = camel_cased_word.split('::')
+    names.shift if names.empty? || names.first.empty?
+  
+    constant = Object
+    names.each do |name|
+      constant = constant.const_defined?(name) ? constant.const_get(name) : constant.const_missing(name)
+    end
+    constant
+  end unless method_defined? :constantize
+  
+  # Standard in rails. See official documentation[http://api.rubyonrails.org/classes/ActiveSupport/CoreExtensions/String/Inflections.html]
+  def dasherize(underscored_word)
+    underscored_word.gsub(/_/, '-')
+  end unless method_defined? :dasherize
+  
+  # Standard in rails. See official documentation[http://api.rubyonrails.org/classes/ActiveSupport/CoreExtensions/String/Inflections.html]
+  def demodulize(class_name_in_module)
+    class_name_in_module.to_s.gsub(/^.*::/, '')
+  end unless method_defined? :demodulize
+
+  make_block_optional :each_byte, :each, :each_line, :test_on => "abc"
+  
+  unless ("abc".gsub(/./) rescue false)
+    def gsub_with_optional_block(*arg, &block)
+      return to_enum(:gsub_with_optional_block, *arg) unless block_given? || arg.size > 1
+      gsub_without_optional_block(*arg, &block)
+    end
+    alias_method_chain :gsub, :optional_block
+  end
+  
+  # Standard in ruby 1.9. 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
   
+  alias_method :each_codepoint, :codepoints unless method_defined? :each_codepoint
+
   # Standard in ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/String.html]
   def end_with?(*suffixes)
     suffixes.each do |suffix|
@@ -22,17 +102,6 @@ class String
     self[i]
   end unless method_defined? :getbyte
   
-  # Standard in ruby 1.9. 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 
-  end
-  
-  alias_method :chars, :each_char unless method_defined? :chars
-  
-  
   # Standard in ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/String.html]
   unless ("check partition".partition(" ") rescue false)
     def partition_with_new_meaning(*args, &block)
@@ -68,14 +137,14 @@ class String
   end unless method_defined? :rpartition
 
   
-  # Standard in rails. See official documentation[http://api.rubyonrails.org/classes/ActiveSupport/CoreExtensions/String/Inflections.html]
-  def camelize(first_letter = :upper) 
-    if first_letter == :upper
-      gsub(/\/(.?)/) { "::#{$1.upcase}" }.gsub(/(?:^|_)(.)/) { $1.upcase }
-    else
-      first.downcase + camelize[1..-1]
+  # Standard in ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/String.html]
+  def start_with?(*prefixes)
+    prefixes.each do |prefix|
+      prefix = prefix.to_s
+      return true if self[0, prefix.length] == prefix
     end
-  end unless method_defined? :camelize
+    false
+  end unless method_defined? :start_with?
   
   # Standard in rails. See official documentation[http://api.rubyonrails.org/classes/ActiveSupport/CoreExtensions/String/Inflections.html]
   def underscore(camel_cased_word)
@@ -86,26 +155,13 @@ class String
       downcase
   end unless method_defined? :underscore
   
-  # Standard in rails. See official documentation[http://api.rubyonrails.org/classes/ActiveSupport/CoreExtensions/String/Inflections.html]
-  def constantize(camel_cased_word)
-    names = camel_cased_word.split('::')
-    names.shift if names.empty? || names.first.empty?
-  
-    constant = Object
-    names.each do |name|
-      constant = constant.const_defined?(name) ? constant.const_get(name) : constant.const_missing(name)
+  unless ("abc".upto("def", true) rescue false)
+    def upto_with_exclusive(to, excl=false, &block)
+      enum = Range.new(self, to, excl).to_enum
+      return enum unless block_given?
+      enum.each(&block)
+      self
     end
-    constant
-  end unless method_defined? :constantize
-  
-  # Standard in rails. See official documentation[http://api.rubyonrails.org/classes/ActiveSupport/CoreExtensions/String/Inflections.html]
-  def dasherize(underscored_word)
-    underscored_word.gsub(/_/, '-')
-  end unless method_defined? :dasherize
-  
-  # Standard in rails. See official documentation[http://api.rubyonrails.org/classes/ActiveSupport/CoreExtensions/String/Inflections.html]
-  def demodulize(class_name_in_module)
-    class_name_in_module.to_s.gsub(/^.*::/, '')
-  end unless method_defined? :demodulize
-  
+    alias_method_chain :upto, :exclusive
+  end
 end

data/lib/backports/struct.rb

@@ -0,0 +1,3 @@
+class Struct
+  make_block_optional :each, :each_pair, :test_on => Struct.new(:foo, :bar)
+end

data/lib/backports/symbol.rb

@@ -3,4 +3,18 @@ class Symbol
   def to_proc
     Proc.new { |*args| args.shift.__send__(self, *args) }
   end unless :to_proc.respond_to?(:to_proc)
+
+  include Enumerable
+  
+  [ [%w(<=> casecmp), {:before => "return nil unless args.first.is_a? Symbol" }],
+    [%w(capitalize downcase next succ swapcase upcase), {:after => ".to_s"}],
+    [%w(=~ [] empty? length match size), {}]
+  ].each { |methods, options| methods.each do |method|
+    module_eval <<-end_eval
+      def #{method}(*args)
+        #{options[:before]}
+        to_s.#{method}(*args)#{options[:after]}
+      end unless method_defined? :#{method}
+    end_eval
+  end }
 end

data/lib/backports.rb

@@ -10,6 +10,13 @@ module Kernel
   end unless method_defined? :require_relative
 end
 
-%w(object module array enumerable string symbol fixnum hash proc).each do |lib|
+class Array
+  # Standard in rails, and we use it in module.
+  def extract_options!
+    last.is_a?(::Hash) ? pop : {}
+  end unless method_defined? :extract_options!
+end
+
+%w(object module kernel object_space array enumerable enumerator string symbol integer fixnum hash proc binding dir io method regexp struct).each do |lib|
   require_relative "backports/#{lib}"
 end

data/test/binding_test.rb

@@ -0,0 +1,20 @@
+require 'test_helper'
+
+class BindingTest < Test::Unit::TestCase
+  class Demo
+    def initialize(n)
+      @secret = n
+    end
+    def get_binding
+      return binding()
+    end
+  end
+
+  context "Binding" do
+    context "#eval" do
+      should "conform to doc" do
+        assert_equal 99, Demo.new(99).get_binding.eval("@secret")
+      end
+    end
+  end
+end

data/test/enumerable_test.rb

@@ -83,6 +83,16 @@ class EnumerableTest < Test::Unit::TestCase
       end
     end
 
+    context "#find" do
+      should "not require a block" do
+        assert_equal 3, (1..10).find.each {|item| item > 2 }
+      end
+
+      should "work as expected" do
+        assert_equal 3, (1..10).find {|item| item > 2 }
+      end
+    end
+
     context "#find_index" do
       should "conform to doc" do
         assert_equal 3, %w{ant bat cat dog}.find_index {|item| item =~ /g/ }

data/test/enumerator_test.rb

@@ -0,0 +1,29 @@
+require 'test_helper'
+
+
+class EnumeratorTest < Test::Unit::TestCase
+  context "Enumerator" do
+    context "#with_object" do
+      should "conform to doc" do
+        animals = %w(cat dog wombat).to_enum 
+        hash = animals.with_object({}).each do |item, memo| 
+          memo[item] = item.upcase.reverse 
+        end 
+        assert_equal({"cat"=>"TAC", "dog"=>"GOD", "wombat"=>"TABMOW"}, hash)
+      end
+    end
+    
+    context "#new" do
+      should "should accept block" do
+        enum = Enumerator.new do |yielder|
+          yielder.yield "This cool new syntax is sponsored by"
+          yielder.yield yielder.class
+        end
+        assert enum.is_a?(Enumerator)
+        2.times do
+          assert_equal ["This cool new syntax is sponsored by", Enumerator::Yielder], enum.to_a
+        end
+      end
+    end
+  end
+end

data/test/kernel_test.rb

@@ -0,0 +1,30 @@
+require 'test_helper'
+
+$outside = __callee__
+def fred 
+  "I'm in #{__callee__.inspect}" 
+end 
+
+class KernelTest < Test::Unit::TestCase
+  context "Kernel" do
+    context ".loop" do
+      should "conform to doc" do
+        enum1 = [1, 2, 3].to_enum 
+        enum2 = [10, 20].to_enum 
+        r = []
+        loop do 
+          r << enum1.next + enum2.next 
+        end
+        assert_equal [11,22], r
+      end
+    end
+    
+
+    context ".__callee__" do
+      should "conform to doc" do
+        assert_equal "I'm in :fred", fred
+        assert_equal nil, $outside
+      end
+    end
+  end
+end

data/test/method_test.rb

@@ -0,0 +1,73 @@
+require 'test_helper'
+
+class ArrayTest < Test::Unit::TestCase
+  
+  context "Method" do
+    setup do
+      @cat = "cat"
+      @bound = @cat.method(:upcase) 
+    end
+    
+    context "#name" do
+      should "conform to doc" do
+        assert_equal :upcase, @bound.name
+      end
+    end
+  
+    context "#owner" do
+      should "conform to doc" do
+        assert_equal String, @bound.owner
+      end
+    end
+  
+    context "#receiver" do
+      should "conform to doc" do
+        assert @cat === @bound.receiver
+      end
+    end
+  
+    context "Unbound" do
+      setup do
+        @unbound = @bound.unbind
+      end
+      
+      context "#name" do
+        should "conform to doc" do
+          assert_equal :upcase, @unbound.name
+        end
+      end
+  
+      context "#owner" do
+        should "conform to doc" do
+          assert_equal String, @unbound.owner
+        end
+      end
+      
+      context "bound again" do
+        setup do
+          @dog = "dog"
+          @bound_again = @unbound.bind(@dog)
+        end
+        
+        context "#name" do
+          should "conform to doc" do
+            assert_equal :upcase, @bound_again.name
+          end
+        end
+  
+        context "#owner" do
+          should "conform to doc" do
+            assert_equal String, @bound_again.owner
+          end
+        end
+  
+        context "#receiver" do
+          should "conform to doc" do
+            assert @dog === @bound_again.receiver
+          end
+        end
+  
+      end
+    end
+  end
+end

data/test/module_test.rb

@@ -0,0 +1,20 @@
+require 'test_helper'
+
+class Thing 
+end 
+
+class ModuleTest < Test::Unit::TestCase
+  context "Module" do
+    context "#module_exec" do
+      should "conform to doc" do
+        name = :new_instance_variable 
+        Thing.module_exec(name) do |iv_name| 
+          attr_accessor iv_name 
+        end 
+        t = Thing.new 
+        t.new_instance_variable = "wibble" 
+        assert_equal "wibble", t.new_instance_variable
+      end
+    end
+  end
+end

data/test/object_test.rb

@@ -0,0 +1,35 @@
+require 'test_helper'
+
+class ObjectTest < Test::Unit::TestCase
+  class KlassWithSecret
+    def initialize
+      @secret = 99
+    end
+  end
+  context "Object" do
+    context "#instance_exec" do
+      should "conform to doc" do
+        k = KlassWithSecret.new
+        assert_equal 104, k.instance_exec(5) {|x| @secret+x }
+      end
+    end
+    
+    context "#define_singleton_method" do
+      should "conform to doc" do
+        a = "cat" 
+        a.define_singleton_method(:speak) do 
+          "miaow"
+        end 
+        assert_equal "miaow", a.speak 
+        
+        KlassWithSecret.class_eval do 
+          define_method(:one) { "instance method" } 
+          define_singleton_method(:two) { "class method" } 
+        end 
+        t = KlassWithSecret.new 
+        assert_equal "instance method", t.one 
+        assert_equal "class method", KlassWithSecret.two
+      end
+    end
+  end
+end

data/test/regexp_test.rb

@@ -0,0 +1,14 @@
+require 'test_helper'
+
+class RegexpTest < Test::Unit::TestCase
+  context "Regexp" do
+    context ".union" do
+      should "conform to doc" do
+        assert_equal /cat/            , Regexp.union("cat")
+        assert_equal /cat|dog/        , Regexp.union("cat", "dog") 
+        assert_equal /cat|dog/        , Regexp.union(%w{ cat dog })
+        assert_equal /cat|(?i-mx:dog)/, Regexp.union("cat", /dog/i)
+      end
+    end
+  end
+end

data/test/string_test.rb

@@ -4,6 +4,14 @@ require 'test_helper'
 
 class StringTest < Test::Unit::TestCase
   context "String" do
+    context "#ascii_only?" do
+      should "conform to doc" do
+        assert_equal true, "dog".ascii_only?
+        assert_equal false, "δog".ascii_only?
+        assert_equal true, "\x00 to \x7f".ascii_only?
+      end
+    end
+
     context "#chars" do
       should "conform to doc" do
         assert_equal ["d", "o", "g"], "dog".chars.to_a
@@ -13,6 +21,23 @@ class StringTest < Test::Unit::TestCase
         assert_equal ["δ", "o", "g"], result
       end
     end
+    
+    context "#chr" do
+      should "conform to doc" do
+        assert_equal "d", "dog".chr
+        assert_equal "δ", "δog".chr
+      end
+    end
+
+    context "#codepoints" do
+      should "conform to doc" do
+        assert_equal [100, 111, 103], "dog".codepoints.to_a 
+        assert_equal [948, 111, 103], "δog".codepoints.to_a  # Note, there is an error in Pragmatics' book
+        result = [] 
+        assert_equal "δog", "δog".codepoints.each {|b| result << b }
+        assert_equal [948, 111, 103], result
+      end
+    end
 
     context "#start_with" do
       should "conform to doc" do

data/test/test_helper.rb

@@ -6,5 +6,5 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'backports'
 
-class Test::Unit::TestCase
-end
+# class Test::Unit::TestCase
+# end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: marcandre-backports
 version: !ruby/object:Gem::Version 
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors: 
 - "Marc-Andr\xC3\xA9 Lafortune"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-24 00:00:00 -07:00
+date: 2009-04-29 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -30,17 +30,35 @@ files:
 - VERSION.yml
 - lib/backports.rb
 - lib/backports/array.rb
+- lib/backports/binding.rb
+- lib/backports/dir.rb
 - lib/backports/enumerable.rb
+- lib/backports/enumerator.rb
 - lib/backports/fixnum.rb
 - lib/backports/hash.rb
+- lib/backports/integer.rb
+- lib/backports/io.rb
+- lib/backports/kernel.rb
+- lib/backports/method.rb
 - lib/backports/module.rb
 - lib/backports/object.rb
+- lib/backports/object_space.rb
 - lib/backports/proc.rb
+- lib/backports/range.rb
+- lib/backports/regexp.rb
 - lib/backports/string.rb
+- lib/backports/struct.rb
 - lib/backports/symbol.rb
 - test/array_test.rb
+- test/binding_test.rb
 - test/enumerable_test.rb
+- test/enumerator_test.rb
 - test/hash_test.rb
+- test/kernel_test.rb
+- test/method_test.rb
+- test/module_test.rb
+- test/object_test.rb
+- test/regexp_test.rb
 - test/string_test.rb
 - test/test_helper.rb
 has_rdoc: true
@@ -77,7 +95,14 @@ specification_version: 2
 summary: Backports or ruby 1.8.7+ & rails for older ruby.
 test_files: 
 - test/array_test.rb
+- test/binding_test.rb
 - test/enumerable_test.rb
+- test/enumerator_test.rb
 - test/hash_test.rb
+- test/kernel_test.rb
+- test/method_test.rb
+- test/module_test.rb
+- test/object_test.rb
+- test/regexp_test.rb
 - test/string_test.rb
 - test/test_helper.rb