backports 1.18.2 → 2.0.0

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
-:major: 1
 :minor: 18
-:patch: 2
+:patch: 3
 :build: 
+:major: 1

data/backports.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{backports}
-  s.version = "1.18.2"
+  s.version = "2.0.0"
 
   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{2010-10-09}
+  s.date = %q{2011-03-04}
   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}
@@ -82,7 +82,6 @@ Gem::Specification.new do |s|
      "lib/backports/1.9.2/hash.rb",
      "lib/backports/1.9.2/kernel.rb",
      "lib/backports/1.9.2/match_data.rb",
-     "lib/backports/1.9.2/method.rb",
      "lib/backports/1.9.2/random.rb",
      "lib/backports/1.9.2/random/MT19937.rb",
      "lib/backports/1.9.2/random/bits_and_bytes.rb",
@@ -120,7 +119,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8", "--title", "Backports library", "--main", "README.rdoc", "--line-numbers", "--inline-source"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{backports}
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Backports of Ruby 1.8.7+ for older ruby.}
   s.test_files = [
     "test/array_test.rb",
@@ -145,7 +144,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
     else
     end
   else

data/lib/backports/1.8.7/array.rb

@@ -19,13 +19,13 @@ class Array
   end unless method_defined? :combination
 
   # Standard in Ruby 1.8.7+. See official documentation[http://ruby-doc.org/core-1.9/classes/Array.html]
-  def cycle(n = nil, &block)
+  def cycle(n = nil)
     return to_enum(:cycle, n) unless block_given?
     if n.nil?
-      loop(&block)
+      each{|e| yield e } until false
     else
       n = Backports.coerce_to_int(n)
-      n.times{each(&block)}
+      n.times{each{|e| yield e }}
     end
     nil
   end unless method_defined? :cycle
@@ -91,7 +91,7 @@ class Array
   end
 
   # Standard in Ruby 1.8.7+. See official documentation[http://ruby-doc.org/core-1.9/classes/Array.html]
-  def permutation(num = Backports::Undefined, &block)
+  def permutation(num = Backports::Undefined)
     return to_enum(:permutation, num) unless block_given?
     num = num.equal?(Backports::Undefined) ?
           size :
@@ -197,6 +197,7 @@ class Array
 
   # Standard in Ruby 1.8.7+. See official documentation[http://ruby-doc.org/core-1.9/classes/Array.html]
   def shuffle!
+    raise TypeError, "can't modify frozen array" if frozen?
     size.times do |i|
       r = i + Kernel.rand(size - i)
       self[i], self[r] = self[r], self[i]

data/lib/backports/1.8.7/enumerable.rb

@@ -14,18 +14,24 @@ module Enumerable
   end unless method_defined? :count
   
   # Standard in Ruby 1.8.7+. See official documentation[http://ruby-doc.org/core-1.9/classes/Enumerable.html]
-  def cycle(n = nil, &block)
+  def cycle(n = nil)
     return to_enum(:cycle, n) unless block_given?
-    return loop(&block) if nil == n
-    n = Backports.coerce_to_int(n)
-    if n >= 1
-      cache = []
-      each do |elem|
-        cache << elem
-        block.call(elem)
+    if n.nil?
+      each{|e| yield e } until false
+    else
+      n = Backports.coerce_to_int(n)
+      if n >= 1
+        cache = []
+        each do |elem|
+          cache << elem
+          yield elem
+        end
+        (n-1).times do
+          cache.each{|e| yield e }
+        end
       end
-      cache.cycle(n-1, &block)
     end
+    nil
   end unless method_defined? :cycle
   
   # Standard in Ruby 1.8.7+. See official documentation[http://ruby-doc.org/core-1.9/classes/Enumerable.html]
@@ -43,7 +49,7 @@ module Enumerable
   end unless method_defined? :drop
   
   # Standard in Ruby 1.8.7+. See official documentation[http://ruby-doc.org/core-1.9/classes/Enumerable.html]
-  def drop_while(&block)
+  def drop_while
     return to_enum(:drop_while) unless block_given?
     ary = []
     dropping = true
@@ -55,7 +61,7 @@ module Enumerable
   
   # 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)
+    def each_with_index_with_optional_args_and_block(*args)
       return to_enum(:each_with_index, *args) unless block_given?
       idx = 0
       each(*args) { |o| yield(o, idx); idx += 1 }
@@ -119,15 +125,25 @@ module Enumerable
   end
 
   # Standard in Ruby 1.8.7+. See official documentation[http://ruby-doc.org/core-1.9/classes/Enumerable.html]
-  def max_by(&block)
+  def max_by
     return to_enum(:max_by) unless block_given?
-    minmax_by(&block)[1]
+    max_object, max_result = nil, MOST_EXTREME_OBJECT_EVER
+    each do |object|
+      result = yield object
+      max_object, max_result = object, result if max_result < result
+    end
+    max_object
   end unless method_defined? :max_by
 
   # Standard in Ruby 1.8.7+. See official documentation[http://ruby-doc.org/core-1.9/classes/Enumerable.html]
-  def min_by(&block)
+  def min_by
     return to_enum(:min_by) unless block_given?
-    minmax_by(&block).first
+    min_object, min_result = nil, MOST_EXTREME_OBJECT_EVER
+    each do |object|
+      result = yield object
+      min_object, min_result = object, result if min_result > result
+    end
+    min_object
   end unless method_defined? :min_by
 
   # Standard in Ruby 1.8.7+. See official documentation[http://ruby-doc.org/core-1.9/classes/Enumerable.html]
@@ -148,7 +164,7 @@ module Enumerable
   end unless method_defined? :minmax
   
   # Standard in Ruby 1.8.7+. See official documentation[http://ruby-doc.org/core-1.9/classes/Enumerable.html]
-  def minmax_by(&block)
+  def minmax_by
     return to_enum(:minmax_by) unless block_given?
     min_object, min_result = nil, MOST_EXTREME_OBJECT_EVER
     max_object, max_result = nil, MOST_EXTREME_OBJECT_EVER
@@ -166,7 +182,7 @@ module Enumerable
   end unless method_defined? :none?
 
   # Standard in Ruby 1.8.7+. See official documentation[http://ruby-doc.org/core-1.9/classes/Enumerable.html]
-  def one?(&block)
+  def one?
     found_one = false
     if block_given?
       each do |o|
@@ -189,10 +205,10 @@ module Enumerable
   Backports.alias_method self, :reduce, :inject
   
   # Standard in Ruby 1.8.7+. See official documentation[http://ruby-doc.org/core-1.9/classes/Enumerable.html]
-  def reverse_each(&block)
+  def reverse_each
     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.
-    to_a.reverse_each(&block)
+    to_a.reverse_each{|e| yield e}
     self
   end unless method_defined? :reverse_each
   

data/lib/backports/1.8.7/kernel.rb

@@ -13,10 +13,19 @@ module Kernel
     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
+  # 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
+
+# Loop. Standard in ruby 1.8.7+. See official documentation[http://ruby-doc.org/core-1.9/classes/Object.html]
+unless Object.const_defined? :StopIteration
+  class StopIteration < IndexError; end
 
+  module Kernel
     def loop_with_stop_iteration(&block)
       loop_without_stop_iteration(&block)
     rescue StopIteration
@@ -24,11 +33,4 @@ module Kernel
     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
+end

data/lib/backports/1.8.7/string.rb

@@ -15,9 +15,9 @@ class String
 
   # 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)
+    def each_char
       return to_enum(:each_char) unless block_given?
-      scan(/./, &block)
+      scan(/./) {|c| yield c}
     end
 
     Backports.alias_method self, :chars, :each_char
@@ -27,18 +27,18 @@ class String
 
   # 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
+    suffixes.any? do |suffix|
+      if suffix.respond_to? :to_str
+        suffix = suffix.to_str
+        self[-suffix.length, suffix.length] == suffix
+      end
     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
+    def partition_with_new_meaning(pattern = Backports::Undefined)
+      return partition_without_new_meaning{|c| yield c} if pattern == Backports::Undefined
       pattern = Backports.coerce_to(pattern, String, :to_str) unless pattern.is_a? Regexp
       i = index(pattern)
       return [self, "", ""] unless i
@@ -70,21 +70,21 @@ class String
 
   # 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
+    prefixes.any? do |prefix|
+      if prefix.respond_to? :to_str
+        prefix = prefix.to_str
+        self[0, prefix.length] == prefix
+      end
     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
+    def upto_with_exclusive(to, excl=false)
+      return upto_without_exclusive(to){|s| yield s} if block_given? && !excl
       enum = Range.new(self, to, excl).to_enum
       return enum unless block_given?
-      enum.each(&block)
+      enum.each{|s| yield s}
       self
     end
     Backports.alias_method_chain self, :upto, :exclusive

data/lib/backports/1.8.8/array.rb

@@ -1,7 +1,7 @@
 class Array
   # Standard in Ruby 1.8.8. See official documentation[http://ruby-doc.org/core-1.9/classes/Array.html]
   class << self
-    def self.try_convert(obj)
+    def try_convert(obj)
       return nil unless obj.respond_to?(:to_ary)
       Backports.coerce_to_ary(obj)
     end unless method_defined? :try_convert

data/lib/backports/1.8.8/enumerable.rb

@@ -1,8 +1,8 @@
 module Enumerable
   # Standard in Ruby 1.8.8. See official documentation[http://ruby-doc.org/core-1.9/classes/Enumerable.html]
-  def each_with_object(memo, &block)
+  def each_with_object(memo)
     return to_enum(:each_with_object, memo) unless block_given?
-    each {|obj| block.call(obj, memo)}
+    each {|obj| yield obj, memo}
     memo
   end unless method_defined? :each_with_object
 end

data/lib/backports/1.8.8/io.rb

@@ -1,7 +1,7 @@
 class IO
   # Standard in Ruby 1.8.8. See official documentation[http://ruby-doc.org/core-1.9/classes/IO.html]
   class << self
-    def self.try_convert(obj)
+    def try_convert(obj)
       return nil unless obj.respond_to?(:to_io)
       Backports.coerce_to(obj, IO, :to_io)
     end unless method_defined? :try_convert

data/lib/backports/1.8.8/regexp.rb

@@ -1,9 +1,13 @@
 class Regexp
   # Standard in Ruby 1.8.8. See official documentation[http://ruby-doc.org/core-1.9/classes/Array.html]
   class << self
-    def self.try_convert(obj)
-      return nil unless obj.respond_to?(:to_regexp)
-      Backports.coerce_to(obj, Regexp, :to_regexp)
+    def try_convert(obj)
+      case
+        when obj.is_a?(Regexp)
+          obj
+        when obj.respond_to?(:to_regexp)
+          Backports.coerce_to(obj, Regexp, :to_regexp)
+      end
     end unless method_defined? :try_convert
   end
 end

data/lib/backports/1.9.2/array.rb

@@ -29,7 +29,7 @@ class Array
 
   # Note: Combinations are not yielded in the same order as MRI.
   # This is not a bug; the spec states that the order is implementation dependent
-  def repeated_combination(num, &block)
+  def repeated_combination(num)
     return to_enum(:repeated_combination, num) unless block_given?
     num = Backports.coerce_to_int(num)
     if num <= 0
@@ -47,7 +47,7 @@ class Array
 
   # Note: Permutations are not yielded in the same order as MRI.
   # This is not a bug; the spec states that the order is implementation dependent
-  def repeated_permutation(num, &block)
+  def repeated_permutation(num)
     return to_enum(:repeated_permutation, num) unless block_given?
     num = Backports.coerce_to_int(num)
     if num <= 0
@@ -74,20 +74,22 @@ class Array
     concat(slice!(0, n))
   end unless method_defined? :rotate!
 
-  def select!(&block)
+  def select!
     return to_enum(:select!) unless block_given?
     reject!{|elem| ! yield elem}
   end unless method_defined? :select!
 
-  def sort_by!(&block)
+  def sort_by!
     return to_enum(:sort_by!) unless block_given?
-    replace sort_by(&block)
+    raise "can't modify frozen array" if frozen?
+    replace sort_by{|e| yield e}
   end unless method_defined? :sort_by!
 
   unless [1,2].uniq!{}
-    def uniq_with_block!(&block)
+    def uniq_with_block!
       return uniq_without_block! unless block_given?
-      u = uniq(&block)
+      replace self if frozen? # force error
+      u = uniq{|e| yield e}
       replace u unless u.size == size
     end
     Backports.alias_method_chain self, :uniq!, :block

data/lib/backports/tools.rb

@@ -23,7 +23,7 @@ module Backports
 
   # Metaprogramming utility to make block optional.
   # Tests first if block is already optional when given options
-  def self.make_block_optional mod,*methods
+  def self.make_block_optional(mod, *methods)
     options = methods.last.is_a?(Hash) ? methods.pop : {}
     methods.each do |selector|
       unless mod.method_defined? selector
@@ -55,7 +55,7 @@ module Backports
   end
 
   # Metaprogramming utility to convert the first file argument to path
-  def self.convert_first_argument_to_path mod,*methods
+  def self.convert_first_argument_to_path(mod, *methods)
     methods.each do |selector|
       unless mod.method_defined? selector
         warn "#{mod}##{selector} is not defined, so argument can't converted to path"
@@ -81,7 +81,7 @@ module Backports
   end
 
   # Metaprogramming utility to convert all file arguments to paths
-  def self.convert_all_arguments_to_path mod, skip, *methods
+  def self.convert_all_arguments_to_path(mod, skip, *methods)
     methods.each do |selector|
       unless mod.method_defined? selector
         warn "#{mod}##{selector} is not defined, so arguments can't converted to path"
@@ -100,7 +100,12 @@ module Backports
   end
 
   def self.convert_to_path(file_or_path)
-    coerce_to(file_or_path, String, :to_str) rescue coerce_to(file_or_path, String, :to_path) rescue file_or_path
+    begin
+      file_or_path = file_or_path.to_path
+    rescue NoMethodError
+      # ignore
+    end
+    coerce_to(file_or_path, String, :to_str)
   end
 
   # Modified to avoid polluting Module if so desired

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: backports
 version: !ruby/object:Gem::Version 
+  hash: 15
   prerelease: false
   segments: 
-  - 1
-  - 18
   - 2
-  version: 1.18.2
+  - 0
+  - 0
+  version: 2.0.0
 platform: ruby
 authors: 
 - "Marc-Andr\xC3\xA9 Lafortune"
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-09 00:00:00 -04:00
+date: 2011-03-04 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -92,7 +93,6 @@ files:
 - lib/backports/1.9.2/hash.rb
 - lib/backports/1.9.2/kernel.rb
 - lib/backports/1.9.2/match_data.rb
-- lib/backports/1.9.2/method.rb
 - lib/backports/1.9.2/random.rb
 - lib/backports/1.9.2/random/MT19937.rb
 - lib/backports/1.9.2/random/bits_and_bytes.rb
@@ -141,23 +141,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: backports
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Backports of Ruby 1.8.7+ for older ruby.

data/lib/backports/1.9.2/method.rb

@@ -1,101 +0,0 @@
-# Standard in Ruby 1.9.2.
-unless Kernel.method_defined? :respond_to_missing?
-  module MissingMethod
-    attr_reader :name
-
-    def call(*arg, &block)
-      receiver.send :method_missing, @name, *arg, &block
-    end
-    alias_method :[], :call
-
-    def eql?(method)
-      method.is_a?(MissingMethod) &&
-        receiver == method.receiver &&
-        name == method.name
-    end
-    alias_method :==, :eql?
-
-    def arity
-      -1
-    end
-
-    def owner
-      @receiver.class
-    end
-
-    def source_location
-      nil
-    end
-
-    def to_proc
-      get_block {|*arg| @receiver.send :method_missing, *arg}
-    end
-
-    def unbind
-      MissingUnboundMethod.new(owner, name)
-    end
-
-    def self.new(receiver, name)
-      m = receiver.method :respond_to_missing?
-      m.extend self
-      m.instance_variable_set :@name, name
-      m
-    end
-    #private
-    def get_block(&block)
-      block
-    end
-    private :get_block
-  end
-
-  module MissingUnboundMethod
-    attr_reader :name
-    attr_reader :owner
-
-    def self.new(owner, name)
-      um = owner.instance_method :respond_to_missing?
-      um.extend self
-      um.instance_variable_set :@name, name
-      um.instance_variable_set :@owner, owner
-      um
-    end
-
-    def arity
-      -1
-    end
-
-    def source_location
-      nil
-    end
-
-    def bind(to)
-      raise TypeError, "bind argument must be an instance of #{@owner}" unless to.is_a? @owner
-      MissingMethod.new(to, @name)
-    end
-  end
-
-  module Kernel
-    def respond_to_missing? method
-      false
-    end
-
-    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
-
-    def method_with_new_repond_to_missing(method)
-      method_without_new_repond_to_missing(method)
-    rescue NameError
-      respond_to_missing?(method) ? MissingMethod.new(self, method): raise
-    end
-    Backports.alias_method_chain self, :method, :new_repond_to_missing
-
-    def public_method_with_new_repond_to_missing(method)
-      public_method_without_new_repond_to_missing(method)
-    rescue NameError
-      respond_to_missing?(method) ? MissingMethod.new(self, method): raise
-    end
-    Backports.alias_method_chain self, :public_method, :new_repond_to_missing if method_defined? :public_method
-  end
-end