has_hierarchy 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86d673f21a344bfee6de33caa82e9d3828766b4c
-  data.tar.gz: bfd3039a2107c54291497898345bad43024413aa
+  metadata.gz: 7fa480c2dfa727db155946f7a32a374012d502a3
+  data.tar.gz: c10d67ed70b1dd55e2dff7b01e4037bbdf2d74f7
 SHA512:
-  metadata.gz: 324bc0f6c38e8f8ca92c1f350ec204a8925c4820b8b6dbe402f65b28e5d36176e9c9b45f9663a424c51d46be9c2755f80a54d5c8fab6e01d0e494f9a0711beae
-  data.tar.gz: 7e1fc5c1b53e078bec6e1bc752775fd0cfd0aa6f1a0dc118f2cc9f25540c28402b9c942939f972806b465d8ad9d4d8e9ec282ecf36972d6ba3441e8b03881b1b
+  metadata.gz: 77c9d5e8305249b2e249499d3898b18cfcd797a4d6bd0e71fce811e5e9ccbf27c3ba66e03c2f6ce0e7dabf36b119e4460a4fd9911c4223064008eae3cb027c0f
+  data.tar.gz: 473491eca491d329ce3cd379377c0c10bc01d34b50fc0f0da78b83ed344c196828c9fc9e243f75939a20aec6b0185ee5b4adfccae4b8e25b559ac73c0bcdcdbe

data/lib/has_hierarchy.rb

@@ -49,15 +49,25 @@ module HasHierarchy
 
     def tree
       nodes = all
+      tree_hash = {}
+
       index = {}
-      arranged = {}
+      nodes.each{ |n| index[n.id] = {} }
+      nodes.each{ |n| (index[n.parent_id] || tree_hash)[n] = index[n.id] }
+
+      tree_hash
+    end
+
+    def flat_tree(tree_hash = nil)
+      tree_hash ||= tree
+      list = []
 
-      nodes.each do |node|
-        struct = node.root? ? arranged : (index[node.parent_id] ||= {})
-        struct[node] = (index[node.id] ||= {})
+      tree_hash.each do |node, children|
+        list << node
+        list += flat_tree(children) unless children.empty?
       end
 
-      arranged
+      list
     end
 
     protected

data/lib/has_hierarchy/version.rb

@@ -1,3 +1,3 @@
 module HasHierarchy
-  VERSION = '0.4.1'
+  VERSION = '0.4.2'
 end

data/spec/tree.rb

@@ -18,7 +18,7 @@ shared_examples 'adjacency list' do
   include_context 'example tree'
 
   describe '.tree' do
-    it 'arranges tree' do
+    it 'arranges tree to hash' do
       expect(described_class.tree).to be_arranged_like({
         foo => {},
         bar => {
@@ -43,6 +43,28 @@ shared_examples 'adjacency list' do
     end
   end
 
+  describe '.flat_tree' do
+    it 'arranges tree to array' do
+      expect(described_class.flat_tree).to eq([
+        foo,
+        bar,
+          qux,
+            quux,
+          baz
+      ])
+    end
+
+    it 'allows custom order' do
+      expect(described_class.alphabetic.flat_tree).to eq([
+        bar,
+          baz,
+          qux,
+            quux,
+        foo
+      ])
+    end
+  end
+
   describe '.roots' do
     it 'returns roots' do
       expect(described_class.roots).to match_array([ foo, bar ])
@@ -156,12 +178,9 @@ shared_examples 'materialized path' do
 
   describe '#subtree' do
     it 'returns node with descendants' do
-      expect(bar.subtree.tree).to be_arranged_like({
-        bar => {
-          qux => {
-            quux => {}
-          },
-          baz => {}
+      expect(qux.subtree.tree).to be_arranged_like({
+        qux => {
+          quux => {}
         }
       })
     end
@@ -258,8 +277,13 @@ shared_examples 'tree with cached depth' do
 
   it 'stores node level' do
     expect(described_class.where(depth: 0)).to match_array([ foo, bar ])
-    expect(described_class.where(depth: 1)).to match_array([ qux, baz ])
-    expect(described_class.where(depth: 2)).to match_array([ quux ])
+
+    expect(described_class.where(depth: 1...3).tree).to be_arranged_like({
+      qux => {
+        quux => {}
+      },
+      baz => {}
+    })
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: has_hierarchy
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Kolesnikov Danil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-30 00:00:00.000000000 Z
+date: 2014-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler