backports 1.6.8 → 1.7.0

data/lib/backports/io.rb

@@ -6,7 +6,49 @@ if RUBY_VERSION < '1.8.7'
     end
   end
 
-  class << ARGF
-    make_block_optional :each, :each_line, :each_byte
+end
+
+class IO
+  def bytes
+    to_enum :each_byte
+  end unless method_defined? :bytes
+  
+  def chars
+    to_enum :each_char
+  end unless method_defined? :chars
+  
+  def each_char
+    return to_enum(:each_char) unless block_given?
+    if $KCODE == "UTF-8"
+      lookup = 7.downto(4)
+      while c = read(1) do
+        n = c[0]
+        leftmost_zero_bit = lookup.find{|i| n[i].zero? }
+        case leftmost_zero_bit
+        when 7 # ASCII
+          yield c
+        when 6 # UTF 8 complementary characters
+          next # Encoding error, ignore
+        else
+          more = read(6-leftmost_zero_bit)
+          break unless more
+          yield c+more
+        end
+      end
+    else
+      while s = read(1)
+        yield s
+      end
+    end
+
+    self
   end
+
+  alias_method :getbyte, :getc  unless method_defined? :getbyte
+  alias_method :readbyte, :readchar unless method_defined? :readchar
+  
+  def lines(*args)
+    to_enum :each_line, *args
+  end unless method_defined? :lines
 end
+  

data/lib/backports/kernel.rb

@@ -1,6 +1,30 @@
+require 'enumerator'
+# 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
+
 module Kernel
