map 2.5.0 → 2.5.1

data/lib/map.rb

@@ -1,5 +1,5 @@
 class Map < Hash
-  Version = '2.5.0' unless defined?(Version)
+  Version = '2.5.1' unless defined?(Version)
   Load = Kernel.method(:load) unless defined?(Load)
 
   class << Map
@@ -47,8 +47,12 @@ class Map < Hash
     end
 
     def coerce(other)
-      return other if other.class == self
-      allocate.update(other.to_hash)
+      case other
+        when self
+          return other
+        else
+          allocate.update(other.to_hash)
+      end
     end
 
     def conversion_methods
@@ -167,13 +171,18 @@ class Map < Hash
         super(&block)
 
       when 1
-        case args.first
+        first = args.first
+        case first
           when Hash
-            initialize_from_hash(args.first)
+            initialize_from_hash(first)
           when Array
-            initialize_from_array(args.first)
+            initialize_from_array(first)
           else
-            initialize_from_hash(args.first.to_hash)
+            if first.respond_to?(:to_hash)
+              initialize_from_hash(first.to_hash)
+            else
+              initialize_from_hash(first)
+            end
         end
 
       else

data/map.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification::new do |spec|
   spec.name = "map"
-  spec.version = "2.5.0"
+  spec.version = "2.5.1"
   spec.platform = Gem::Platform::RUBY
   spec.summary = "map"
   spec.description = "description: map kicks the ass"

data/test/map_test.rb

@@ -240,6 +240,24 @@ Testing Map do
     assert{ map.list.all?{|x| x.id==42} }
   end
 
+  testing 'that coercion is minimal' do
+    map = Map.new
+    a = Class.new(Map) do
+      def to_map() {:k => :a} end
+    end
+    b = Class.new(a) do
+      def to_map() {:k => :b} end
+    end
+    m = b.new
+    m.update(:list => [a.new, b.new])
+    assert{ m.list.first.class == b }
+    assert{ m.list.last.class == b }
+    m = a.new
+    m.update(:list => [a.new, b.new])
+    assert{ m.list.first.class == a }
+    assert{ m.list.last.class == a }
+  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: 27
+  hash: 25
   prerelease: 
   segments: 
   - 2
   - 5
-  - 0
-  version: 2.5.0
+  - 1
+  version: 2.5.1
 platform: ruby
 authors: 
 - Ara T. Howard
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-13 00:00:00 -07:00
+date: 2011-02-14 00:00:00 -07:00
 default_executable: 
 dependencies: []