@@ -18,5 +18,23 @@ module Clipper def size @signatures.size end + + def match(attribute_types, repository_types) + match = @signatures.detect do |signature| + signature.match?(attribute_types, repository_types) + end + + if match + match + else + raise MatchError.new(attribute_types, repository_types) + end + end + + class MatchError < StandardError + def initialize(attribute_types, repository_types) + super "No matching Signature found for #{attribute_types.inspect}:#{repository_types.inspect}" + end + end end # class TypeMap end # module Clipper \ No newline at end of file lib/clipper/type_map.rb @@ -7,11 +7,18 @@ class TypeMapTest < Test::Unit::TestCase typecast_left_procedure = lambda { |age| age.to_s } typecast_right_procedure = lambda { |age| age.to_i } - @signature = Clipper::TypeMap::Signature.new( + @signature_one = Clipper::TypeMap::Signature.new( [String], [Integer], - typecast_left_procedure, - typecast_right_procedure + lambda { |age| age.to_s }, + lambda { |age| age.to_i } + ) + + @signature_two = Clipper::TypeMap::Signature.new( + [String], + [String], + lambda { |name| name.to_s }, + lambda { |name| name.to_s } ) end @@ -24,7 +31,7 @@ class TypeMapTest < Test::Unit::TestCase def test_can_add_new_signatures typemap = Clipper::TypeMap.new assert_nothing_raised do - typemap << @signature + typemap << @signature_one end assert_raises(ArgumentError) do @@ -36,8 +43,8 @@ class TypeMapTest < Test::Unit::TestCase typemap = Clipper::TypeMap.new assert_nothing_raised do - typemap << @signature - typemap << @signature + typemap << @signature_one + typemap << @signature_one end assert_equal(1, typemap.size) @@ -52,14 +59,21 @@ class TypeMapTest < Test::Unit::TestCase typemap << duplicate assert_equal(1, typemap.size) - other = Clipper::TypeMap::Signature.new( - [String], - [String], - lambda { }, - lambda { } - ) - - typemap << other + typemap << @signature_two assert_equal(2, typemap.size) end + + def test_matching_signature + typemap = Clipper::TypeMap.new + typemap << @signature_one + typemap << @signature_two + + assert_nothing_raised do + assert(typemap.match([String], [Integer]).is_a?(Clipper::TypeMap::Signature)) + end + + assert_raises(Clipper::TypeMap::MatchError) do + typemap.match([Integer], [Integer]) + end + end end \ No newline at end of file tests/unit/type_map_test.rb 5b7e5ecfabc1f07fb1e66a0221777c20e49d87bd Sam Smoot ssmoot@gmail.com http://github.com/wiecklabs/clipper/commit/99d5ce0d9c50f1ebe54f607a35c69ca8dd41ba6d 99d5ce0d9c50f1ebe54f607a35c69ca8dd41ba6d 2009-06-23T09:09:58-07:00 2009-06-23T09:09:58-07:00 Finished up TypeMap. 312cdf287b616c8cc7431fa76ee12aa1a3a28dd2 Sam Smoot ssmoot@gmail.com