backports 2.3.0 → 2.4.0

data/lib/backports/1.9.2/stdlib/set.rb

@@ -0,0 +1,13 @@
+class Set
+  def delete_if
+    block_given? or return enum_for(__method__)
+    to_a.each { |o| @hash.delete(o) if yield(o) }
+    self
+  end unless method_defined? :delete_if
+
+  def keep_if
+    block_given? or return enum_for(__method__)
+    to_a.each { |o| @hash.delete(o) unless yield(o) }
+    self
+  end unless method_defined? :keep_if
+end

data/lib/backports/1.9.2/stdlib.rb

@@ -0,0 +1 @@
+Backports::StdLib.extend_relative

data/lib/backports/1.9.3/io.rb

@@ -0,0 +1,12 @@
+class << IO
+  # Standard in Ruby 1.9.3 See official documentation[http://ruby-doc.org/core-1.9.3/IO.html#method-c-write]
+  def write(name, string, offset = nil, options = Backports::Undefined)
+    Backports.write(false, name, string, offset, options)
+  end unless method_defined? :write
+
+  # Standard in Ruby 1.9.3 See official documentation[http://ruby-doc.org/core-1.9.3/IO.html#method-c-binwrite]
+  # This method does support an options hash, see http://bugs.ruby-lang.org/issues/5782
+  def binwrite(name, string, offset = nil, options = Backports::Undefined)
+    Backports.write(true, name, string, offset, options)
+  end unless method_defined? :binwrite
+end

data/lib/backports/1.9.3.rb

@@ -0,0 +1,5 @@
+# require this file to load all the backports up to Ruby 1.9.3
+
+require File.expand_path(File.dirname(__FILE__) + "/tools")
+Backports.require_relative "1.9.2"
+Backports.require_relative_dir "1.9.3"

data/lib/backports/1.9.rb

@@ -1,4 +1,4 @@
 # require this file to load all the backports of Ruby
 
 require File.expand_path(File.dirname(__FILE__) + "/tools")
-Backports.require_relative "1.9.2"
+Backports.require_relative "1.9.3"

data/lib/backports/basic_object.rb

@@ -16,8 +16,9 @@ require File.expand_path(File.dirname(__FILE__) + "/tools")
 Backports.require_relative '1.8.7'
 
 class BasicObject
-  KEEP = [:instance_eval, :instance_exec, :__send__,
-          "instance_eval", "instance_exec", "__send__"]
+  KEEP = %w[== equal? ! != instance_eval instance_exec __send__]
+  KEEP.concat KEEP.map { |e| e.to_sym }
+
   # undefine almost all instance methods
   begin
     old_verbose, $VERBOSE = $VERBOSE, nil # silence the warning for undefining __id__

data/lib/backports/force/array_map.rb

@@ -0,0 +1 @@
+require File.expand_path(File.dirname(__FILE__) + "/enumerable_map")

data/lib/backports/force/enumerable_map.rb

@@ -0,0 +1,3 @@
+Backports.make_block_optional Enumerable, :map, :test_on => 1..2
+Backports.make_block_optional Array, :map, :test_on => [1, 2]
+  

data/lib/backports/force/hash_select.rb

@@ -0,0 +1,9 @@
+class Hash
+  if {}.select{} == []
+    def select_with_hash_return
+      return to_enum(:select) unless block_given?
+      Hash[select_without_hash_return{|k, v| yield [k, v]}]
+    end
+    Backports.alias_method_chain self, :select, :hash_return
+  end
+end

data/lib/backports/force/string_length.rb

@@ -0,0 +1,10 @@
+# encoding: utf-8
+
+class String
+  if "é".length > 1 && "é".scan(/./).length == 1
+    def length
+      unpack("U*").length
+    end
+    alias_method :size,       :length
+  end
+end

data/lib/backports/force/string_size.rb

@@ -0,0 +1 @@
+require File.expand_path(File.dirname(__FILE__) + "/string_length")

data/lib/backports/tools.rb

@@ -21,6 +21,64 @@ module Backports
         end
   end
 
