map 4.3.0 → 4.4.0

data/a.rb

@@ -1,7 +1,44 @@
 require 'map'
 
-m = Map.new
+#m = Map.new
+#m.default = []
+ 
+class Errors < ::Map
+  def [](key)
+    self[key] = Array.new unless has_key?(key)
+    super
+  end
+end
 
-m.default = []
+e = Errors.new
+p e[:k]
+p e
+e.set(:a, :b, 42)
+p e.get(:a, :b)
+p e
+#m = Map.new{|m,k| m[k] ||= Array.new}
+
+
+#m.set(:a, :b, 42)
+#p m.get(:a, :b)
+
+
+#m[:a].push(:b)
+#p m[:a]
+#p m
+#p m
+
+
+__END__
+args = [:a, :b, {:k => :v}]
+
+Map.update_options_for!(args) do |options|
+  options[:foo] = :bar
+end
+
+Map.update_options_for!(args) do |options|
+  options[:time] = Time.now 
+end
+
+p args
 
-m.get(:a, :b)

data/lib/map.rb

@@ -1,5 +1,5 @@
 class Map < Hash
-  Version = '4.3.0' unless defined?(Version)
+  Version = '4.4.0' unless defined?(Version)
   Load = Kernel.method(:load) unless defined?(Load)
 
   class << Map
@@ -633,15 +633,22 @@ class Map < Hash
       if !self.has_key?(keys.first) && block_given?
         return yield
       else
-        return self[keys.first] 
+        return self[keys.first]
       end
     end
     keys, key = keys[0..-2], keys[-1]
     collection = self
     keys.each do |k|
       k = alphanumeric_key_for(k)
-      collection = collection[k]
-      return collection unless collection.respond_to?('[]')
+      if collection_has_key?(collection, k)
+        collection = collection[k]
+      else
+        collection = nil
+      end
+      unless collection.respond_to?('[]')
+        leaf = collection
+        return leaf
+      end
     end
     alphanumeric_key = alphanumeric_key_for(key)
 
@@ -659,7 +666,11 @@ class Map < Hash
     keys, key = keys[0..-2], keys[-1]
     keys.each do |k|
       k = alphanumeric_key_for(k)
-      collection = collection[k]
+      if collection_has_key?(collection, k)
+        collection = collection[k]
+      else
+        collection = nil
+      end
       return collection unless collection.respond_to?('[]')
     end
     return false unless(collection.is_a?(Hash) or collection.is_a?(Array))
@@ -724,13 +735,17 @@ class Map < Hash
       keys.each_cons(2) do |a, b|
         a, b = alphanumeric_key_for(a), alphanumeric_key_for(b)
 
+        exists = collection_has_key?(collection, a)
+
         case b
           when Numeric
-            collection[a] ||= []
+            #collection[a] ||= []
+            collection[a] = [] unless exists
             raise(IndexError, "(#{ collection.inspect })[#{ a.inspect }]=#{ value.inspect }") unless collection[a].is_a?(Array)
 
           when String, Symbol
-            collection[a] ||= {}
+            #collection[a] ||= {}
+            collection[a] = {} unless exists
             raise(IndexError, "(#{ collection.inspect })[#{ a.inspect }]=#{ value.inspect }") unless collection[a].is_a?(Hash)
         end
         collection = collection[a]

data/lib/map/options.rb

@@ -112,6 +112,10 @@ class Map
       defined?(@popped) and @popped
     end
 
+    def popped=(boolean)
+      @popped = !!boolean
+    end
+
     def pop!
       if arguments.last.is_a?(Hash)
         @popped = arguments.pop
@@ -155,6 +159,7 @@ def Map.update_options_for!(args, &block)
   block.call(options)
 ensure
   args.push(options)
+  options.popped = false
 end
 
 class << Map

data/map.gemspec

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: map
 version: !ruby/object:Gem::Version 
-  hash: 51
+  hash: 47
   prerelease: 
   segments: 
   - 4
-  - 3
+  - 4
   - 0
-  version: 4.3.0
+  version: 4.4.0
 platform: ruby
 authors: 
 - Ara T. Howard
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-17 00:00:00 -06:00
+date: 2011-08-21 00:00:00 -06:00
 default_executable: 
 dependencies: []