lambda_driver 1.2.0 → 1.2.1

data/lib/lambda_driver.rb

@@ -1,5 +1,5 @@
+# -*- encoding : utf-8 -*-
 require "lambda_driver/version"
-
 Dir["#{File.dirname(__FILE__)}/lambda_driver/*.rb"].sort.each do |path|
   next if File.basename(path, '.rb') == 'core_ext'
   require "lambda_driver/#{File.basename(path, '.rb')}"

data/lib/lambda_driver/callable.rb

@@ -1,94 +1,11 @@
+# -*- encoding : utf-8 -*-
 module LambdaDriver::Callable
 
-  def call(*args, &block)
+  def <(*args, &block)
     if block_given?
       self.to_proc.call(*args, &block)
     else
       self.to_proc.call(*args)
     end
   end
-
-  # Returns new lambda which composed self and given function.
-  # A composed proc called with args, executes `self.(g(*args)).
-  #
-  #   f = lamdba{|x| x.to_s }
-  #   g = lambda{|y| y.length }
-  #   h = f compose g
-  #   h.(:hoge) # => 4
-  #
-  # This method is aliased as `<<`.
-  #
-  #   f << g # => f.compose(g)
-  #
-  def compose(g)
-    lambda{|*args| self.to_proc.call(g.to_proc.call(*args)) }
-  end
-
-  # g compose self
-  def >>(g)
-    g.to_proc << self
-  end
-
-  # Returns partially applied function that has 2nd and more parameters
-  # fixed by given *args.
-  #
-  #   f = lamdba{|x, y, z| [x, y, z]}
-  #   h = f.with_args(:a, :b)
-  #   h.(:c) # => [:c, :a, :b]
-  #
-  # This method is aliased as `*`.
-  #
-  #   f * :foo  # => f.with_args(:foo)
-  #
-  def with_args(*args)
-    lambda{|v|
-      self.to_proc.call(*([v] + args))
-    }
-  end
-
-  # Returns function whose parameter order spawed 1st for 2nd.
-  # A result of filped fuction is curried by Proc#curry.
-  #
-  #   f = lamdba{|x, y, z| [x, y, z]}
-  #   h = f.flip
-  #   h.(:a).(:b).(:c) # => [:b, :a, :c]
-  #
-  # If arguments is var-args, pass explicitly arity to curring.
-  #
-  #   p = Proc.new{|*args| args.inspect }
-  #   p.flip(3).call(:a).(:b).(:c)      # => "[:b, :a, :c]"
-  #   p.flip(4).call(:a).(:b).(:c).(:d) # => "[:b, :a, :c, :d]"
-  #
-  # If arity is 0 or 1, flip returns itself.
-  #
-  # This method is aliased as `~@`.
-  #
-  #   ~f # => f.filp
-  #
-  def flip(arity = nil)
-    f = self.to_proc
-    return self if (0..1).include?(f.arity)
-    return self if f.arity == -1 && arity.nil?
-
-    curried = f.curry(arity)
-    lambda{|x|
-      lambda{|y|
-        g = curried[y]
-        (g.respond_to? :call) ? g[x] : g
-      }
-    }
-  end
-
-  def curry(arity = nil)
-    self.to_proc.curry(arity)
-  end
-
-  def self.included(klass)
-    klass.send(:alias_method, :+@, :to_proc)
-    klass.send(:alias_method, :<,  :call)
-    klass.send(:alias_method, :<<, :compose)
-    klass.send(:alias_method, :*,  :with_args)
-    klass.send(:alias_method, :~@, :flip)
-    klass.send(:alias_method, :%, :curry)
-  end
 end

data/lib/lambda_driver/composable.rb

@@ -0,0 +1,27 @@
+# -*- encoding : utf-8 -*-
+module LambdaDriver::Composable
+  # Returns new lambda which composed self and given function.
+  # A composed proc called with args, executes `self.(g(*args)).
+  #
+  #   f = lamdba{|x| x.to_s }
+  #   g = lambda{|y| y.length }
+  #   h = f compose g
+  #   h.(:hoge) # => 4
+  #
+  # This method is aliased as `<<`.
+  #
+  #   f << g # => f.compose(g)
+  #
+  def compose(g)
+    lambda{|*args| self.to_proc.call(g.to_proc.call(*args)) }
+  end
+
+  # g compose self
+  def >>(g)
+    g.to_proc << self
+  end
+
+  def self.included(klass)
+    klass.send(:alias_method, :<<, :compose)
+  end
+end

