map 1.0.0 → 1.1.0

data/README

@@ -0,0 +1,26 @@
+
+m = Map.new
+
+m[:a] = :b
+m[:b] = :b
+m[:c] = :c
+
+p m.keys #=> [:a, :b, :c]  ### always ordered!
+
+
+p m[:a]  #=> :a
+p m["a"] #=> :a
+
+
+m = Map[:k, :v, :key, :val]
+m = Map[[:k, :v], [:key, :val]]
+m = Map[{:k => :v, :key => :val}]
+
+m = Map(:k, :v, :key, :val)
+m = Map([:k, :v], [:key, :val])
+m = Map(:k => :v, :key => :val)
+
+
+m.update(:k2, :v2)
+m.update(:k2 => :v2)
+

data/a.rb

@@ -0,0 +1,6 @@
+
+map = Map(:a => [{:b => 42}])
+
+p map['a']
+p map['a'][0]
+p map['a'][0]['b']

data/lib/map.rb

@@ -1,5 +1,5 @@
 class Map < Hash
-  Version = '1.0.0' unless defined?(Version)
+  Version = '1.1.0' unless defined?(Version)
   Load = Kernel.method(:load) unless defined?(Load)
 
   class << Map
@@ -32,6 +32,7 @@ class Map < Hash
     def new_from_hash(hash)
       map = new
       map.update(hash)
+      map.default = hash.default
       map
     end
 
@@ -121,19 +122,21 @@ class Map < Hash
     key.kind_of?(Symbol) ? key.to_s : key
   end
 
-  def convert_val(val)
-    case val
+  def convert_value(value)
+    return value.to_map if value.respond_to?(:to_map)
+    case value
       when Hash
-        map_for(val)
+        Map.for(value)
       when Array
-        val.collect{|v| Hash === v ? map_for(v) : v}
+        value.map{|v| convert_value(v)}
       else
-        val
+        value
     end
   end
+  alias_method('convert_val', 'convert_value')
 
   def convert(key, val)
-    [convert_key(key), convert_val(val)]
+    [convert_key(key), convert_value(val)]
   end
 
 # maps are aggressive with copy operations.  they are all deep copies.  make a

data/test/{map.rb → map_test.rb}

@@ -10,6 +10,14 @@ Testing Map do
     assert{ Map.new(hash = {}) }
   end
 
+  testing 'that the contructor accepts a hash and preserves the default value' do
+    hash = {}
+    hash.default = 42
+    assert{ hash[:missing] == 42 }
+    map = assert{ Map.new(hash) }
+    assert{ map[:missing] == 42 }
+  end
+
   testing 'that the constructor accepts the empty array' do
     array = []
     assert{ Map.new(array) }
@@ -97,9 +105,8 @@ Testing Map do
   end
 
   testing 'that maps are string/symbol indifferent for recursive look-ups' do
-    map = Map.new
-    assert{ map[:a] = Map[:b, 42] }
-    assert{ map[:a][:b] = Map[:c, 42] }
+    map = assert{ Map(:a => {:b => {:c => 42}}) }
+    assert{ map[:a] = {:b => {:c, 42}} }
     assert{ map[:a][:b][:c] == 42 }
     assert{ map['a'][:b][:c] == 42 }
     assert{ map['a']['b'][:c] == 42 }
@@ -108,6 +115,18 @@ Testing Map do
     assert{ map[:a]['b']['c'] == 42 }
     assert{ map[:a][:b]['c'] == 42 }
     assert{ map['a'][:b]['c'] == 42 }
+
+    map = assert{ Map(:a => [{:b => 42}]) }
+    assert{ map['a'].is_a?(Array) }
+    assert{ map['a'][0].is_a?(Map) }
+    assert{ map['a'][0]['b'] == 42 }
+
+    map = assert{ Map(:a => [ {:b => 42}, [{:c => 'forty-two'}] ]) }
+    assert{ map['a'].is_a?(Array) }
+    assert{ map['a'][0].is_a?(Map) }
+    assert{ map['a'][1].is_a?(Array) }
+    assert{ map['a'][0]['b'] == 42 }
+    assert{ map['a'][1][0]['c'] == 'forty-two' }
   end
 
   testing 'that maps support shift like a good ordered container' do
@@ -146,12 +165,13 @@ end
 
 
 
+
+
 BEGIN {
   testdir = File.dirname(File.expand_path(__FILE__))
   testlibdir = File.join(testdir, 'lib')
   rootdir = File.dirname(testdir)
   libdir = File.join(rootdir, 'lib')
-
   $LOAD_PATH.push(libdir)
   $LOAD_PATH.push(testlibdir)
 }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: map
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: false
   segments: 
   - 1
+  - 1
   - 0
-  - 0
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Ara T. Howard
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-03 00:00:00 -06:00
+date: 2010-10-05 00:00:00 -06:00
 default_executable: 
 dependencies: []
 
@@ -28,10 +28,12 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- a.rb
 - lib/map.rb
 - Rakefile
+- README
 - test/lib/testing.rb
-- test/map.rb
+- test/map_test.rb
 has_rdoc: true
 homepage: http://github.com/ahoward/map/tree/master
 licenses: []
@@ -66,5 +68,5 @@ rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: map
-test_files: 
-- test/map.rb
+test_files: []
+