defmatch 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 808ffbab0823cd56fcf58947e9a4069a9a0eaace
-  data.tar.gz: 24a6775f4a3104fd9e8eb11dccfac5994d32c38f
+  metadata.gz: 31f145fc6e1eb79e17023f0857c7aa0743d21635
+  data.tar.gz: ee52c39e0f841cc70ef1724453b524084463b88a
 SHA512:
-  metadata.gz: a2f969d8e6555eeca144d12a147c78bdeb09032aecd05c18e4bcea029c548811836f881ead8e66a438d2f3db06eb7de557c2d6e38097e5f539debd3d6bb50da7
-  data.tar.gz: ec2832a06d1851b00105e4dbc52b4f09a66ea14942e42fc4f1c9e08d3d48fc9d56f9a910b01bcc2a362e0f4f3ae7177f21d84eeb40632170aa85f0e8d28d990c
+  metadata.gz: 28cb8b2f285d1befe9ec3e5fea7be53e5c55244499f497a976463ce2662fd79dc42eb610e7e95026ed3af2318428d4cbd282af4736817053c37f3a74f39ad2ee
+  data.tar.gz: f33a33c7ac4dd4bbe779d3c056bf0e2c39ebc7f2925f978cefa39b2a259be92e092427ea8c0c09d658398055968cf128ffa334fae16d77390fd318107bd4d142

data/README.md

@@ -85,6 +85,5 @@ Even if I run ```x.magic(1)``` I will get ```2``` as the result. The second defm
 
 ## Roadmap
 
-* Add defclassmatch for class methods
 * Add parameter deconstruction
 * Add it to the Kernel so it's available without having to include things. This will require ruby 2.0 and I'm not prepared to kill backwards compatability yet.

data/lib/defmatch/version.rb

@@ -1,3 +1,3 @@
 module Defmatch
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/defmatch.rb

@@ -10,25 +10,36 @@ module Defmatch
         lambda {|param| param == arg }
       end
     end
-    lambda do |*args|
-      test = true;
-      param_test_pairs = args.zip(tests)
-      param_test_pairs.each {|pair| if (pair[1].nil? or (pair[1].call(pair[0]) == false)); test = false; break; end; }
-      return test
+    lambda do |*targs|
+      if targs.size != tests.size # short circuit any testing if the airity doesn't match
+        return false
+      elsif targs.size > 0 # when the airity matches and there are arguments run the tests
+        test = true;
+        param_test_pairs = targs.zip(tests)
+        param_test_pairs.each {|pair| if (pair[1].nil? or (pair[1].call(pair[0]) == false)); test = false; break; end; }
+        return test
+      elsif tests.size == 0 # When arguments given are empty and the tests array is empty
+        return true
+      else # When the arguments given are empty but the tests array is Not empty
+        return false
+      end
     end
   end
 
   def defmatch(method,*args,&block)
     @defmatch_dispatch_info ||= {} # setup the methods in an instance variable
     @defmatch_dispatch_info[method] ||= [] # setup the ordered array for the method the first time
-    @defmatch_dispatch_info[method] << {:test => Defmatch.signiture_match(method,args), :block => block} # add the hash for the test proc and the run proc (block given) to the list of matchers
+    # add the hash for the test proc and the run proc (block given) to the list of matchers
+    @defmatch_dispatch_info[method] << {
+      :test => Defmatch.signiture_match(method,args),
+      :block => block}
 
     # define dispatch method the first time
-    unless respond_to?(method)
+    unless self.instance_methods.include?(method)
       self.send(:define_method,method) do |*args|
         self.class.instance_variable_get(:@defmatch_dispatch_info)[method].each do |hash|
           if hash[:test].call(*args)
-           return self.instance_exec(*args,&hash[:block])
+            return self.instance_exec(*args,&hash[:block])
           end
         end
         raise ArgumentError, "No function clause matching arguments"
@@ -37,5 +48,26 @@ module Defmatch
 
   end
 
-end
+  # Lost of duplication between this and defmatch, but the rule is 1,2,n and we haven't hit n
+  def defclassmatch(method,*args,&block)
+    @defclassmatch_dispatch_info ||= {} # setup the methods in an instance variable
+    @defclassmatch_dispatch_info[method] ||= [] # setup the ordered array for the method the first time
+    @defclassmatch_dispatch_info[method] << {:test => Defmatch.signiture_match(method,args), :block => block} # add the hash for the test proc and the run proc (block given) to the list of matchers
+
+    # define dispatch method the first time
+    unless respond_to?(method)
+      eigenclass = class << self; self; end
+      eigenclass.instance_eval do
+        define_method(method) do |*args|
+          self.instance_variable_get(:@defclassmatch_dispatch_info)[method].each do |hash|
+            if hash[:test].call(*args)
+              return self.instance_exec(*args,&hash[:block])
+            end
+          end
+          raise ArgumentError, "No function clause matching arguments"
+        end
+      end
+    end
+  end
 
+end

data/spec/defmatch_spec.rb

@@ -11,20 +11,42 @@ describe Defmatch do
     defmatch(:times,1) {|num| puts "this should never get run"; num }
     defmatch(:times,"matchme") {|string| "matched literal #{string}" }
     defmatch(:times,String) {|string| string*2 }
+    defmatch(:times) { "no args" }
+
+    defmatch(:scope) { self }
+
+    defclassmatch(:cscope) { self }
   end
 
-  it 'creates a method' do
+  it 'should create methods' do
     expect(Tester).to respond_to(:defmatch)
+    expect(Tester).to respond_to(:defclassmatch)
   end
 
   it 'should have an instance method "times"' do
     expect(Tester.new).to respond_to(:times)
   end
 
+  it 'should have an instance method "scope"' do
+    expect(Tester.new).to respond_to(:scope)
+  end
+
+  it 'should have a class method "cscope"' do
+    expect(Tester).to respond_to(:cscope)
+  end
+
+  it '\'s blocks should have the proper scope' do
+    expect(Tester.cscope).to equal(Tester)
+  end
+
   instance = Tester.new
 
   describe instance do
 
+    it '\'s blocks should have the correct scope' do
+      expect(instance.scope).to equal(instance)
+    end
+
     it 'should handle an integer' do
       expect(instance.times(4)).to equal(8)
     end
@@ -33,6 +55,10 @@ describe Defmatch do
       expect(instance.times([1,2,3,4])).to eq([2,4,6,8])
     end
 
+    it 'should handle a string' do
+      expect(instance.times("a")).to eq("aa")
+    end
+
     it 'should match a basic proc matcher' do
       expect(instance.times(:asdf)).to equal(:asdf)
     end
@@ -41,6 +67,10 @@ describe Defmatch do
       expect(instance.times("matchme")).to eq("matched literal matchme")
     end
 
+    it 'should match on no arguments' do
+      expect(instance.times).to eq("no args")
+    end
+
     it 'should run the first valid match based on defmatch declaration order' do
       expect(instance.times(1)).to equal(2)
       expect(instance.times("matchme")).to eq("matched literal matchme")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: defmatch
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Max Warnock