data/lib/lambda_driver/core_ext.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 Dir["#{File.dirname(__FILE__)}/core_ext/*.rb"].sort.each do |path|
   require "lambda_driver/core_ext/#{File.basename(path, '.rb')}"
 end

data/lib/lambda_driver/core_ext/class.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 class Class
   alias_method :/, :instance_method
 end

data/lib/lambda_driver/core_ext/method.rb

@@ -1,5 +1,10 @@
+# -*- encoding : utf-8 -*-
 class Method
   include LambdaDriver::Callable
-  include LambdaDriver::Currying if RUBY_VERSION < '1.9.0'
+  include LambdaDriver::Composable
+  include LambdaDriver::WithArgs
+  include LambdaDriver::Flipable
+  include LambdaDriver::ProcConvertable
+  include LambdaDriver::Currying
   include LambdaDriver::Liftable
 end

data/lib/lambda_driver/core_ext/object.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 class Object
   include LambdaDriver::Op::Proxy
   include LambdaDriver::Revapply

data/lib/lambda_driver/core_ext/proc.rb

@@ -1,5 +1,10 @@
+# -*- encoding : utf-8 -*-
 class Proc
   include LambdaDriver::Callable
-  include LambdaDriver::Currying if RUBY_VERSION < '1.9.0'
+  include LambdaDriver::Composable
+  include LambdaDriver::WithArgs
+  include LambdaDriver::Flipable
+  include LambdaDriver::ProcConvertable
+  include LambdaDriver::Currying
   include LambdaDriver::Liftable
 end

data/lib/lambda_driver/core_ext/symbol.rb

@@ -1,6 +1,12 @@
+# -*- encoding : utf-8 -*-
 class Symbol
   include LambdaDriver::Callable
-  include LambdaDriver::Currying if RUBY_VERSION < '1.9.0'
+  include LambdaDriver::Composable
+  include LambdaDriver::WithArgs
+  include LambdaDriver::Flipable
+  include LambdaDriver::ProcConvertable
+  include LambdaDriver::Currying
+  include LambdaDriver::Liftable
 
   def to_method
     lambda{|obj| obj._(self) }

data/lib/lambda_driver/core_ext/unbound_method.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 class UnboundMethod
   alias_method :<, :bind
 end

data/lib/lambda_driver/currring.rb

@@ -0,0 +1,10 @@
+# -*- encoding : utf-8 -*-
+module LambdaDriver::Curring
+  def curry(arity = nil)
+    self.to_proc.curry(arity)
+  end
+
+  def self.included(klass)
+    klass.send(:alias_method, :%, :curry)
+  end
+end

data/lib/lambda_driver/currying.rb

@@ -1,10 +1,18 @@
+# -*- encoding : utf-8 -*-
 module LambdaDriver::Currying
-  def curry(arity = nil)
-    f = self.to_proc
-    arity ||= __arity(f)
-    return f if arity == 0
 
-    lambda{|arg| __curry(f, arity, arg, []) }
+  if RUBY_VERSION < '1.9.0'
+    def curry(arity = nil)
+      f = self.to_proc
+      arity ||= __arity(f)
+      return f if arity == 0
+
+      lambda{|arg| __curry(f, arity, arg, []) }
+    end
+  else
+    def curry(arity = nil)
+      self.to_proc.curry(arity)
+    end
   end
 
   private
@@ -17,4 +25,9 @@ module LambdaDriver::Currying
       return f.call(*args) if arity == 1
       lambda{|arg| __curry(f, arity - 1, arg, args) }
     end
+
+
+  def self.included(klass)
+    klass.send(:alias_method, :%, :curry)
+  end
 end

data/lib/lambda_driver/disjunction.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module LambdaDriver::Disjunction
   def disjunction(f = nil, &block)
     if f.nil? && (not block_given?)

data/lib/lambda_driver/flipable.rb

@@ -0,0 +1,39 @@
+# -*- encoding : utf-8 -*-
+module LambdaDriver::Flipable
+  # Returns function whose parameter order spawed 1st for 2nd.
+  # A result of filped fuction is curried by Proc#curry.
+  #
+  #   f = lamdba{|x, y, z| [x, y, z]}
+  #   h = f.flip
+  #   h.(:a).(:b).(:c) # => [:b, :a, :c]
+  #
+  # If arguments is var-args, pass explicitly arity to curring.
+  #
+  #   p = Proc.new{|*args| args.inspect }
+  #   p.flip(3).call(:a).(:b).(:c)      # => "[:b, :a, :c]"
+  #   p.flip(4).call(:a).(:b).(:c).(:d) # => "[:b, :a, :c, :d]"
+  #
+  # If arity is 0 or 1, flip returns itself.
+  #
+  # This method is aliased as `~@`.
+  #
+  #   ~f # => f.filp
+  #
+  def flip(arity = nil)
+    f = self.to_proc
+    return self if (0..1).include?(f.arity)
+    return self if f.arity == -1 && arity.nil?
+
+    curried = f.curry(arity)
+    lambda{|x|
+      lambda{|y|
+        g = curried[y]
+        (g.respond_to? :call) ? g[x] : g
+      }
+    }
+  end
+
+  def self.included(klass)
+    klass.send(:alias_method, :~@, :flip)
+  end
+end

data/lib/lambda_driver/liftable.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module LambdaDriver::Liftable
 
   # compose self and give fuction with checking g(x) is mzero.

data/lib/lambda_driver/mzero.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module LambdaDriver::Mzero
   def mzero?
     mzero_method = self.respond_to?(:empty?) ? :empty? : :nil?

data/lib/lambda_driver/op.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module LambdaDriver::Op
   module Proxy
     def _(method = nil)

data/lib/lambda_driver/proc_convertable.rb

@@ -0,0 +1,6 @@
+# -*- encoding : utf-8 -*-
+module LambdaDriver::ProcConvertable
+  def self.included(klass)
+    klass.send(:alias_method, :+@, :to_proc)
+  end
+end

data/lib/lambda_driver/revapply.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module LambdaDriver::Revapply
   def revapply(f = nil, &block)
     if f.nil? && (not block_given?)

data/lib/lambda_driver/version.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module LambdaDriver
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end

data/lib/lambda_driver/with_args.rb

@@ -0,0 +1,24 @@
+# -*- encoding : utf-8 -*-
+module LambdaDriver::WithArgs
+
+  # Returns partially applied function that has 2nd and more parameters
+  # fixed by given *args.
+  #
+  #   f = lamdba{|x, y, z| [x, y, z]}
+  #   h = f.with_args(:a, :b)
+  #   h.(:c) # => [:c, :a, :b]
+  #
+  # This method is aliased as `*`.
+  #
+  #   f * :foo  # => f.with_args(:foo)
+  #
+  def with_args(*args)
+    lambda{|v|
+      self.to_proc.call(*([v] + args))
+    }
+  end
+
+  def self.included(klass)
+    klass.send(:alias_method, :*,  :with_args)
+  end
+end

data/spec/class_spec.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require 'spec_helper'
 
 describe 'class' do

data/spec/disjunction_spec.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require 'spec_helper'
 
 describe LambdaDriver::Disjunction do

data/spec/lambda_spec.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require 'spec_helper'
 
 describe 'lambda' do
@@ -54,6 +55,7 @@ describe 'lambda' do
     subject { lambda{|x| x.to_s + "_f"} }
 
     it_should_behave_like 'call'
+    it_should_behave_like 'call(<)'
   end
 
   describe 'ailases' do

data/spec/method_spec.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require 'spec_helper'
 
 describe Method do
@@ -74,6 +75,9 @@ describe Method do
     it_should_behave_like 'call' do
       let(:x) { "foo" }
     end
+    it_should_behave_like 'call(<)' do
+      let(:x) { "foo" }
+    end
   end
 
   describe 'ailases' do

data/spec/op_spec.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require 'spec_helper'
 
 shared_examples_for 'method_or_lambda' do |label|

data/spec/proc_spec.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require 'spec_helper'
 
 describe Proc do
@@ -54,6 +55,7 @@ describe Proc do
     subject { Proc.new{|x| x.to_s + "_f"} }
 
     it_should_behave_like 'call'
+    it_should_behave_like 'call(<)'
   end
 
   describe 'ailases' do

data/spec/revapply_spec.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require 'spec_helper'
 
 describe LambdaDriver::Revapply do

data/spec/shared/composable_spec.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require 'spec_helper'
 
 shared_examples_for 'composable' do
@@ -93,7 +94,7 @@ shared_examples_for 'flip(arity=1)' do
   }
 
   it(' f.flip.call(x) returns proc ') {
-    subject.flip.call(y) == subject.call(y)
+    subject.flip.to_proc.call(y) == subject.to_proc.call(y)
   }
 end
 
@@ -106,7 +107,7 @@ shared_examples_for 'flip(varargs)' do
   }
 
   it('f.flip(2).call(x) returns proc ') {
-    subject.flip(2).call(y) == subject.call(y)
+    subject.flip(2).call(y) == subject.to_proc.call(y)
   }
 
   it('~f.flip(2).call(x).call(y) should be f.call(y,x)'){
@@ -151,16 +152,21 @@ end
 
 shared_examples_for 'call' do
   it { should respond_to :call}
-  it { should respond_to :<}
 
   let(:x) { :foo }
 
   it('f.call(x) == f.call(x)'){
     subject.call(x).should == subject.call(x)
   }
+end
+
+shared_examples_for 'call(<)' do
+  it { should respond_to :<}
+
+  let(:x) { :foo }
 
   it('(f < x) == f.call(x)'){
-    (subject < x).should == subject.call(x)
+    (subject < x).should == subject.to_proc.call(x)
   }
 end
 
@@ -170,7 +176,7 @@ shared_examples_for 'aliases' do
   let(:g) { lambda{|x| (x.to_s * 2).to_s + "_g" } }
 
   it('(~f < x) should be f.flip.call(x)'){
-    (~subject < x).should == subject.flip.call(x)
+    (~subject < x).should == subject.flip.to_proc.call(x)
   }
 
   it('(f << g < x) should f.compose(g).call(x)'){

data/spec/shared/liftable.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require 'spec_helper'
 
 shared_examples_for 'liftable' do

data/spec/spec_helper.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 # This file was generated by the `rspec --init` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
 # Require this file using `require "spec_helper.rb"` to ensure that it is only

data/spec/symbol_spec.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require 'spec_helper'
 
 describe Symbol do
@@ -46,7 +47,7 @@ describe Symbol do
   describe '#call' do
     subject { :to_s }
 
-    it_should_behave_like 'call'
+    it_should_behave_like 'call(<)'
   end
 
   describe 'ailases' do

data/spec/unbound_method_spec.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require 'spec_helper'
 
 describe UnboundMethod do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lambda_driver
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-28 00:00:00.000000000 Z
+date: 2014-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -44,6 +44,7 @@ files:
 - lambda_driver.gemspec
 - lib/lambda_driver.rb
 - lib/lambda_driver/callable.rb
+- lib/lambda_driver/composable.rb
 - lib/lambda_driver/core_ext.rb
 - lib/lambda_driver/core_ext/class.rb
 - lib/lambda_driver/core_ext/method.rb
@@ -51,13 +52,17 @@ files:
 - lib/lambda_driver/core_ext/proc.rb
 - lib/lambda_driver/core_ext/symbol.rb
 - lib/lambda_driver/core_ext/unbound_method.rb
+- lib/lambda_driver/currring.rb
 - lib/lambda_driver/currying.rb
 - lib/lambda_driver/disjunction.rb
+- lib/lambda_driver/flipable.rb
 - lib/lambda_driver/liftable.rb
 - lib/lambda_driver/mzero.rb
 - lib/lambda_driver/op.rb
+- lib/lambda_driver/proc_convertable.rb
 - lib/lambda_driver/revapply.rb
 - lib/lambda_driver/version.rb
+- lib/lambda_driver/with_args.rb
 - spec/class_spec.rb
 - spec/disjunction_spec.rb
 - spec/lambda_spec.rb
@@ -82,18 +87,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -920517596245893888
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -920517596245893888
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23