map 1.5.0 → 1.5.1

data/README

@@ -6,10 +6,10 @@ SYNOPSIS
   hash that works in all rubies
 
   maps are rad ordered hashes that are both ordered, string/symbol
-  indifferent, and have all sorts of sweetness like recursive convertsion,
-  more robust implementation than HashWithIndifferentAccess, support for
-  struct like (map.foo) access, and support for option/keyword access which
-  avoids several nasty classes of errors in many ruby libraries
+  indifferent, and have all sorts of sweetness like recursive conversion, more
+  robust implementation than HashWithIndifferentAccess, support for struct
+  like (map.foo) access, and support for option/keyword access which avoids
+  several nasty classes of errors in many ruby libraries
 
 INSTALL
   gem install map
@@ -24,9 +24,11 @@ DESCRIPTION
 #
   m = Map[:k, :v, :key, :val]
   m = Map(:k, :v, :key, :val)
+  m = Map.new(:k, :v, :key, :val)
 
   m = Map[[:k, :v], [:key, :val]]
-  m = Map[{:k => :v, :key => :val}]
+  m = Map(:k => :v, :key => :val)  # ruh-oh, the input hash loses order!
+  m = Map.new(:k => :v, :key => :val)  # ruh-oh, the input hash loses order!
 
 
   m = Map.new
@@ -37,16 +39,23 @@ DESCRIPTION
   p m.keys #=> ['a','b','c']  ### always ordered!
   p m.keys #=> [0,1,2]        ### always ordered!
 
-# maps don't care between symbol and string keys
+# maps don't care about symbol vs.string keys
 #
   p m[:a]  #=> 0
   p m["a"] #=> 0
 
+# even via deep nesting 
+#
+  p m[:foo]['bar'][:baz]  #=> 42
+
 # many functions operate in a way one would expect from an ordered container
 #
   m.update(:k2 => :v2)
   m.update(:k2, :v2)
 
+  key_val_pair = m.shift
+  key_val_pair = m.pop
+
 # maps keep mapiness for even deep operations
 #
   m.update :nested => {:hashes => {:are => :converted}}
@@ -58,7 +67,7 @@ DESCRIPTION
   p s.foo.bar #=> 42
 
 # because option parsing is such a common use case for needing string/symbol
-# indifference map.rb comes out of the box for option support
+# indifference map.rb comes out of the box loaded with option support
 #
   def foo(*args, &block)
     opts = Map.options(args)
@@ -76,7 +85,7 @@ DESCRIPTION
 
 # this avoids such bugs as
 #  
-  options = {:read_only => true}
+  options = {:read_only => false}
   read_only = options[:read_only] || true  # should be false but is true
 
 # with options this becomes

data/lib/map.rb

@@ -1,5 +1,5 @@
 class Map < Hash
-  Version = '1.5.0' unless defined?(Version)
+  Version = '1.5.1' unless defined?(Version)
   Load = Kernel.method(:load) unless defined?(Load)
 
   class << Map

data/lib/map/struct.rb

@@ -1,6 +1,6 @@
 class Map
   class Struct
-    instance_methods.each { |m| undef_method m unless m =~ /^__/ }
+    instance_methods.each { |m| undef_method m unless m =~ /^__|object_id/ }
 
     attr :map
 

data/test/lib/testing.rb

@@ -4,7 +4,9 @@
 
   def Testing(*args, &block)
     Class.new(Test::Unit::TestCase) do
-      def self.slug_for(*args)
+      eval("This=self")
+
+      def This.slug_for(*args)
         string = args.flatten.compact.join('-')
         words = string.to_s.scan(%r/\w+/)
         words.map!{|word| word.gsub %r/[^0-9a-zA-Z_-]/, ''}
@@ -12,10 +14,14 @@
         words.join('-').downcase
       end
 
-      @@testing_subclass_count = 0 unless defined?(@@testing_subclass_count) 
-      @@testing_subclass_count += 1
+      def This.testing_subclass_count
+        @testing_subclass_count ||= 1
+      ensure
+        @testing_subclass_count += 1
+      end
+
       slug = slug_for(*args).gsub(%r/-/,'_')
-      name = ['TESTING', '%03d' % @@testing_subclass_count, slug].delete_if{|part| part.empty?}.join('_')
+      name = ['TESTING', '%03d' % This.testing_subclass_count, slug].delete_if{|part| part.empty?}.join('_')
       name = name.upcase!
       const_set(:Name, name)
       def self.name() const_get(:Name) end

data/test/map_test.rb

@@ -106,7 +106,7 @@ Testing Map do
 
   testing 'that maps are string/symbol indifferent for recursive look-ups' do
     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 }
     assert{ map['a']['b'][:c] == 42 }

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 5
-  - 0
-  version: 1.5.0
+  - 1
+  version: 1.5.1
 platform: ruby
 authors: 
 - Ara T. Howard