functor 0.3.1 → 0.4.2

data/lib/functor.rb

@@ -1,4 +1,4 @@
-require 'lib/object'
+require "#{File.dirname(__FILE__)}/object"
 
 class Functor
   
@@ -37,28 +37,33 @@ class Functor
   end
   
   def apply( object, *args, &block )
-    object.instance_exec( *args, &match( *args, &block ) )
+    object.instance_exec( *args, &match( args, &block ) )
   end
   
   def call( *args, &block )
-    args.push( block ) if block_given?
-    match( *args, &block ).call( *args )
+    match( args, &block ).call( *args )
   end
   
   def to_proc ; lambda { |*args| self.call( *args ) } ; end
   
   private
   
-  def match( *args, &block )
-    args.push( block ) if block_given? 
-    pattern, action = @rules.find { | pattern, action | match?( args, pattern ) }
-    raise ArgumentError.new( "argument mismatch for argument(s): #{args.inspect}." ) unless action
-    return action
+  def match( args, &block )
+    args << block if block_given?
+    pattern, action = @rules.find { | p, a | match?( args, p ) }
+    action or raise argument_error( args )
   end
   
   def match?( args, pattern )
-    pattern.zip(args).all? { |x,y| x === y or x == y or 
-        ( x.respond_to?(:call) && x.call( y ) ) } if pattern.length == args.length
+    args.zip( pattern ).all? { | arg, rule | pair?( arg, rule ) } if args.length == pattern.length
+  end
+  
+  def pair?( arg, rule )
+    ( rule.is_a?( Proc ) and rule.call( arg ) ) or rule === arg or rule == arg
+  end
+  
+  def argument_error( args )
+    ArgumentError.new( "argument mismatch for argument(s): #{ args.map{ |arg| arg.inspect }.join(', ') }." )
   end
   
 end

data/test/guards.rb

@@ -1,15 +1,25 @@
 require 'test/helpers'
 
-stripe ||= Functor.new do
-  given( lambda { |x| x % 2 == 0 } ) { 'white' }
-  given( lambda { |x| x % 2 == 1 } ) { 'silver' }
-end
+describe "Dispatch should support guards" do
+  
+  before do
+    @stripe = Functor.new do
+      given( lambda { |x| x % 2 == 0 } ) { 'white' }
+      given( lambda { |x| x % 2 == 1 } ) { 'silver' }
+    end
 
-describe "Dipatch should support guards" do
+    @safe_divide = Functor.new do
+      given( lambda { |x| x == 0 }, Integer ) { |x,y| false }
+      given( Integer, Integer ) { |x,y| ( y / ( x * 1.0 )) }
+    end
+  end
   
-  specify "allowing you to use odd or even numbers as a dispatcher" do
-    [*0..9].map( &stripe ).should == %w( white silver ) * 5
+  specify "such as odd or even numbers" do
+    [*0..9].map( &@stripe ).should == %w( white silver ) * 5
   end
   
-end
+  specify "even with multiple arguments" do
+    @safe_divide.call( 0,7 ).should == false
+  end
   
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: functor
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.4.2
 platform: ruby
 authors: 
 - Dan Yoder
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-15 00:00:00 -07:00
+date: 2008-07-11 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -25,6 +25,35 @@ extra_rdoc_files: []
 
 files: 
 - doc/HISTORY
+- doc/rdoc
+- doc/rdoc/classes
+- doc/rdoc/classes/Functor
+- doc/rdoc/classes/Functor/Method.html
+- doc/rdoc/classes/Functor/Method.src
+- doc/rdoc/classes/Functor/Method.src/M000006.html
+- doc/rdoc/classes/Functor.html
+- doc/rdoc/classes/Functor.src
+- doc/rdoc/classes/Functor.src/M000001.html
+- doc/rdoc/classes/Functor.src/M000002.html
+- doc/rdoc/classes/Functor.src/M000003.html
+- doc/rdoc/classes/Functor.src/M000004.html
+- doc/rdoc/classes/Functor.src/M000005.html
+- doc/rdoc/classes/Object.html
+- doc/rdoc/classes/Object.src
+- doc/rdoc/classes/Object.src/M000007.html
+- doc/rdoc/created.rid
+- doc/rdoc/files
+- doc/rdoc/files/doc
+- doc/rdoc/files/doc/HISTORY.html
+- doc/rdoc/files/doc/README.html
+- doc/rdoc/files/lib
+- doc/rdoc/files/lib/functor_rb.html
+- doc/rdoc/files/lib/object_rb.html
+- doc/rdoc/fr_class_index.html
+- doc/rdoc/fr_file_index.html
+- doc/rdoc/fr_method_index.html
+- doc/rdoc/index.html
+- doc/rdoc/rdoc-style.css
 - doc/README
 - lib/functor.rb
 - lib/object.rb