map 1.6.0 → 1.7.0

data/lib/map.rb

@@ -1,5 +1,5 @@
 class Map < Hash
-  Version = '1.6.0' unless defined?(Version)
+  Version = '1.7.0' unless defined?(Version)
   Load = Kernel.method(:load) unless defined?(Load)
 
   class << Map
@@ -40,15 +40,14 @@ class Map < Hash
     end
 
     def for(*args, &block)
-      first = args.first
       if(args.size == 1 and block.nil?)
-        return first.to_map if first.respond_to?(:to_map)
+        return args.first if args.first.class == self
       end
       new(*args, &block)
     end
 
     def coerce(other)
-      return other.to_map if other.respond_to?(:to_map)
+      return other if other.class == self
       allocate.update(other.to_hash)
     end
 

data/test/map_test.rb

@@ -190,10 +190,20 @@ Testing Map do
   testing 'that subclassing and clobbering initialize does not kill nested coersion' do
     c = Class.new(Map){ def initialize(arg) end }
     o = assert{ c.new(42) }
-    assert{ Map === o }
+    assert{ o.is_a?(c) }
     assert{ o.update(:k => {:a => :b}) }
   end
 
+  testing 'that subclassing does not kill class level coersion' do
+    c = Class.new(Map){ }
+    o = assert{ c.for(Map.new) }
+    assert{ o.is_a?(c) }
+
+    d = Class.new(c)
+    o = assert{ d.for(Map.new) }
+    assert{ o.is_a?(d) }
+  end
+
   testing 'that map supports basic option parsing for methods' do
     %w( options_for options opts ).each do |method|
       args = [0,1, {:k => :v, :a => false}]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: map
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 11
   prerelease: false
   segments: 
   - 1
-  - 6
+  - 7
   - 0
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors: 
 - Ara T. Howard
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-17 00:00:00 -07:00
+date: 2010-12-23 00:00:00 -07:00
 default_executable: 
 dependencies: []