acts_as_tree 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6345f6c0aff0309193dc564612c75fc1ea6b267a
-  data.tar.gz: 5d09b92e6dd13c1bf80be0f0b69d1cfb2c45328d
+  metadata.gz: f4b7ecba20760317473e4fe15ae47804ad57ff68
+  data.tar.gz: cface22965a3e581aded8ba0976226c11bcbcece
 SHA512:
-  metadata.gz: 9c048a9ed2b95836a0915e1e95619975ef8bc4a42f7937bdfb258977f3ec4bf9420fc38eb9c5fa21abe7fd359dbb6861ad61d0f003339813c1114610ef5c782a
-  data.tar.gz: 73fe82d6e696819c08633c5850ca1f1a4b588eb3033777df5bbd8331b2e4fc1de2dc636f5da1c5c9fb65fa9a9b8da4fc8740b69877bccd2c67386a199c2e8eb2
+  metadata.gz: 10c6e09214046e11b68883211e46ddc1c8879771bb80ddd534eeba0466620f0d5c827f52378514af1db77add3464ca2c32b1207ab5b333a5062b015bd33e706f
+  data.tar.gz: 9cbf66c8158e7037a77167c9279d91c6978129b93c7ff47e65a67e01bd771e2973a50ebf3434e7bfb83fe9cdfde4ed0edce5d2b9c29ce7b01b5cfc0d7bf68298

data/README.md

@@ -51,6 +51,9 @@ 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
+* 1.5.0 - December 16th, 2013
+	* `Added new descendants method` -- adamkleingit
+	* Fixed warning message -- akicho8
 * 1.4.0 - June 25th, 2013
 	* `Presentation#tree_view` -- rainchen
 	* `root?` && `leaf?` methods. -- xuanxu

data/lib/acts_as_tree.rb

@@ -100,7 +100,6 @@ module ActsAsTree
         end
 
         def self.root
-          order_option = %Q{#{configuration.fetch :order, "nil"}}
           self.roots.first
         end
       EOV
@@ -149,6 +148,22 @@ module ActsAsTree
       nodes
     end
 
+    # Returns list of descendants, starting from current node, not including current node.
+    #
+    #   root.descendants # => [child1, child2, subchild1, subchild2, subchild3, subchild4]
+    def descendants
+      children.each_with_object(children) {|child, arr|
+        arr.concat child.descendants
+      }.uniq
+    end
+
+    # Returns list of descendants, starting from current node, including current node.
+    #
+    #   root.self_and_descendants # => [root, child1, child2, subchild1, subchild2, subchild3, subchild4]
+    def self_and_descendants
+      [self] + descendants
+    end
+
     # Returns the root node of the tree.
     def root
       node = self

data/lib/acts_as_tree/version.rb

@@ -1,3 +1,3 @@
 module ActsAsTree
-  VERSION = "1.4.0"
+  VERSION = "1.5.0"
 end

data/test/acts_as_tree_test.rb

@@ -166,6 +166,16 @@ class TreeTest < Test::Unit::TestCase
     assert_equal [@root2], @root2.self_and_ancestors
   end
 
+  def test_self_and_descendants
+    assert_equal [@root1, @root_child1, @root_child2, @child1_child, @child1_child_child], @root1.self_and_descendants
+    assert_equal [@root2], @root2.self_and_descendants
+  end
+
+  def test_descendants
+    assert_equal [@root_child1, @root_child2, @child1_child, @child1_child_child], @root1.descendants
+    assert_equal [], @root2.descendants
+  end
+
   def test_nullify
     root4       = TreeMixinNullify.create!
     root4_child = TreeMixinNullify.create! parent_id: root4.id

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_tree
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Erik Dahlstrand
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-25 00:00:00.000000000 Z
+date: 2013-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -100,10 +100,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.1.10
 signing_key: 
 specification_version: 4
 summary: Provides a simple tree behaviour to active_record models.
 test_files:
 - test/acts_as_tree_test.rb
-has_rdoc: