marcandre-backports 1.6.1 → 1.6.3

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 1
 :minor: 6
-:patch: 1
+:patch: 3

data/lib/backports/enumerator.rb

@@ -7,7 +7,7 @@ class Enumerator
     raise StopIteration unless @generator.next?
     @generator.next
   end unless method_defined? :next
-
+  
   def rewind
     require 'generator'
     @generator ||= Generator.new(self)
@@ -21,12 +21,12 @@ class Enumerator
       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

data/lib/backports/module.rb

@@ -21,7 +21,10 @@ class Module
     end
   end unless method_defined? :alias_method_chain
   
-  alias_method :module_exec, :instance_exec unless method_defined? :module_exec
+  # Can't use alias_method here because of jruby (see http://jira.codehaus.org/browse/JRUBY-2435 )
+  def module_exec(*arg, &block)
+    instance_exec(*arg, &block)
+  end unless method_defined? :module_exec
   alias_method :class_exec, :module_exec unless method_defined? :class_exec
   
   # Metaprogramming utility to make block optional.

data/lib/backports/object.rb

@@ -1,4 +1,6 @@
 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?
   
@@ -19,16 +21,17 @@ module Kernel # Did you know that object instance methods are defined in Kernel?
     obj
   end unless method_defined? :returning
   
-  Enumerator = Enumerable::Enumerator unless const_defined? :Enumerator # Standard in ruby 1.9
-  
+  # 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

data/lib/backports/string.rb

@@ -70,7 +70,7 @@ class String
   
   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
+      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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: marcandre-backports
 version: !ruby/object:Gem::Version 
-  version: 1.6.1
+  version: 1.6.3
 platform: ruby
 authors: 
 - "Marc-Andr\xC3\xA9 Lafortune"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-29 00:00:00 -07:00
+date: 2009-04-30 00:00:00 -07:00
 default_executable: 
 dependencies: []