backports 1.7.1 → 1.8.0

data/lib/backports/1.8.7/struct.rb

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

data/lib/backports/1.8.7/symbol.rb

@@ -0,0 +1,6 @@
+class Symbol
+  # Standard in ruby 1.8.7+. See official documentation[http://ruby-doc.org/core-1.9/classes/Symbol.html]
+  def to_proc
+    Proc.new { |*args| args.shift.__send__(self, *args) }
+  end unless :to_proc.respond_to?(:to_proc)
+end

data/lib/backports/1.9.rb

@@ -0,0 +1,5 @@
+require File.expand_path(File.dirname(__FILE__) + "/tools")
+Backports.require_relative "1.8.7"
+%w(array enumerable enumerator hash integer kernel string symbol).each do |lib|
+  Backports.require_relative "1.9/#{lib}"
+end

data/lib/backports/1.9/array.rb

@@ -0,0 +1,12 @@
+class Array
+  # Standard in Ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/Array.html]
+  class << self
+    # Try to convert obj into an array, using to_ary method.
+    # Returns converted array or nil if obj cannot be converted
+    # for any reason. This method is to check if an argument is an array.
+    def try_convert(obj)
+      return nil unless obj.respond_to?(:to_ary)
+      Backports.coerce_to(obj, Array, :to_ary)
+    end
+  end
+end

data/lib/backports/1.9/enumerable.rb

@@ -0,0 +1,8 @@
+module Enumerable
+  # 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
+end

data/lib/backports/1.9/enumerator.rb

@@ -0,0 +1,15 @@
+# Must be defined outside of Kernel for jruby, see http://jira.codehaus.org/browse/JRUBY-3609
+Enumerator = Enumerable::Enumerator unless Kernel.const_defined? :Enumerator # Standard in ruby 1.9
+
+class Enumerator
+  # new with block, standard in Ruby 1.9
+  unless (self.new{} rescue false)
+    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(Backports::Yielder.new(&block))
+    end
+    Backports.alias_method_chain self, :initialize, :optional_block
+  end
+
+  alias_method :with_object, :each_with_object unless method_defined? :with_object
+end

data/lib/backports/1.9/hash.rb

@@ -0,0 +1,15 @@
+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
+    def try_convert(x)
+      return nil unless x.respond_to? :to_hash
+      x.to_hash
+    end unless method_defined? :to_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(&Backports.coerce_to(proc, Proc, :to_proc)).merge!(self))
+  end unless method_defined? :default_proc=
+end

data/lib/backports/1.9/integer.rb

@@ -0,0 +1,3 @@
+class Integer
+  alias_method :magnitude, :abs unless method_defined? :magnitude
+end

data/lib/backports/1.9/kernel.rb

@@ -0,0 +1,11 @@
+module Kernel
+  alias_method :__callee__, :__method__  unless (__callee__ || true rescue false)
+  
+  def require_relative(relative_feature)
+    file = caller.first.split(/:\d/,2).first
+    if /\A\((.*)\)/ =~ file # eval, etc. 
+      raise LoadError, "require_relative is called in #{$1}" 
+    end 
+    require File.expand_path(relative_feature, File.dirname(file))
+  end
+end

data/lib/backports/1.9/string.rb

@@ -0,0 +1,39 @@
+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
+
+  # Standard in Ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/String.html]
+  def ascii_only?
+    !(self =~ /[^\x00-\x7f]/)
+  end unless method_defined? :ascii_only?
+
+  # Standard in Ruby 1.8.7+. 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
+  end unless method_defined? :codepoints
+  
+  # Standard in Ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/String.html]
+  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 getbyte(i)
+    self[i]
+  end unless method_defined? :getbyte
+  
+end

data/lib/backports/{symbol.rb → 1.9/symbol.rb}

@@ -1,9 +1,4 @@
 class Symbol
