deep_enumerable 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b740602088c959f7bd2f0fd8e97bcda800422d95
-  data.tar.gz: 379a9012bde4242061828a13fa2b8a43c46b20db
+  metadata.gz: edfce635bf315a5acf694212562adf0ef697c529
+  data.tar.gz: e484f7707c0b176146cd47dbd9087b51e36f32a2
 SHA512:
-  metadata.gz: 690880c051b9e1b2242cdb641c2f24b7c364698c8c8f4ccef872a552f4414498e9dae6d101871709498b8b652e144aea66102306a3477cb988cdc0dde56e1b4b
-  data.tar.gz: 49f3eda13d3342971298260cc5530a976ee8f94f77e3da5c6ebe9563e633598b25f16081044adc2e40397483d6b37f5ea17ce79de0b2c8c98671a384a9935761
+  metadata.gz: 6cf82e979b450159af3ebf13450b8b559598660423359c21b3d8b646916d4aaf3d06cc91145173cffb8e167503a7bb9e0fbbc0eb514edc19af3e90db0c913023
+  data.tar.gz: 2fce4f64b669e36381bee1c6ccc1cf10d99e025ee15a35521ef775508aeac6e5ced2adcfac17eda05ac1b86e6db205f4e0134f098135db211079166b82b72a7c

data/lib/deep_enumerable.rb

@@ -41,7 +41,7 @@ module DeepEnumerable
   # @example
   #  >> alice = {:name=>"alice", :age=>26}
   #  >> bob   = {:name=>"bob",   :age=>26}
-  #  >> alice.deep_diff(bob)
+  #  >> alice.deep_diff_symmetric(bob)
   #  => {:name=>["alice", "bob"]}
   #
   #  >> bob   = {:friends=>["alice","carol"]}
@@ -123,8 +123,8 @@ module DeepEnumerable
   # @return a DeepEnumerable representing the subtree specified by the query key
   #
   def deep_get(key)
-    if nested_key?(key)
-      key_head, key_tail = split_key(key)
+    if DeepEnumerable::nested_key?(key)
+      key_head, key_tail = DeepEnumerable::split_key(key)
       if self[key_head].respond_to?(:deep_get)
         self[key_head].deep_get(key_tail)
       else
@@ -307,31 +307,36 @@ module DeepEnumerable
   end
 
   ##
-  # Update a DeepEnumerable, indexed by a deep-key
+  # Update a DeepEnumerable, indexed by an Array or Hash.
+  #
   # Intermediate values are created when necessary, with the same type as its parent.
   #
   # @example
   #  >> [].deep_set({1 => 2}, 3)
   #  => [nil, [nil, nil, 3]]
-  #  >> {}.deep_set({1 => 2}, 3)
-  #  => {1=>{2=>3}}
+  #  >> {}.deep_set([1, 2, 3], 4)
+  #  => {1=>{2=>{3=>4}}}
   #
   # @return (tentative) returns the object that's been modified. Warning: This behavior is subject to change.
   #
   def deep_set(key, val)
-    if nested_key?(key)
-      key_head, key_tail = split_key(key)
-      if self[key_head].respond_to?(:deep_set)
-        self[key_head].deep_set(key_tail, val)
-        self
+    if DeepEnumerable::nested_key?(key)
+      key_head, key_tail = DeepEnumerable::split_key(key)
+
+      if key_tail.nil?
+        self[key_head] = val
       else
-        self[key_head] = empty.deep_set(key_tail, val)
-        self
+        if self[key_head].respond_to?(:deep_set)
+          self[key_head].deep_set(key_tail, val)
+        else
+          self[key_head] = empty.deep_set(key_tail, val)
+        end
       end
-    else
+    elsif !key.nil? # don't index on nil
       self[key] = val
-      self #SHOULD? return val instead of self
     end
+
+    self #SHOULD? return val instead of self
   end
  
   ##
@@ -446,7 +451,6 @@ module DeepEnumerable
   ##
   # The primary iterator of a DeepEnumerable
   # If this method is implemented DeepEnumerable can construct every other method in terms of shallow_each.
-  #TODO test this
   def shallow_each(&block)
     shallow_key_value_pairs.each(&block)
   end
@@ -466,7 +470,7 @@ module DeepEnumerable
   def depth_first_map(ancestry=[])
     shallow_each.flat_map do |key, val|
       full_ancestry = ancestry + [key]
-      full_key = deep_key_from_array(full_ancestry) #TODO this is an n^2 operation
+      full_key = DeepEnumerable::deep_key_from_array(full_ancestry) #TODO this is an n^2 operation
  
       if val.respond_to?(:depth_first_map, true) # Search protected methods as well
         val.depth_first_map(full_ancestry)
@@ -477,7 +481,7 @@ module DeepEnumerable
   end
 
   # Everything below should be a class method, but Ruby method visibility is a nightmare
-  def deep_key_from_array(array)
+  def self.deep_key_from_array(array)
     if array.size > 1
       {array.first => deep_key_from_array(array.drop(1))}
     else
@@ -485,19 +489,43 @@ module DeepEnumerable
     end
   end
 
-  def nested_key?(key)
-    key.is_a?(Hash)
+  # DeepEnumerable keys are represented as hashes, this function
+  # converts them to arrays for convenience
+  def self.deep_key_to_array(key)
+    if DeepEnumerable::nested_key?(key)
+      head, tail = split_key(key)
+      [head] + deep_key_to_array(tail)
+    elsif key.nil?
+      []
+    else
+      [key]
+    end
+  end
+
+  def self.nested_key?(key)
+    key.is_a?(Hash) || key.is_a?(Array)
   end
 
   # Disassembles a key into its head and tail elements
   #
-  # for example: {a: {0 => :a}} goes to [:a, {0 => :a}]
-  def split_key(key)
+  # @example
+  #  >> DeepEnumerable.split_key({a: {0 => :a}})
+  #  => [:a, {0 => :a}]
+  #  >> DeepEnumerable.split_key([a: [0 => :a]])
+  #  => [a:, [0, :a]]
+  #
+  def self.split_key(key)
     case key
     when Hash then
-    key_head = key.keys.first
-    key_tail = key[key_head]
-    [key_head, key_tail]
+      key_head = key.keys.first
+      key_tail = key[key_head]
+      [key_head, key_tail]
+    when Array then
+      case key.size
+        when 0 then [nil, nil]
+        when 1 then [key[0], nil]
+        else [key[0], key.drop(1)]
+      end
     when nil then [nil, nil]
     else [key, nil]
     end
@@ -507,7 +535,7 @@ module DeepEnumerable
   #
   # for example: {a: {b: :c}} goes to :c
   def self.leaf_key(key)
-    key.is_a?(Hash) ? leaf_key(key) : key
+    nested_key?(key) ? leaf_key(split_key(key)[1]) : key
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deep_enumerable
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Dan Gopstein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-08 00:00:00.000000000 Z
+date: 2015-12-18 00:00:00.000000000 Z
 dependencies: []
 description: A library for manipulating nested collections. See https://github.com/dgopstein/deep_enumerable
   for details
@@ -43,4 +43,3 @@ signing_key:
 specification_version: 4
 summary: A library for manipulating nested collections
 test_files: []
-has_rdoc: