hash-as-tree 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6fc1b4473793caf0d2f652d6bdcb4402a5e14b7c
-  data.tar.gz: b26ef30216c838d0bed808fd8b7c50f61c099067
+  metadata.gz: dd7dc34f2a588ef21cc27402c1a2f1b1f26a03f0
+  data.tar.gz: 0e99b251cc97535c93ad43fff06beffd45dfcd19
 SHA512:
-  metadata.gz: fde51f1225de3a4f7ec1569f09241d8ea227fc15b79816edd2802bdbc6d5499f7127d8f12f711b82240184c6912eeeb0f5a0bfdb57475082a73494aca2d14389
-  data.tar.gz: a9d5fe6598febfce9c9a3bf7b0bd854365c6b2384b5c9baa5ec72ea30ce6ec7bea49d76f47f2903771614eccaeb6aafbe63254175ef339e1fe4d127750e85f20
+  metadata.gz: 035ba398bb143a3983003e8b51d9624c03fb5bcc7606b4fbc2e5e07056f77a1b3bb33d8123f072c3d62b25cf4122f6487c03686ee090c86bed60706a0cfaf628
+  data.tar.gz: bf728a6e41563a8e949a71df93db950c2cf29cc3d9bfa6e14ad5ae4de24ddcb412f04182167fbfb84082c738ccf69ed3150111a50ae0122634388ffb7aea0bfe

data/lib/hash/as/tree.rb

@@ -3,6 +3,10 @@ require 'to_proc/all'
 class Hash
   module As
     module Tree
+      COMBINATOR = -> hash, key do
+        hash[key] = Hash.new &COMBINATOR
+      end
+
       refine Hash do
         def traverse
           return to_enum(__method__) unless block_given?
@@ -18,8 +22,13 @@ class Hash
         end
 
         def rewrite
+          hash = dup
+          hash.default_proc = COMBINATOR
+
           nodes, root_node = Queue.new, (Node.new value: self)
-          nodes.push root_node
+          each do |key, value|
+            nodes.push Node.new key: key, value: value, parent: root_node
+          end
 
           until nodes.empty?
             passed_node = nodes.pop
@@ -28,15 +37,19 @@ class Hash
             if passed_node == returned_node
               passed_node.children.each &[nodes, :push]
             else
-              if parent = passed_node.parent
-                parent.value.delete passed_node.key
-                parent.value[returned_node.key] = returned_node.value
-              end
+              path = passed_node.parent.path
+              cursor = if path.empty?
+                         hash
+                       else
+                         hash.dig *path
+                       end
+              cursor[returned_node.key] = returned_node.value
               returned_node.children.each &[nodes, :push]
             end
           end
 
-          root_node.to_h
+          hash.default_proc = default_proc
+          hash
         end
       end
 
@@ -46,16 +59,8 @@ class Hash
         end
         attr_accessor :value, :key, :parent
 
-        def to_h
-          if key
-            if value.is_a?(Hash) && (not value.empty?)
-              { key => children.map(&:to_h).reduce(&:merge) }
-            else
-              { key => value }
-            end
-          else
-            children.map(&:to_h).reduce(&:merge)
-          end
+        def path
+          @path ||= [*parent&.path, *key]
         end
 
         def with **kwargs

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hash-as-tree
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Anatoly Chernow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-05 00:00:00.000000000 Z
+date: 2017-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: to_proc