+  module StdLib
+    class LoadedFeatures
+      if RUBY_VERSION >= "1.9"
+        # Full paths are recorded in $LOADED_FEATURES.
+        def initialize
+          # Assume backported features are Ruby libraries (i.e. not C)
+          @loaded = $LOADED_FEATURES.group_by{|p| File.basename(p, ".rb")}
+        end
+
+        # Check loaded features for one that matches "#{any of the load path}/#{feature}"
+        def include?(feature)
+          if fullpaths = @loaded[File.basename(feature, ".rb")]
+            fullpaths.any?{|fullpath|
+              base_dir, = fullpath.partition("/#{feature}")
+              $LOAD_PATH.include?(base_dir)
+            }
+          end
+        end
+
+        def self.mark_as_loaded(feature)
+          # Nothing to do, the full path will be OK
+        end
+
+      else
+        # Requested features are recorded in $LOADED_FEATURES
+        def include?(feature)
+          # Assume backported features are Ruby libraries (i.e. not C)
+          $LOADED_FEATURES.include?("#{File.basename(feature, '.rb')}.rb")
+        end
+
+        def self.mark_as_loaded(feature)
+          $LOADED_FEATURES << "#{File.basename(feature, '.rb')}.rb"
+        end
+      end
+    end
+
+    class << self
+      attr_accessor :extended_lib
+
+      def extend_relative relative_dir="stdlib"
+        loaded = Backports::StdLib::LoadedFeatures.new
+        dir = File.expand_path(relative_dir, File.dirname(caller.first.split(/:\d/,2).first))
+        Dir.entries(dir).
+          map{|f| Regexp.last_match(1) if /^(.*)\.rb$/ =~ f}.
+          compact.
+          each do |f|
+            path = File.expand_path(f, dir)
+            if loaded.include?(f)
+              require path
+            else
+              @extended_lib[f] << path
+            end
+          end
+      end
+    end
+    self.extended_lib ||= Hash.new{|h, k| h[k] = []}
+  end
+
   # Metaprogramming utility to make block optional.
   # Tests first if block is already optional when given options
   def self.make_block_optional(mod, *methods)
@@ -32,7 +90,7 @@ module Backports
       end
       unless options.empty?
         test_on = options[:test_on] || self.new
-        next if (test_on.send(selector, *options.fetch(:arg, [])) rescue false)
+        next if (test_on.send(selector, *options.fetch(:arg, []).is_a?(Enumerator)) rescue false)
       end
 
       arity = mod.instance_method(selector).arity
@@ -153,6 +211,14 @@ module Backports
     coerce_to(obj, Array, :to_ary)
   end
 
+  def self.try_convert(obj, cls, meth)
+    return obj if obj.kind_of?(cls)
+    return nil unless obj.respond_to?(meth)
+    ret = obj.__send__(meth)
+    raise TypeError, "Coercion error: obj.#{meth} did NOT return a #{cls} (was #{ret.class})" unless ret.nil? || ret.kind_of?(cls)
+    ret
+  end
+
   # Checks for a failed comparison (in which case it throws an ArgumentError)
   # Additionally, it maps any negative value to -1 and any positive value to +1
   # (from Rubinius)
@@ -182,4 +248,74 @@ module Backports
     to.instance_variable_set :@is_lambda, is_lambda
     to
   end
+
+  # Used internally to combine {IO|File} options hash into mode (String or Integer)
+  def self.combine_mode_and_option(mode = nil, options = Backports::Undefined)
+    # Can't backport autoclose, {internal|external|}encoding
+    mode, options = nil, mode if mode.is_a?(Hash) and options == Backports::Undefined
+    options = {} if options == Backports::Undefined
+    if mode && options[:mode]
+      raise ArgumentError, "mode specified twice"
+    end
+    mode ||= options[:mode] || "r"
+    if options[:textmode] || options[:binmode]
+      text = options[:textmode] || (mode.is_a?(String) && mode =~ /t/)
+      bin  = options[:binmode]  || (mode.is_a?(String) ? mode =~ /b/ : mode & File::Constants::BINARY != 0)
+      if text && bin
+        raise ArgumentError, "both textmode and binmode specified"
+      end
+      case
+        when !options[:binmode]
+        when mode.is_a?(String)
+          mode.insert(1, "b")
+        else
+          mode |= File::Constants::BINARY
+      end
+    end
+    mode
+  end
+
+  # Used internally to combine {IO|File} options hash into mode (String or Integer) and perm
+  def self.combine_mode_perm_and_option(mode = nil, perm = Backports::Undefined, options = Backports::Undefined)
+    mode, options = nil, mode if mode.is_a?(Hash) and perm == Backports::Undefined
+    perm, options = nil, perm if perm.is_a?(Hash) and options == Backports::Undefined
+    perm = nil if perm == Backports::Undefined
+    options = {} if options == Backports::Undefined
+    if perm && options[:perm]
+      raise ArgumentError, "perm specified twice"
+    end
+    [combine_mode_and_option(mode, options), perm || options[:perm]]
+  end
+
+  def self.write(binary, filename, string, offset, options)
+    offset, options = nil, offset if Hash === offset and options == Backports::Undefined
+    options = {} if options == Backports::Undefined
+    options = {:mode => offset.nil? ? "w" : "r+"}.merge(options)
+    args = options[:open_args] || [options]
+    File.open(filename, *args) do |f|
+      f.binmode if binary && f.respond_to?(:binmode)
+      f.seek(offset) unless offset.nil?
+      f.write(string)
+    end
+  end
+end
+
+module Kernel
+  def require_with_backports(lib)
+    begin
+      return false unless require_without_backports(lib)
+      paths = Backports::StdLib.extended_lib.fetch(lib, nil)
+    rescue LoadError
+      return false if Backports::StdLib::LoadedFeatures.new.include?(lib)
+      raise unless paths = Backports::StdLib.extended_lib.fetch(lib, nil)
+      Backports::StdLib::LoadedFeatures.mark_as_loaded(lib)
+    end
+    if paths
+      paths.each do |path|
+        require_without_backports(path)
+      end
+    end
+    true
+  end
+  Backports.alias_method_chain self, :require, :backports
 end

data/test/README

@@ -0,0 +1,13 @@
+Backports should be run against RubySpec. Check https://github.com/rubyspec/rubyspec for installation instructions.
+
+Use the `--unguarded` option to run all specs, including those of versions higher than the current Ruby. Use the `-r` option to require backports.
+
+For example:
+
+    cd YOUR_PATH_TO/rubyspec
+    rvm use 1.8.7
+    mspec core/range/cover_spec.rb --unguarded -r YOUR_PATH_TO/backports/lib/backports
+
+This will run the specs for Range#cover for Ruby 1.8.7 after loading backports.
+
+You need to check which tests fail to decide if it's OK that they do or not. For example it is to be expected that specs checking for encoding behavior will fail, as backports does not support the Ruby 1.9 encoding functionality.

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: backports
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 31
   prerelease: false
   segments: 
   - 2
-  - 3
+  - 4
   - 0
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors: 
 - "Marc-Andr\xC3\xA9 Lafortune"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-23 00:00:00 -04:00
+date: 2012-03-24 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -30,7 +30,7 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
-- .gitignore
+- .irbrc
 - CHANGELOG.rdoc
 - LICENSE
 - README.rdoc
@@ -73,18 +73,23 @@ files:
 - lib/backports/1.9.1/enumerator.rb
 - lib/backports/1.9.1/env.rb
 - lib/backports/1.9.1/file.rb
+- lib/backports/1.9.1/float.rb
 - lib/backports/1.9.1/hash.rb
 - lib/backports/1.9.1/integer.rb
 - lib/backports/1.9.1/io.rb
 - lib/backports/1.9.1/kernel.rb
 - lib/backports/1.9.1/math.rb
+- lib/backports/1.9.1/numeric.rb
 - lib/backports/1.9.1/proc.rb
 - lib/backports/1.9.1/range.rb
 - lib/backports/1.9.1/regexp.rb
+- lib/backports/1.9.1/stdlib.rb
+- lib/backports/1.9.1/stdlib/prime.rb
 - lib/backports/1.9.1/string.rb
 - lib/backports/1.9.1/symbol.rb
 - lib/backports/1.9.2.rb
 - lib/backports/1.9.2/array.rb