+
+  def __callee__
+    caller(1).first[/`(.*)'/,1].try(:to_sym)
+  end unless (__callee__ || true rescue false)
+
+  alias_method :__method__, :__callee__  unless (__method__ || true rescue false)
+
+  # Standard in ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/Object.html]
+  def define_singleton_method(*args, &block)
+    class << self
+      self
+    end.send(:define_method, *args, &block)
+  end unless method_defined? :define_singleton_method
+
+  # Standard in ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/Object.html]
+  def instance_exec(*arg, &block)
+    define_singleton_method(:"temporary method for instance_exec", &block)
+    send(:"temporary method for instance_exec", *arg)
+  end unless method_defined? :instance_exec
+
+  # Loop. Standard in ruby 1.8.7. See official documentation[http://ruby-doc.org/core-1.9/classes/Object.html]
   unless const_defined? :StopIteration
-    
     class StopIteration < IndexError; end
 
     def loop_with_stop_iteration(&block)
@@ -9,12 +33,23 @@ module Kernel
       # 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)
+
+  # 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
+
+  # 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
+  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/module.rb

@@ -27,24 +27,4 @@ class Module
   end 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/numeric.rb

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

data/lib/backports/object_space.rb

@@ -1,4 +1,3 @@
-
 module ObjectSpace
   module_eval do
     make_block_optional :each_object, :test_on => ObjectSpace

data/lib/backports/proc.rb

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

data/lib/backports/process.rb

@@ -0,0 +1,5 @@
+module Process
+  def self.exec(*args)
+    raise NotImplementedError
+  end
+end

data/lib/backports/string.rb

@@ -1,16 +1,18 @@
 class String
   class << self
-    # Standard in ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/String.html]
+    # 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]
   alias_method :bytesize, :length unless method_defined? :bytesize
 
   # Standard in rails. See official documentation[http://api.rubyonrails.org/classes/ActiveSupport/CoreExtensions/String/Inflections.html]
@@ -22,19 +24,18 @@ class String
     end
   end unless method_defined? :camelize
   
-  # Standard in ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/String.html]
+  # Standard in Ruby 1.8.7+. See official documentation[http://ruby-doc.org/core-1.9/classes/String.html]
   def chr
     chars.first
-  end unless method_defined? :chr?
+  end unless method_defined? :chr
 
-
-  # Standard in ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/String.html]
+  # 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]
+  # 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|
@@ -68,15 +69,11 @@ class String
 
   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, &block) unless block_given? || arg.size > 1
-  #     gsub_without_optional_block(*arg, &block)
-  #   end
-  #   alias_method_chain :gsub, :optional_block
-  # end
+  # gsub: Left alone because of $~, $1, etc... which needs to be "pushed" up one level
+  # It's possible to do so, but it's a method that is used everywhere so i felt
+  # the performance hit was too big compared to the dubious gain.
   
-  # Standard in ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/String.html]
+  # Standard in Ruby 1.8.7+. See official documentation[http://ruby-doc.org/core-1.9/classes/String.html]
   unless method_defined? :each_char
     def each_char(&block)
       return to_enum(:each_char) unless block_given?
@@ -86,31 +83,31 @@ class String
     alias_method :chars, :each_char unless method_defined? :chars
   end
   
+  # 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]
+  # 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|
-      suffix = suffix.to_s
+      next unless suffix.respond_to? :to_str
+      suffix = suffix.to_str
       return true if self[-suffix.length, suffix.length] == suffix
     end
     false
   end unless method_defined? :end_with?
   
-  # Standard in ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/String.html]
+  # 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
   
-  # Standard in ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/String.html]
+  # 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(*args, &block)
-      return partition_without_new_meaning(*args, &block) unless args.length == 1
-      pattern = args.first
-      
+    def partition_with_new_meaning(pattern = Undefined, &block)
+      return partition_without_new_meaning(&block) if pattern == Undefined
+      pattern = Type.coerce_to(pattern, String, :to_str) unless pattern.is_a? Regexp      
       i = index(pattern)
       return [self, "", ""] unless i
-      
       if pattern.is_a? Regexp
         match = Regexp.last_match
         [match.pre_match, match[0], match.post_match]
@@ -122,8 +119,9 @@ class String
     alias_method_chain :partition, :new_meaning
   end
 
-  # Standard in ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/String.html]
+  # Standard in Ruby 1.8.7+. See official documentation[http://ruby-doc.org/core-1.9/classes/String.html]
   def rpartition(pattern)
+    pattern = Type.coerce_to(pattern, String, :to_str) unless pattern.is_a? Regexp
     i = rindex(pattern)
     return ["", "", self] unless i
     
@@ -137,10 +135,11 @@ class String
   end unless method_defined? :rpartition
 
   
-  # Standard in ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/String.html]
+  # 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|
-      prefix = prefix.to_s
+      next unless prefix.respond_to? :to_str
+      prefix = prefix.to_str
       return true if self[0, prefix.length] == prefix
     end
     false
@@ -157,6 +156,7 @@ class String
   
   unless ("abc".upto("def", true) rescue false)
     def upto_with_exclusive(to, excl=false, &block)
+      return upto_without_exclusive(to, &block) if block_given? && !excl
       enum = Range.new(self, to, excl).to_enum
       return enum unless block_given?
       enum.each(&block)

data/lib/backports/symbol.rb

@@ -1,5 +1,5 @@
 class Symbol
-  # Standard in ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/Symbol.html]
+  # 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)

data/test/enumerable_test.rb

@@ -99,7 +99,7 @@ class EnumerableTest < Test::Unit::TestCase
         assert_equal nil, %w{ant bat cat dog}.find_index {|item| item =~ /h/ }
       end
 
-      should "#work for enumerables too" do
+      should "work for enumerables too" do
         assert_equal 69-42, (42..666).find_index(69)
       end
     end

data/test/enumerator_test.rb

@@ -25,5 +25,14 @@ class EnumeratorTest < Test::Unit::TestCase
         end
       end
     end
+    
+    context "#next" do
+      should "conform to doc" do
+        enum = [10, 20].to_enum 
+        assert_equal 10, enum.next
+        assert_equal 20, enum.next
+        assert_raise(StopIteration){ enum.next} 
+      end
+    end
   end
 end

data/test/kernel_test.rb

@@ -8,14 +8,15 @@ 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 
+      should "catch StopIteration" do
+        i = 0
         r = []
         loop do 
-          r << enum1.next + enum2.next 
+          r << i
+          i += 1
+          raise StopIteration if i > 2
         end
-        assert_equal [11,22], r
+        assert_equal [0, 1, 2], r
       end
     end
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: backports
 version: !ruby/object:Gem::Version 
-  version: 1.6.8
+  version: 1.7.0
 platform: ruby
 authors: 
 - "Marc-Andr\xC3\xA9 Lafortune"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-01 00:00:00 -04:00
+date: 2009-05-31 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -23,27 +23,36 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files: 
+- .document
+- .gitignore
 - CHANGELOG.rdoc
 - LICENSE
 - README.rdoc
 - Rakefile
 - 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/object.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

data/lib/backports/object.rb

@@ -1,37 +0,0 @@
-require 'enumerator'
-# 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
-
-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
-  end unless method_defined? :try
-
-  # Standard in ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/Object.html]
-  def tap
-    yield self
-    self
-  end unless method_defined? :tap
-
-  # Standard in rails. See official documentation[http://api.rubyonrails.org/classes/Object.html]
-  def returning(obj)
-    yield obj
-    obj
-  end unless method_defined? :returning
-  
-  # Standard in ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/Object.html]
-  def define_singleton_method(symbol, &block)
-    class << self
-      self
-    end.send(:define_method, symbol, block)
-  end unless method_defined? :define_singleton_method
-  
-  # Standard in ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/Object.html]
-  def instance_exec(*arg, &block)
-    define_singleton_method(:"temporary method for instance_exec", &block)
-    send(:"temporary method for instance_exec", *arg)
-  end unless method_defined? :instance_exec
-  
-end