-  # Standard in ruby 1.8.7+. See official documentation[http://ruby-doc.org/core-1.9/classes/Symbol.html]
-  def to_proc
-    Proc.new { |*args| args.shift.__send__(self, *args) }
-  end unless :to_proc.respond_to?(:to_proc)
-  
   # Standard in ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/Symbol.html]
   [ [%w(capitalize downcase next succ swapcase upcase), {:after => ".to_sym"}],
     [%w(=~ [] empty? length match size), {}]
@@ -34,4 +29,4 @@ class Symbol
     alias_method :==,  :dont_override_equal_please
   end
     
-end
+end

data/lib/backports/rails.rb

@@ -0,0 +1,4 @@
+require File.expand_path(File.dirname(__FILE__) + "/tools")
+%w(array enumerable hash kernel module string).each do |lib|
+  Backports.require_relative "rails/#{lib}"
+end

data/lib/backports/rails/array.rb

@@ -0,0 +1,6 @@
+class Array
+  # See official documentation[http://api.rubyonrails.org/classes/ActiveSupport/CoreExtensions/Array/ExtractOptions.html]
+  def extract_options!
+    last.is_a?(::Hash) ? pop : {}
+  end unless method_defined? :extract_options!
+end

data/lib/backports/rails/enumerable.rb

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

data/lib/backports/rails/hash.rb

@@ -0,0 +1,31 @@
+class Hash
+  # Standard in rails. See official documentation[http://api.rubyonrails.org/classes/ActiveSupport/CoreExtensions/Hash/Keys.html]
+  def reverse_merge(other_hash)
+    other_hash.merge(self)
+  end
+
+  # Standard in rails. See official documentation[http://api.rubyonrails.org/classes/ActiveSupport/CoreExtensions/Hash/Keys.html]
+  def reverse_merge!(other_hash)
+    replace(reverse_merge(other_hash))
+  end
+
+  # Standard in rails. See official documentation[http://api.rubyonrails.org/classes/ActiveSupport/CoreExtensions/Hash/Keys.html]
+  def symbolize_keys
+    Hash[map{|key,value| [(key.to_sym rescue key) || key, value] }]
+  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

data/lib/backports/rails/kernel.rb

@@ -0,0 +1,12 @@
+module 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?
+  end unless method_defined? :try
+
+  # Standard in rails. See official documentation[http://api.rubyonrails.org/classes/Object.html]
+  def returning(obj)
+    yield obj
+    obj
+  end unless method_defined? :returning
+end

data/lib/backports/rails/module.rb

@@ -0,0 +1,6 @@
+class Module
+  # Standard in rails... See official documentation[http://api.rubyonrails.org/classes/ActiveSupport/CoreExtensions/Module.html]
+  def alias_method_chain(target, feature)
+    Backports.alias_method_chain(self, target, feature)
+  end unless method_defined? :alias_method_chain
+end

data/lib/backports/rails/string.rb

@@ -0,0 +1,42 @@
+class String
+  # 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 rails. See official documentation[http://api.rubyonrails.org/classes/ActiveSupport/CoreExtensions/String/Inflections.html]
+  def constantize
+    names = 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
+    gsub(/_/, '-')
+  end unless method_defined? :dasherize
+  
+  # Standard in rails. See official documentation[http://api.rubyonrails.org/classes/ActiveSupport/CoreExtensions/String/Inflections.html]
+  def demodulize
+    gsub(/^.*::/, '')
+  end unless method_defined? :demodulize
+
+  # Standard in rails. See official documentation[http://api.rubyonrails.org/classes/ActiveSupport/CoreExtensions/String/Inflections.html]
+  def underscore
+    gsub(/::/, '/').
+      gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
+      gsub(/([a-z\d])([A-Z])/,'\1_\2').
+      tr("-", "_").
+      downcase
+  end unless method_defined? :underscore
+  
+end

data/lib/backports/tools.rb

@@ -0,0 +1,117 @@
+# Methods used internally by the backports.
+
+module Backports
+  # Adapted from Pragmatic's "Programming Ruby" (since their version was buggy...)
+  def self.require_relative(relative_feature)
+    file = caller.first.split(/:\d/,2).first
+    if /\A\((.*)\)/ =~ file # eval, etc. 
+      raise LoadError, "require_relative is called in #{$1}" 
+    end 
+    require File.expand_path(relative_feature, File.dirname(file))
+  end
+  
+  # Metaprogramming utility to make block optional.
+  # Tests first if block is already optional when given options
+  def self.make_block_optional mod,*methods
+    options = methods.last.is_a?(Hash) ? methods.pop : {}
+    methods.each do |selector|
+      unless mod.method_defined? selector
+        warn "#{mod}##{selector} is not defined, so block can't be made optional"
+        next
+      end
+      unless options.empty?
+        test_on = options[:test_on] || self.new
+        next if (test_on.send(selector, *options.fetch(:arg, [])) rescue false)
+      end
+      
+      arity = mod.instance_method(selector).arity
+      last_arg = []
+      if arity < 0
+        last_arg = ["*rest"]
+        arity = -1-arity
+      end
+      arg_sequence = ((0...arity).map{|i| "arg_#{i}"} + last_arg + ["&block"]).join(", ")
+
+      alias_method_chain(mod, selector, :optional_block) do |aliased_target, punctuation|
+        mod.module_eval <<-end_eval
+          def #{aliased_target}_with_optional_block#{punctuation}(#{arg_sequence})
+            return to_enum(:#{aliased_target}_without_optional_block#{punctuation}, #{arg_sequence}) unless block_given?
+            #{aliased_target}_without_optional_block#{punctuation}(#{arg_sequence})
+          end
+        end_eval
+      end
+    end
+  end
+
+  # Modified to avoid polluting Module if so desired
+  # (from Rails)
+  def self.alias_method_chain(mod, target, feature)
+    mod.class_eval do
+      # Strip out punctuation on predicates or bang methods since
+      # e.g. target?_without_feature is not a valid method name.
+      aliased_target, punctuation = target.to_s.sub(/([?!=])$/, ''), $1
+      yield(aliased_target, punctuation) if block_given?
+
+      with_method, without_method = "#{aliased_target}_with_#{feature}#{punctuation}", "#{aliased_target}_without_#{feature}#{punctuation}"
+
+      alias_method without_method, target
+      alias_method target, with_method
+
+      case
+        when public_method_defined?(without_method)
+          public target
+        when protected_method_defined?(without_method)
+          protected target
+        when private_method_defined?(without_method)
+          private target
+      end
+    end
+  end
+  
+  # Helper method to coerce a value into a specific class.
+  # Raises a TypeError if the coercion fails or the returned value
+  # is not of the right class. 
+  # (from Rubinius)
+  def self.coerce_to(obj, cls, meth)
+    return obj if obj.kind_of?(cls)
+
+    begin
+      ret = obj.__send__(meth)
+    rescue Exception => e
+      raise TypeError, "Coercion error: #{obj.inspect}.#{meth} => #{cls} failed:\n" \
+                       "(#{e.message})"
+    end
+    raise TypeError, "Coercion error: obj.#{meth} did NOT return a #{cls} (was #{ret.class})" unless 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)
+  def self.coerce_to_comparison(a, b, cmp = (a <=> b))
+    raise ArgumentError, "comparison of #{a} with #{b} failed" if cmp.nil?
+    return 1 if cmp > 0
+    return -1 if cmp < 0
+    0
+  end
+
+  # Used internally to make it easy to deal with optional arguments
+  # (from Rubinius)
+  Undefined = Object.new
+  
+  # A simple class which allows the construction of Enumerator from a block
+  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
+end

data/test/enumerator_test.rb

@@ -16,12 +16,12 @@ class EnumeratorTest < Test::Unit::TestCase
     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
+          yielder.yield "This syntax is"
+          yielder.yield "cool!"
         end
         assert enum.is_a?(Enumerator)
         2.times do
-          assert_equal ["This cool new syntax is sponsored by", Enumerator::Yielder], enum.to_a
+          assert_equal ["This syntax is", "cool!"], enum.to_a
         end
       end
     end

data/test/test_helper.rb

@@ -2,9 +2,7 @@ require 'rubygems'
 require 'test/unit'
 require 'shoulda'
 
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'backports'
+require File.expand_path(File.dirname(__FILE__) + "/../lib/backports")
 
 # class Test::Unit::TestCase
 # end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: backports
 version: !ruby/object:Gem::Version 
-  version: 1.7.1
+  version: 1.8.0
 platform: ruby
 authors: 
 - "Marc-Andr\xC3\xA9 Lafortune"
@@ -9,11 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-20 00:00:00 -04:00
+date: 2009-08-31 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
-description: 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.
+description: "      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.\n"
 email: github@marc-andre.ca
 executables: []
 
@@ -32,32 +32,49 @@ files:
 - VERSION.yml
 - backports.gemspec
 - lib/backports.rb
-- lib/backports/argf.rb
-- lib/backports/array.rb
-- lib/backports/binding.rb
-- lib/backports/core_ext.rb
-- lib/backports/dir.rb
-- lib/backports/enumerable.rb
-- lib/backports/enumerator.rb
-- lib/backports/env.rb
-- lib/backports/fixnum.rb
-- lib/backports/float.rb
-- lib/backports/gc.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/numeric.rb
-- lib/backports/object_space.rb
-- lib/backports/proc.rb
-- lib/backports/process.rb
-- lib/backports/range.rb
-- lib/backports/regexp.rb
-- lib/backports/string.rb
-- lib/backports/struct.rb
-- lib/backports/symbol.rb
+- lib/backports/1.8.7.rb
+- lib/backports/1.8.7/argf.rb
+- lib/backports/1.8.7/array.rb
+- lib/backports/1.8.7/binding.rb
+- lib/backports/1.8.7/dir.rb
+- lib/backports/1.8.7/enumerable.rb
+- lib/backports/1.8.7/enumerator.rb
+- lib/backports/1.8.7/env.rb
+- lib/backports/1.8.7/fixnum.rb
+- lib/backports/1.8.7/float.rb
+- lib/backports/1.8.7/gc.rb
+- lib/backports/1.8.7/hash.rb
+- lib/backports/1.8.7/integer.rb
+- lib/backports/1.8.7/io.rb
+- lib/backports/1.8.7/kernel.rb
+- lib/backports/1.8.7/method.rb
+- lib/backports/1.8.7/module.rb
+- lib/backports/1.8.7/numeric.rb
+- lib/backports/1.8.7/object_space.rb
+- lib/backports/1.8.7/proc.rb
+- lib/backports/1.8.7/process.rb
+- lib/backports/1.8.7/range.rb
+- lib/backports/1.8.7/regexp.rb
+- lib/backports/1.8.7/string.rb
+- lib/backports/1.8.7/struct.rb
+- lib/backports/1.8.7/symbol.rb
+- lib/backports/1.9.rb
+- lib/backports/1.9/array.rb
+- lib/backports/1.9/enumerable.rb
+- lib/backports/1.9/enumerator.rb
+- lib/backports/1.9/hash.rb
+- lib/backports/1.9/integer.rb
+- lib/backports/1.9/kernel.rb
+- lib/backports/1.9/string.rb
+- lib/backports/1.9/symbol.rb
+- lib/backports/rails.rb
+- lib/backports/rails/array.rb
+- lib/backports/rails/enumerable.rb
+- lib/backports/rails/hash.rb
+- lib/backports/rails/kernel.rb
+- lib/backports/rails/module.rb
+- lib/backports/rails/string.rb
+- lib/backports/tools.rb
 - test/array_test.rb
 - test/binding_test.rb
 - test/enumerable_test.rb
@@ -73,6 +90,8 @@ files:
 - test/test_helper.rb
 has_rdoc: true
 homepage: http://github.com/marcandre/backports
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -99,9 +118,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: backports
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Backports or ruby 1.8.7+ & rails for older ruby.
 test_files: 
 - test/array_test.rb