map 2.4.0 → 2.4.1

data/lib/map.rb

@@ -1,5 +1,5 @@
 class Map < Hash
-  Version = '2.4.0' unless defined?(Version)
+  Version = '2.4.1' unless defined?(Version)
   Load = Kernel.method(:load) unless defined?(Load)
 
   class << Map
@@ -97,31 +97,28 @@ class Map < Hash
         result = args
       end
 
-      return result if size == 0
+      return args if size == 0
 
       if size == 1
+        conversion_methods.each do |method|
+          if first.respond_to?(method)
+            first = first.send(method)
+            break
+          end
+        end
+
         if first.respond_to?(:each_pair)
           first.each_pair do |key, val|
             block.call(key, val)
           end
-          return result
+          return args
         end
 
         if first.respond_to?(:each_slice)
           first.each_slice(2) do |key, val|
             block.call(key, val)
           end
-          return result
-        end
-
-        conversion_methods.each do |method|
-          if first.respond_to?(method)
-            first = first.send(method)
-            first.each_pair do |key, val|
-              block.call(key, val)
-            end
-            return result
-          end
+          return args
         end
 
         raise(ArgumentError, 'odd number of arguments for Map')
@@ -210,14 +207,18 @@ class Map < Hash
     klass.map_for(hash)
   end
 
-  def Map.convert_key(key)
+  def self.convert_key(key)
     key.kind_of?(Symbol) ? key.to_s : key
   end
   def convert_key(key)
-    klass.convert_key(key)
+    if klass.respond_to?(:convert_key)
+      klass.convert_key(key)
+    else
+      Map.convert_key(key)
+    end
   end
 
-  def Map.convert_value(value)
+  def self.convert_value(value)
     conversion_methods.each do |method|
       return value.send(method) if value.respond_to?(method)
     end
@@ -232,7 +233,11 @@ class Map < Hash
     end
   end
   def convert_value(value)
-    klass.convert_value(value)
+    if klass.respond_to?(:convert_value)
+      klass.convert_value(value)
+    else
+      Map.convert_value(value)
+    end
   end
   alias_method('convert_val', 'convert_value')
 
@@ -375,9 +380,9 @@ class Map < Hash
     self
   end
 
-  def replace(hash)
+  def replace(*args)
     clear
-    update(hash)
+    update(*args)
   end
 
 # ordered container specific methods

data/map.gemspec

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

data/test/map_test.rb

@@ -331,35 +331,21 @@ Testing Map do
   end
 
   testing 'that Map.each_pair works on arrays' do
+    each = []
     array = %w( a b c )
-    each_pair = Map.each_pair(array)
-    assert{ each_pair == [['a', 'b'], ['c', nil]] }
+    Map.each_pair(array){|k,v| each.push(k,v)}
+    assert{ each_pair = ['a', 'b', 'c', nil] }
   end
 
-  testing 'that Map.each_pair works on hashes' do
-    hash = {'a' => 'b', 'c' => nil}
-    each_pair = Map.each_pair(hash)
-    assert{ each_pair == [['a', 'b'], ['c', nil]] }
-  end
-
-  testing 'that Map.each_pair works on things which respond_to conversion methods' do
-    object = Object.new
-    def object.to_map
-      {'a' => 'b', 'c' => nil}
-    end
-    each_pair = Map.each_pair(object)
-    assert{ each_pair == [['a', 'b'], ['c', nil]] }
-  end
-
-  testing 'that Map.each_pair blows up on non-hash, non-array, non-convertable objects' do
-    object = Object.new
-    result =
-      begin
-        Map.each_pair(object)
-      rescue => e
-        e
-      end
-    assert{ result.is_a?(Exception) } 
+  testing 'that #update and #replace accept map-ish objects' do
+    o = Object.new
+    def o.to_map() {:k => :v} end
+    m = Map.new
+    assert{ m.update(o) }
+    assert{ m =~ {:k => :v} }
+    m[:a] = :b
+    assert{ m.replace(o) }
+    assert{ m =~ {:k => :v} }
   end
 
 protected

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: map
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 2
   - 4
-  - 0
-  version: 2.4.0
+  - 1
+  version: 2.4.1
 platform: ruby
 authors: 
 - Ara T. Howard
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-09 00:00:00 -07:00
+date: 2011-02-10 00:00:00 -07:00
 default_executable: 
 dependencies: []