detach 0.0.5 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5abfdee74c072d0045db1449206a1981f76fb981
-  data.tar.gz: 9d734361d833db8179dc65aa230ec7d0554c523d
+  metadata.gz: 70d08bcd4bfbae5a1aab1faa9900e26b0397ee1e
+  data.tar.gz: fcae820f173e8053c35e82c23f53fcac47e77668
 SHA512:
-  metadata.gz: 8237013c771426b631c600eeda141b69a93be5d00322a79d48ee790c26ad2e6dba6fa077fff37afd93c378640aafad44fcb39e031ddf6ace6ba3dc07893590e1
-  data.tar.gz: 05b0f1515d5ac61a891686be779f10c5b29cbfb63a5a92e0f15377fe2eb2bce3ca2e444d48d1c6274b8760654eb4e4b1da7376fffc883b15008f5d33bc0d1b2d
+  metadata.gz: 7742a36cc469786dc36c3aeea32a379f9d95fe6ce7c49bc072c1b331224baec0619e717a74a747b10bae20836bc10a11f2aa17776f3d786bcf429a98204c2e4a
+  data.tar.gz: 548716816c73bd3719737768c0f2f2bb3a43e78a17a37ba9b2c76ae072b02438569478d8500f368be37e21eb6ed906b6ab87dec5d49613196ebe249ca800c423

data/lib/detach.rb

@@ -44,11 +44,12 @@ module Detach
 
 		(score,best) = (public_methods+protected_methods+private_methods).grep(/^#{Regexp.escape(name)}\(/).collect {|candidate|
 			# extract paramters
-			params = /\((.*)\)/.match(candidate.to_s)[1].scan(/(\w+)-([\w:)]+)/).collect {|s,t|
+			params = /\((.*)\)/.match(candidate.to_s)[1].scan(/(\w+)-([\w:\)]+)/).collect {|s,t|
 				[s.to_sym, t.split(/::/).inject(Kernel) {|m,c| m = m.const_get(c)}]
 			}
 			# form the list of all required argument classes
 			ctypes = params.values_at(*params.each_index.select {|i| params[i].first == :req}).map(&:last)
+			nreq = ctypes.size
 
 			# NOTE: ruby only allows a single *args, or a list of a=1, b=2--not both together--
 			# only one of the following will execute
@@ -68,12 +69,21 @@ module Detach
 			elsif ctypes.size == args.size
 				score = args.map(&:class).zip(ctypes).inject(0) {|s,t| 
 					# apply each class comparison and require nonzero matches
-					s and ->(n) {s += n if n > 0}[ [ :==, :<=, ].select {|op| ->(a,&b) {b[*a]}[t, &op]}.size ]
+					if s
+						if t[0].ancestors.include?(t[1])
+							s += t[1].ancestors.size
+						else
+							s = nil
+						end
+					end
+
 				} || 0
 			else
 				score = 0
 			end
 
+			score += (1 + nreq) if args.size == params.size
+
 			[ score, candidate ]
 
 		}.max {|a,b| a[0] <=> b[0]}
@@ -96,10 +106,14 @@ module Detach
 		def taking
 			self
 		end
-		# :stopdoc:
+		# Provides list of type names to decorator.
 		def [](*types)
 			@@types = types.flatten
 		end
+		# Provides load-time method aliasing.
+		#
+		# All methods added to a class which are decorated as taking specified types
+		# are aliased in a form known and searched at run-time.
 		def method_added(name)
 			return unless @@types
 

data/test/test_detach.rb

@@ -19,7 +19,6 @@ class TestDetach < Test::Unit::TestCase
 	def testLists
 		assert_equal "Object List [\"one\", 2, 3.0, \"4\"]", Foo.new.foo('one', 2, 3.0, '4')
 		assert_equal "String List [\"one\", \"two\", \"three\", \"four\"]", Foo.new.foo('one', 'two', 'three', 'four')
-
 	end
 
 	def testMixedLists
@@ -45,6 +44,12 @@ class TestDetach < Test::Unit::TestCase
 		assert_equal "11", Wow.new(5, 6).to_s
 	end
 
+	def testDefinitionOrder
+		assert_equal "Nonce", Junk.new.foo
+		assert_equal "String one", Junk.new.foo('one')
+		assert_equal "String List [\"one\", \"two\", \"three\", \"four\"]", Junk.new.foo('one', 'two', 'three', 'four')
+	end
+
 
 	#
 	#  helper definitions
@@ -149,6 +154,30 @@ class TestDetach < Test::Unit::TestCase
 		end
 	end
 
+	class Junk
+		include Detach
+
+		taking[Object]
+		def foo(*a)
+			"Object List #{a}"
+		end
+
+		taking[String]
+		def foo(*a)
+			"String List #{a}"
+		end
+
+		taking[]
+		def foo
+			"Nonce"
+		end
+
+		taking[String]
+		def foo(a)
+			"String #{a}"
+		end
+
+	end
 
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: detach
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors:
 - Ryan Calhoun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-20 00:00:00.000000000 Z
+date: 2014-08-22 00:00:00.000000000 Z
 dependencies: []
 description: A mixin which separates method definitions by argument types, effectively
   allowing C++ or Java style overloading.