multimethod 0.2.1 → 0.2.2

data/ChangeLog

@@ -1,12 +1,17 @@
+2006-12-02  Kurt A. Stephens  <kurt@umleta.com>
+
+	* Fixed non-alpha method names.
+
 2006-12-01  Kurt A. Stephens  <kurt@umleta.com>
 
 	* Fixed ambigous method testing.
 	
 2006-11-29  Kurt A. Stephens  <kurt@umleta.com>
 
-	* Major cleanup and documentation
+	* Major cleanup and documentation.
 	* Fixed default parameter scoring.
 
 2006-11-18  Kurt A. Stephens  <kurt@umleta.com>
 
-	* Initial release
+	* Initial release.
+	

data/README.txt

@@ -8,9 +8,9 @@ gem install multimethod
 
 == Documentation
 
-"Project Info":http://rubyforge.org/projects/multimethod/
+{Project Info}:http://rubyforge.org/projects/multimethod/
 
-"API Documentation":http://multimethod.rubyforge.org/
+{API Documentation}:http://multimethod.rubyforge.org/
 
 The RubyForge package multimethod
 implements multi-method dispatching on argument types.

data/Rakefile

@@ -1,6 +1,16 @@
 # Rakefile for ruby-multimethods      -*- ruby -*-
 # Adapted from RubyGems/Rakefile
-# upload_package NOT WORKING YET
+
+# For release
+"
+svn status
+rake update_version
+rake package
+rake release VERSION=x.x.x
+rake svn_release
+rake publish_docs
+rake announce
+"
 
 #################################################################
 

data/Releases.txt

@@ -1,5 +1,9 @@
 = Multimethod Release History
 
+== Release 0.2.2: 2006/12/02
+
+* Fixed non-alpha method names.
+
 == Release 0.2.1: 2006/12/01
 
 * Fixed ambiguous method testing.
@@ -26,3 +30,4 @@
 * Initial Release
 * TODO
   * Fix how default parameters are scored.
+

data/lib/multimethod/multimethod_version.rb

@@ -2,5 +2,5 @@ module Multimethod
 # DO NOT EDIT
 # This file is auto-generated by build scripts.
 # See:  rake update_version
-  MultimethodVersion = '0.2.1'
+  MultimethodVersion = '0.2.2'
 end

data/lib/multimethod/signature.rb

@@ -109,16 +109,24 @@ module Multimethod
 
       str.sub!(/\A\s+/, '')
 
-      if md = /\A(\w+(::\w+)*)#(\w+)/.match(str)
+      if @mod && md = /\Adef\s+(self\.)?([^\s\(]+)/.match(str)
+        str = md.post_match
+        @class_method = ! ! md[1]
+        @name = md[2]
+      elsif @mod && md = /\A(self\.)?([^\s\(]+)/.match(str)
+        str = md.post_match
+        @class_method = ! ! md[1]
+        @name = md[2]
+      elsif md = /\A(\w+(::\w+)*)#([^\s\(]+)/.match(str)
         str = md.post_match
         @mod = md[1] unless @mod
         @name = md[3]
-      elsif md = /\A(\w+(::\w+)*)\.(\w+)/.match(str)
+      elsif md = /\A(\w+(::\w+)*)\.([^\s\(]+)/.match(str)
         str = md.post_match
         @mod = md[1] unless @mod
         @class_method = true
         @name = md[3]
-      elsif md  = /\A((\w+(::\w+)*)\s+)?def\s+(self\.)?(\w+)/.match(str)
+      elsif md = /\A((\w+(::\w+)*)\s+)?def\s+(self\.)?([^\s\(]+)/.match(str)
         str = md.post_match
         @mod = md[2] unless @mod
         @class_method = ! ! md[4]

data/test/signature_test.rb

@@ -123,6 +123,14 @@ module Multimethod
     end
 
 
+    def test_scan_string_mod
+      assert_not_nil m1 = Signature.new(:mod => Object, :string => 'm(A a, B b, c = nil, *d)')
+
+      assert_signature m1
+      assert ! m1.class_method
+    end
+
+
     def test_scan_string_class_method
       assert_not_nil m1 = Signature.new(:string => 'Object.m(A a, B b, c = nil, *d)')
 
@@ -149,6 +157,7 @@ module Multimethod
       assert_equal     'call_method(foo(bar, "45,67"), \',\')', m1.parameter[2].default
     end
 
+
     def test_scan_default_at_end
       assert_not_nil m1 = Signature.new(:string => 'Object.m(A a, B b = call_method(foo(bar, "45,67"), \',\'), c = nil)')
 
@@ -159,6 +168,37 @@ module Multimethod
     end
 
 
+    def test_scan_special_chars
+      assert_not_nil  m1 = Signature.new(:string => 'A#+(A a)')
+      assert_equal    '+', m1.name
+      assert          ! m1.class_method
+      assert_equal    2, m1.parameter.size
+      assert_equal    ::A, m1.parameter[0].type_object
+      assert_equal    ::A, m1.parameter[1].type_object
+
+
+      assert_not_nil  m1 = Signature.new(:string => 'A#foo=(A a)')
+      assert_equal    'foo=', m1.name
+      assert          ! m1.class_method
+      assert_equal    2, m1.parameter.size
+      assert_equal    ::A, m1.parameter[0].type_object
+      assert_equal    ::A, m1.parameter[1].type_object
+
+      assert_not_nil  m1 = Signature.new(:string => 'String#sub!(Regexp a)')
+      assert_equal    'sub!', m1.name
+      assert          ! m1.class_method
+      assert_equal    2, m1.parameter.size
+      assert_equal    ::String, m1.parameter[0].type_object
+      assert_equal    ::Regexp, m1.parameter[1].type_object
+
+      assert_not_nil  m1 = Signature.new(:string => 'String#empty?')
+      assert_equal    'empty?', m1.name
+      assert          ! m1.class_method
+      assert_equal    1, m1.parameter.size
+      assert_equal    ::String, m1.parameter[0].type_object
+    end
+
+
     def test_cmp
       assert_not_nil m1 = Signature.new(:string => 'Object#m(A a, B b, c = nil, *d)')
       assert_not_nil m2 = Signature.new(:string => 'Object#m(A a, B b, c = nil, *d)')

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: multimethod
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
-date: 2006-12-01 00:00:00 -05:00
+  version: 0.2.2
+date: 2006-12-04 00:00:00 -05:00
 summary: "Supports Multimethod dispatching.  For more details, see:  http://multimethod.rubyforge.org/files/lib/multimethod_rb.html  http://multimethod.rubyforge.org/files/README.txt http://multimethod.rubyforge.org/"
 require_paths: 
 - lib