backports 2.0.3 → 2.1.0

data/README.rdoc

@@ -90,6 +90,8 @@ Additionally, the following Ruby 1.9 features have been backported:
 
 * Proc
   * +yield+
+  * +lambda?+
+  * +curry+
 
 * String
   * <tt>ascii_only?</tt>
@@ -177,6 +179,7 @@ Libraries have not been backported. I am aware of the following backport gems:
 Thanks for the bug reports and patches, in particular the repeat offenders:
 
 * Arto Bendiken ( bendiken[http://github.com/bendiken] )
+* Konstantin Haase ( rkh[https://github.com/rkh])
 * Roger Pack ( rdp[http://github.com/rdp] )
 
 The best way to submit a patch is to also submit a patch to RubySpec[https://github.com/rubyspec/rubyspec] and then a patch to backports that make it pass the spec. To test rubyspec along with backports, one way to test this is:

data/VERSION.yml

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

data/backports.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{backports}
-  s.version = "2.0.3"
+  s.version = "2.1.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{2011-03-28}
+  s.date = %q{2011-04-16}
   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}
@@ -72,6 +72,7 @@ Gem::Specification.new do |s|
      "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/proc.rb",
      "lib/backports/1.9.1/string.rb",
      "lib/backports/1.9.1/symbol.rb",
      "lib/backports/1.9.2.rb",
@@ -110,6 +111,7 @@ Gem::Specification.new do |s|
      "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",
@@ -119,7 +121,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.7}
+  s.rubygems_version = %q{1.6.0}
   s.summary = %q{Backports of Ruby 1.8.7+ for older ruby.}
   s.test_files = [
     "test/array_test.rb",
@@ -134,6 +136,7 @@ Gem::Specification.new do |s|
      "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",
@@ -141,7 +144,6 @@ Gem::Specification.new do |s|
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/lib/backports/1.9.1/proc.rb

@@ -0,0 +1,52 @@
+unless Proc.method_defined? :lambda?
+  class Proc
+    # Standard in Ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/Proc.html]
+    def lambda?
+      !!@is_lambda
+    end
+  end
+
+  class Method
+    def to_proc_with_lambda_tracking
+      proc = to_proc_without_lambda_tracking
+      proc.instance_variable_set :@is_lambda, true
+      proc
+    end
+    Backports.alias_method_chain self, :to_proc, :lambda_tracking
+  end
+
+  module Kernel
+    def lambda_with_lambda_tracking(&block)
+      Backports.track_lambda block, lambda_without_lambda_tracking(&block), true
+    end
+
+    def proc_with_lambda_tracking(&block)
+      Backports.track_lambda block, proc_without_lambda_tracking(&block)
+    end
+
+    Backports.alias_method_chain self, :lambda, :lambda_tracking
+    Backports.alias_method_chain self, :proc, :lambda_tracking
+  end
+end
+
+class Proc
+  # Standard in Ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/Proc.html]
+  def curry(argc = nil)
+    min_argc = arity < 0 ? -arity - 1 : arity
+    argc ||= min_argc
+    if lambda? and arity < 0 ? argc < min_argc : argc != arity
+      raise ArgumentError, "wrong number of arguments (#{argc} for #{min_argc})"
+    end
+    creator = lambda? ? :lambda : :proc
+    block = send(creator) do |*args|
+      if args.count >= argc
+        call(*args)
+      else
+        send(creator) do |*more_args|
+          args += more_args
+          block.call(*args)
+        end
+      end
+    end
+  end unless method_defined? :curry
+end

data/lib/backports/tools.rb

@@ -175,6 +175,14 @@ module Backports
     end
   end
 
+  # Used internally to propagate #lambda?
+  def self.track_lambda(from, to, default = false)
+    is_lambda = from.instance_variable_get :@is_lambda
+    is_lambda = default if is_lambda.nil?
+    to.instance_variable_set :@is_lambda, is_lambda
+    to
+  end
+
   # A simple class which allows the construction of Enumerator from a block
   class Yielder
     def initialize(&block)

data/test/proc_test.rb

@@ -0,0 +1,116 @@
+require 'test_helper'
+
+class ProcTest < Test::Unit::TestCase
+  # method names correspond with Ruby docs
+  def n(&b) b.lambda? end
+  def m() end
+
+  class C
+    define_method(:d) {}
+    define_method(:e, &proc {})
+  end
+
+  def implicit
+    Proc.new
+  end
+
+  context "Proc" do
+    context "#lambda?" do
+      context "basic usage" do
+        should "conform to docs" do
+          assert lambda {}.lambda?
+          assert !proc {}.lambda?
+          assert !Proc.new {}.lambda?
+        end
+      end
+
+      context "propagation" do
+        should "conform to docs" do
+          assert lambda(&lambda {}).lambda?
+          assert proc(&lambda {}).lambda?
+          assert Proc.new(&lambda {}).lambda?
+        end
+      end
+
+      context "blocks passed to methods" do
+        should "conform to docs" do
+          assert !n { }
+          assert n(&lambda {})
+          assert !n(&proc {})
+          assert !n(&Proc.new {})
+        end
+
+        should "not break Proc.new" do
+          implicit { }
+          implicit(&proc {})
+        end
+      end
+
+      context "Method#to_proc" do
+        should "conform to docs" do
+          assert method(:m).to_proc.lambda?
+          assert n(&method(:m))
+          assert n(&method(:m).to_proc)
+          assert C.new.method(:d).to_proc.lambda?
+          assert C.new.method(:e).to_proc.lambda?
+        end
+      end
+    end
+
+    context "#curry" do
+      context "proc" do
+        context "no arguments" do
+          should "conform to docs" do
+            b = proc { :foo }
+            assert_equal :foo, b.curry[]
+          end
+        end
+
+        context "arity > 0" do
+          should "conform to docs" do
+            b = Proc.new {|x, y, z| (x||0) + (y||0) + (z||0) }
+            assert_equal 6, b.curry[1][2][3]
+            assert_equal 6, b.curry[1, 2][3, 4]
+            assert_equal 6, b.curry(5)[1][2][3][4][5]
+            assert_equal 6, b.curry(5)[1, 2][3, 4][5]
+            assert_equal 1, b.curry(1)[1]
+          end
+        end
+
+        context "arity < 0" do
+          should "conform to docs" do
+            b = Proc.new {|x, y, z, *w| (x||0) + (y||0) + (z||0) + w.inject(0, &:+) }
+            assert_equal 6,  b.curry[1][2][3]
+            assert_equal 10, b.curry[1, 2][3, 4]
+            assert_equal 15, b.curry(5)[1][2][3][4][5]
+            assert_equal 15, b.curry(5)[1, 2][3, 4][5]
+            assert_equal 1,  b.curry(1)[1]
+          end
+        end
+      end
+
+      context "lambda" do
+        context "arity > 0" do
+          should "conform to docs" do
+            b = lambda {|x, y, z| (x||0) + (y||0) + (z||0) }
+            assert_equal 6, b.curry[1][2][3]
+            assert_raises(ArgumentError) { b.curry[1, 2][3, 4] }
+            assert_raises(ArgumentError) { b.curry(5) }
+            assert_raises(ArgumentError) { b.curry(1) }
+          end
+        end
+
+        context "arity < 0" do
+          should "conform to docs" do
+            b = lambda {|x, y, z, *w| (x||0) + (y||0) + (z||0) + w.inject(0, &:+) }
+            assert_equal 6,  b.curry[1][2][3]
+            assert_equal 10, b.curry[1, 2][3, 4]
+            assert_equal 15, b.curry(5)[1][2][3][4][5]
+            assert_equal 15, b.curry(5)[1, 2][3, 4][5]
+            assert_raises(ArgumentError) { b.curry(1) }
+          end
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: backports
 version: !ruby/object:Gem::Version 
-  hash: 9
-  prerelease: false
+  hash: 11
+  prerelease: 
   segments: 
   - 2
+  - 1
   - 0
-  - 3
-  version: 2.0.3
+  version: 2.1.0
 platform: ruby
 authors: 
 - "Marc-Andr\xC3\xA9 Lafortune"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-28 00:00:00 -04:00
+date: 2011-04-16 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -83,6 +83,7 @@ files:
 - 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/proc.rb
 - lib/backports/1.9.1/string.rb
 - lib/backports/1.9.1/symbol.rb
 - lib/backports/1.9.2.rb
@@ -121,6 +122,7 @@ files:
 - 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
@@ -161,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: backports
-rubygems_version: 1.3.7
+rubygems_version: 1.6.0
 signing_key: 
 specification_version: 3
 summary: Backports of Ruby 1.8.7+ for older ruby.
@@ -178,6 +180,7 @@ test_files:
 - 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