+- lib/backports/1.9.2/complex.rb
 - lib/backports/1.9.2/dir.rb
 - lib/backports/1.9.2/enumerable.rb
 - lib/backports/1.9.2/float.rb
@@ -96,8 +101,20 @@ files:
 - lib/backports/1.9.2/random/bits_and_bytes.rb
 - lib/backports/1.9.2/random/implementation.rb
 - lib/backports/1.9.2/random/load.rb
+- lib/backports/1.9.2/stdlib.rb
+- lib/backports/1.9.2/stdlib/matrix.rb
+- lib/backports/1.9.2/stdlib/matrix/eigenvalue_decomposition.rb
+- lib/backports/1.9.2/stdlib/matrix/lup_decomposition.rb
+- lib/backports/1.9.2/stdlib/set.rb
+- lib/backports/1.9.3.rb
+- lib/backports/1.9.3/io.rb
 - lib/backports/1.9.rb
 - lib/backports/basic_object.rb
+- lib/backports/force/array_map.rb
+- lib/backports/force/enumerable_map.rb
+- lib/backports/force/hash_select.rb
+- lib/backports/force/string_length.rb
+- lib/backports/force/string_size.rb
 - lib/backports/rails.rb
 - lib/backports/rails/array.rb
 - lib/backports/rails/enumerable.rb
@@ -106,31 +123,13 @@ files:
 - lib/backports/rails/module.rb
 - lib/backports/rails/string.rb
 - lib/backports/tools.rb
-- test/_README
-- test/array_test.rb
-- test/basic_object_test.rb
-- test/binding_test.rb
-- test/enumerable_test.rb
-- test/enumerator_test.rb
-- test/hash_test.rb
-- test/kernel_test.rb
-- test/math_test.rb
-- test/method_missing_test.rb
-- test/method_test.rb
-- test/module_test.rb
-- test/object_test.rb
-- test/proc_test.rb
-- test/regexp_test.rb
-- test/string_test.rb
-- test/symbol_test.rb
-- test/test_helper.rb
+- test/README
 has_rdoc: true
 homepage: http://github.com/marcandre/backports
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --charset=UTF-8
 - --title
 - Backports library
 - --main
@@ -164,21 +163,5 @@ rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Backports of Ruby 1.8.7+ for older ruby.
-test_files: 
-- test/array_test.rb
-- test/basic_object_test.rb
-- test/binding_test.rb
-- test/enumerable_test.rb
-- test/enumerator_test.rb
-- test/hash_test.rb
-- test/kernel_test.rb
-- test/math_test.rb
-- test/method_missing_test.rb
-- test/method_test.rb
-- test/module_test.rb
-- test/object_test.rb
-- test/proc_test.rb
-- test/regexp_test.rb
-- test/string_test.rb
-- test/symbol_test.rb
-- test/test_helper.rb
+test_files: []
+

data/.gitignore

@@ -1,7 +0,0 @@
-*.sw?
-*.rbc
-.DS_Store
-coverage
-rdoc
-pkg
-assets

data/test/_README

@@ -1 +0,0 @@
-As backports should be ran against RubySpec, tests should ideally be added to RubySpec instead of here...

data/test/array_test.rb

