acts_as_tree 2.5.1 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c39b13dfb04c4ed2870fe0c459880233959cf86
-  data.tar.gz: 672b23b7db5a373f819dbe33628f48578f8391bd
+  metadata.gz: c1348043cad77cbacfb197eb2d96ff6e1ac84be3
+  data.tar.gz: 305512fe8ce041f273a65fe951343e8a37555a93
 SHA512:
-  metadata.gz: f4538630240dd1896649e93b37e7b9064f87176191e58dde70d6cdb0d3cb2da47bd1ea36d5d8d88706998c3cb1f052b110796a6ee4738141331fd93bff262f8b
-  data.tar.gz: 6b53454a3d359f8a161f3fd2f0c28bae4958023e59c965fe8c643065c12c1551925613531071aa2ebebd6e350626309c3b805edd0e35f00bdd1594741b40db05
+  metadata.gz: 81a7871c4c36509e001435e8161415fe067768bf8080b1ef824e7d95ec2a710075a3974fc141eb7d15f3d87c3b6d5dbe4a4d9b858d1f32a66555b26cd7885b83
+  data.tar.gz: 033de96f25e5a03f3e605a6c7940ce440819bf0754154ac24dfac1568c34880107647e7d4164ef102d3ad2b07e7f50d6ea634a997b4de10fd65ffdbf5bc7de94

data/README.md

@@ -74,6 +74,8 @@ We no longer support Ruby 1.8 or versions of Rails/ActiveRecord older than 3.0.
 Moving forward we will do our best to support the latest versions of ActiveRecord and Ruby.
 
 ## Change Log
+* 2.6.0 - October 9, 2016
+	* Add generations methods, see #56 -- markhgbrewster
 * 2.5.1 - September 8, 2016
 	* Fix early database connection in acts\_as\_tree, see #55 -- felixbuenemann
 * 2.5.0 - August 14, 2016

data/lib/acts_as_tree.rb

@@ -125,6 +125,13 @@ module ActsAsTree
         end
       EOV
 
+      # Returns a hash of all nodes grouped by their level in the tree structure.
+      #
+      # Class.generations { 0=> [root1, root2], 1=> [root1child1, root1child2, root2child1, root2child2] }
+      def self.generations
+        all.group_by{ |node| node.level }
+      end
+
       if configuration[:counter_cache]
         after_update :update_parents_counter_cache
 
@@ -281,6 +288,27 @@ module ActsAsTree
       parent ? parent.children : self.class.roots
     end
 
+    # Returns all the nodes at the same level in the tree as the current node.
+    #
+    #  root1child1.generation [root1child2, root2child1, root2child2]
+    def generation
+      self_and_generation - [self]
+    end
+
+    # Returns a reference to the current node and all the nodes at the same level as it in the tree.
+    #
+    #  root1child1.generation [root1child1, root1child2, root2child1, root2child2]
+    def self_and_generation
+      self.class.select {|node| node.level == self.level }
+    end
+
+    # Returns the level (depth) of the current node
+    #
+    #  root1child1.level 1
+    def level
+      self.ancestors.size
+    end
+
     # Returns children (without subchildren) and current node itself.
     #
     #   root.self_and_children # => [root, child1]

data/lib/acts_as_tree/version.rb

@@ -1,3 +1,3 @@
 module ActsAsTree
-  VERSION = "2.5.1"
+  VERSION = "2.6.0"
 end

data/test/acts_as_tree_test.rb

@@ -496,7 +496,6 @@ class TreeTestWithCounterCache < ActsAsTreeTestCase
   end
 end
 
-
 class TreeTestWithTouch < ActsAsTreeTestCase
   def setup
     setup_db
@@ -541,3 +540,57 @@ class ExternalTreeTest < TreeTest
     assert_nil root4_child.reload.external_parent_id
   end
 end
+
+class GenertaionMethods < ActsAsTreeTestCase
+  def setup
+    setup_db
+
+    @root1              = TreeMixin.create!
+    @root_child1        = TreeMixin.create! parent_id: @root1.id
+    @child1_child       = TreeMixin.create! parent_id: @root_child1.id
+    @child1_child_child = TreeMixin.create! parent_id: @child1_child.id
+    @root_child2        = TreeMixin.create! parent_id: @root1.id
+    @root2              = TreeMixin.create!
+    @root2_child1       = TreeMixin.create! parent_id: @root2.id
+    @root2_child2       = TreeMixin.create! parent_id: @root2.id
+    @root2_child1_child = TreeMixin.create! parent_id: @root2_child1.id
+    @root3              = TreeMixin.create!
+  end
+
+  def test_generations
+    assert_equal(
+      {
+        0 => [@root1, @root2, @root3],
+        1 => [@root_child1, @root_child2, @root2_child1, @root2_child2],
+        2 => [@child1_child, @root2_child1_child],
+        3 => [@child1_child_child]
+      },
+      TreeMixin.generations
+    )
+  end
+
+  def test_generation
+    assert_equal [@root2, @root3], @root1.generation
+    assert_equal [@root_child2, @root2_child1, @root2_child2],
+      @root_child1.generation
+    assert_equal [@root2_child1_child], @child1_child.generation
+    assert_equal [], @child1_child_child.generation
+  end
+
+  def test_self_and_generation
+    assert_equal [@root1, @root2, @root3], @root1.self_and_generation
+    assert_equal [@root_child1, @root_child2, @root2_child1, @root2_child2],
+      @root_child1.self_and_generation
+    assert_equal [@child1_child, @root2_child1_child],
+      @child1_child.self_and_generation
+    assert_equal [@child1_child_child], @child1_child_child.self_and_generation
+  end
+
+  def test_level
+    assert_equal 0, @root1.level
+    assert_equal 1, @root_child1.level
+    assert_equal 2, @child1_child.level
+    assert_equal 3, @child1_child_child.level
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_tree
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 2.6.0
 platform: ruby
 authors:
 - Erik Dahlstrand
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-08 00:00:00.000000000 Z
+date: 2016-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord