support negative array indexes deeply in get keys

ahoward · Jun 15, 2014 · bdd2b8e · bdd2b8e
1 parent fdc0d13
commit bdd2b8e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/lib/map.rb b/lib/map.rb
@@ -774,8 +774,8 @@ def Map.collection_has?(collection, key, &block)
     has_key =
       case collection
         when Array
-          key = (Integer(key) rescue -1)
-          (0...collection.size).include?(key)
+          key = (Integer(key) rescue nil)
+          (0...collection.size).include?(key) or (0...collection.size).include?((-key)-1)
 
         when Hash
           collection.has_key?(key)

diff --git a/test/map_test.rb b/test/map_test.rb
@@ -361,6 +361,10 @@ def to_map() {:k => :b} end
     assert{ m[:x][:y].is_a?(Map) }
     assert{ m[:x][:y][:z] == 42.0 }
 
+    m = Map.new(a: [b: :c])
+    assert { m.get(:a, '-1', :b) == m.get(:a, '-1').get(:b) }
+    assert { m.get(:a, '-1', :b) == :c }
+
     assert{ Map.new.tap{|nm| nm.set} =~ {} }
     assert{ Map.new.tap{|nm| nm.set({})} =~ {} }
   end