@@ -1,82 +0,0 @@
-require 'test_helper'
-
-class ArrayTest < Test::Unit::TestCase
-  context "Array" do
-    context "#combination" do
-      should "conform to doc" do
-        a = [ "a", "b", "c" ] 
-        assert_equal [["a"], ["b"], ["c"]], a.combination(1).to_a
-        assert_equal [["a", "b"], ["a", "c"], ["b", "c"]], a.combination(2).to_a 
-        assert_equal [["a", "b", "c"]], a.combination(3).to_a
-        assert_equal [], a.combination(4).to_a
-      end
-    end
-        
-    context "#flatten" do
-      should "conform to doc" do
-        s = [ 1, 2, 3 ]
-        t = [ 4, 5, 6, [7, 8] ]
-        a = [ s, t, 9, 10 ]
-        assert_equal [1, 2, 3, 4, 5, 6, 7, 8, 9, 10], a.flatten
-        a = [ 1, 2, [3, [4, 5] ] ]
-        assert_equal [1, 2, 3, [4, 5]], a.flatten(1)
-      end
-    end
-
-    context "#index" do
-      should "conform to doc" do
-        a = [ "a", "b", "c" ]
-        assert_equal 1, a.index("b")
-        assert_equal nil, a.index("z")
-        assert_equal 1, a.index{|x|x=="b"}
-      end
-    end
-
-    context "#reverse_each" do
-      should "return an enumerator when no block is given" do
-        assert_equal [4,3,2], [1,2,3,4].reverse_each.take(3)
-      end
-    end
-
-    context "#pop" do
-      should "conform to doc" do
-        a = %w{ f r a b j o u s } 
-        assert_equal "s", a.pop
-        assert_equal ["f", "r", "a", "b", "j", "o", "u"] , a
-        assert_equal ["j", "o", "u"], a.pop(3)
-        assert_equal ["f", "r", "a", "b"] , a
-      end
-    end
-    
-    context "#product" do
-      should "conform to doc" do
-        assert_equal  [[1, 3], [1, 4], [2, 3], [2, 4]], [1, 2].product([3, 4])
-        assert_equal [[1, 3, 5], [1, 4, 5], [2, 3, 5], [2, 4, 5]], [1, 2].product([3, 4], [5])
-        assert_equal [[1], [2]],  [1, 2].product
-      end
-    end
-    
-    context "#sample" do
-      should "conform to doc" do
-        assert_equal nil, [].sample
-        assert_equal [], [].sample(5)
-        assert_equal 42, [42].sample
-        assert_equal [42], [42].sample(5)
-        a = [ :foo, :bar, 42 ]
-        s = a.sample(2)
-        assert_equal 2, s.size
-        assert_equal 1, (a-s).size
-        assert_equal [], a-(0..20).sum{a.sample(2)}
-      end
-    end
-    
-    context "#shift" do
-      should "conform to doc" do
-        args = [ "-m", "-q", "-v", "filename" ] 
-        assert_equal "-m", args.shift
-        assert_equal ["-q", "-v"], args.shift(2)
-        assert_equal ["filename"], args
-      end
-    end
-  end
-end

data/test/basic_object_test.rb

@@ -1,70 +0,0 @@
-require 'test_helper'
-require 'backports/basic_object'
-
-class BasicObjectTest < Test::Unit::TestCase
-  context "BasicObject" do
-    should "do it's best to keep stuff undefined" do
-      # written in one big test because sequence matters
-      # and defining classes / methods can't really be undone
-
-      assert_equal 3, BasicObject.instance_methods.size
-      
-      class Subclass < BasicObject
-        def foo
-          :bar
-        end
-      end
-      
-      assert_equal 4, Subclass.instance_methods.size
-      
-      module ::Kernel
-        def bar
-          :foo
-        end
-      end
-      
-      assert Subclass.method_defined?(:bar) # for now
-      
-      class ForceCleanup < Subclass
-      end
-      
-      assert !Subclass.method_defined?(:bar) # should be cleaned up
-      
-      module SomeExtension
-        def foo
-          42
-        end
-      end
-      
-      class ::Object
-        include SomeExtension
-      end
-      
-      class ForceCleanupAgain < Subclass
-      end
-      
-      # puts BasicObject.instance_methods - BasicObject.instance_methods(false)
-      # puts BasicObject.instance_method(:foo).owner
-      # puts SomeExtension <= Object
-      assert Subclass.method_defined?(:foo) # should not be cleaned up!
-      assert !BasicObject.method_defined?(:foo) # but BasicObject should have been cleaned up!
-      
-      class BasicObject
-        def last_case
-          1.0/0
-        end
-      end
-      
-      module SomeExtension
-        def last_case
-          0
-        end
-      end
-      
-      class ForceCleanupForTheLastTime < BasicObject
-      end
-      
-      assert BasicObject.method_defined?(:last_case)
-    end
-  end
-end

data/test/binding_test.rb

@@ -1,20 +0,0 @@
-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