map 2.3.0 → 2.4.0

data/lib/map.rb

@@ -1,5 +1,5 @@
 class Map < Hash
-  Version = '2.3.0' unless defined?(Version)
+  Version = '2.4.0' unless defined?(Version)
   Load = Kernel.method(:load) unless defined?(Load)
 
   class << Map
@@ -85,25 +85,46 @@ class Map < Hash
 
   # iterate over arguments in pairs smartly.
   #
-    def each_pair(*args)
+    def each_pair(*args, &block)
       size = args.size
       parity = size % 2 == 0 ? :even : :odd
       first = args.first
 
-      return args if size == 0
+      if block.nil?
+        result = []
+        block = lambda{|*kv| result.push(kv)}
+      else
+        result = args
+      end
+
+      return result if size == 0
 
-      if size == 1 and first.respond_to?(:each_pair)
-        first.each_pair do |key, val|
-          yield(key, val)
+      if size == 1
+        if first.respond_to?(:each_pair)
+          first.each_pair do |key, val|
+            block.call(key, val)
+          end
+          return result
         end
-        return args
-      end
 
-      if size == 1 and first.respond_to?(:each_slice)
-        first.each_slice(2) do |key, val|
-          yield(key, val)
+        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
         end
-        return args
+
+        raise(ArgumentError, 'odd number of arguments for Map')
       end
 
       array_of_pairs = args.all?{|a| a.is_a?(Array) and a.size == 2}
@@ -111,13 +132,13 @@ class Map < Hash
       if array_of_pairs
         args.each do |pair|
           key, val, *ignored = pair
-          yield(key, val)
+          block.call(key, val)
         end
       else
         0.step(args.size - 1, 2) do |a|
           key = args[a]
           val = args[a + 1]
-          yield(key, val)
+          block.call(key, val)
         end
       end
 
@@ -127,12 +148,14 @@ class Map < Hash
     alias_method '[]', 'new'
   end
 
-  Dynamic = lambda do
-    conversion_methods.reverse_each do |method|
-      add_conversion_method!(method)
+  unless defined?(Dynamic)
+    Dynamic = lambda do
+      conversion_methods.reverse_each do |method|
+        add_conversion_method!(method)
+      end
     end
+    module_eval(&Dynamic)
   end
-  module_eval(&Dynamic)
 
 
 # instance constructor 
@@ -178,30 +201,39 @@ class Map < Hash
     self.class
   end
 
-  def map_for(hash)
+  def Map.map_for(hash)
     map = klass.coerce(hash)
     map.default = hash.default
     map
   end
+  def map_for(hash)
+    klass.map_for(hash)
+  end
 
-  def convert_key(key)
+  def Map.convert_key(key)
     key.kind_of?(Symbol) ? key.to_s : key
   end
+  def convert_key(key)
+    klass.convert_key(key)
+  end
 
-  def convert_value(value)
+  def Map.convert_value(value)
     conversion_methods.each do |method|
       return value.send(method) if value.respond_to?(method)
     end
 
     case value
       when Hash
-        klass.coerce(value)
+        coerce(value)
       when Array
         value.map{|v| convert_value(v)}
       else
         value
     end
   end
+  def convert_value(value)
+    klass.convert_value(value)
+  end
   alias_method('convert_val', 'convert_value')
 
   def convert(key, val)

data/lib/map/struct.rb

@@ -23,7 +23,7 @@ class Map
       value.is_a?(Map) ? value.struct : value
     end
 
-    Keys = lambda{|*keys| keys.flatten!; keys.compact!; keys.map!{|key| key.to_s}}
+    Keys = lambda{|*keys| keys.flatten!; keys.compact!; keys.map!{|key| key.to_s}} unless defined?(Keys)
 
     delegates = %w(
       inspect

data/map.gemspec

@@ -3,12 +3,12 @@
 
 Gem::Specification::new do |spec|
   spec.name = "map"
-  spec.version = "2.3.0"
+  spec.version = "2.4.0"
   spec.platform = Gem::Platform::RUBY
   spec.summary = "map"
   spec.description = "description: map kicks the ass"
 
-  spec.files = ["a.rb", "lib", "lib/map", "lib/map/options.rb", "lib/map/struct.rb", "lib/map.rb", "map.gemspec", "Rakefile", "README", "test", "test/lib", "test/lib/testing.rb", "test/map_test.rb", "TODO"]
+  spec.files = ["lib", "lib/map", "lib/map/options.rb", "lib/map/struct.rb", "lib/map.rb", "map.gemspec", "Rakefile", "README", "test", "test/lib", "test/lib/testing.rb", "test/map_test.rb", "TODO"]
   spec.executables = []
   
   spec.require_path = "lib"

data/test/map_test.rb

@@ -330,6 +330,38 @@ Testing Map do
     end
   end
 
+  testing 'that Map.each_pair works on arrays' do
+    array = %w( a b c )
+    each_pair = Map.each_pair(array)
+    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) } 
+  end
+
 protected
   def new_int_map(n = 1024)
     map = assert{ Map.new }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: map
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 31
   prerelease: 
   segments: 
   - 2
-  - 3
+  - 4
   - 0
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors: 
 - Ara T. Howard
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-31 00:00:00 -07:00
+date: 2011-02-09 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -28,7 +28,6 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- a.rb
 - lib/map/options.rb
 - lib/map/struct.rb
 - lib/map.rb

data/a.rb

@@ -1,9 +0,0 @@
-
-class M < ::Map
-  def initialize(arg)
-    @arg = arg
-  end
-end
-
-m = M.new(42)
-m.update :k => {:a => :b}