acts_as_tree 1.5.1 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c41a4e1bb7566bed286be2b6d709d809d1efab1
-  data.tar.gz: 4c3136bd0e036383541e9b28260918c8bcabd99e
+  metadata.gz: 67e739d15a0e45a13063f0a4d18a2d4b44de1d9e
+  data.tar.gz: a2625316f1ff34237ecd2c131f4720e7cf47fe2c
 SHA512:
-  metadata.gz: da1d685d61ea99d02e4293ccca0e48630730b972b72d391b4b8669d27ab50aebbb3b07b9d8de57d1c415f2d52f4605f79c0045c77f9c4039b29ab186d5440b6a
-  data.tar.gz: 8a93205c2921f71a909dc6c16e651e47a4c2c4c5ab7dd9cd80f517b7413f7675c04b9e1eaff12289cd7b784c3c581056c8045cb70253380a90bacf3e3cdb648f
+  metadata.gz: 02a256b253af5f240d9576a3e0c50adf0c50ba8a8ed6cc502b0b1d021f9a10e21444bba6e202083e51987fa35a1ee7e19bb04e98c7b20ccef61cf34ebd67aa73
+  data.tar.gz: b27d9dc1cf52e55f8db87a0ff7e139b3e3770859610b0cccdd417485782b697f68e4d98d0c3d2c3d756428696568a56c81d71970a80a42adf18cad36007df181

data/README.md

@@ -48,10 +48,12 @@ 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.6.0 - April 21, 2014
+	* Added new `leaves` method. See #23 -- MichalPokorny
 * 1.5.1 - March 28, 2014
 	* Fixing descendants modification bug. See #20 -- amerine, tmuerell
 * 1.5.0 - December 16th, 2013
-	* `Added new descendants method` -- adamkleingit
+	* Added new `descendants` method -- adamkleingit
 	* Fixed warning message -- akicho8
 * 1.4.0 - June 25th, 2013
 	* `Presentation#tree_view` -- rainchen

data/lib/acts_as_tree.rb

@@ -94,15 +94,35 @@ module ActsAsTree
 
         after_update :update_parents_counter_cache
 
-        def self.roots
+        def self.default_tree_order
           order_option = %Q{#{configuration.fetch :order, "nil"}}
-          where(:#{configuration[:foreign_key]} => nil).order(order_option)
+          order(order_option)
         end
 
         def self.root
           self.roots.first
         end
+
+        def self.roots
+          where(:#{configuration[:foreign_key]} => nil).default_tree_order
+        end
       EOV
+
+      if configuration[:counter_cache]
+        class_eval <<-EOV
+          def self.leaves
+            where(:children_count => 0).default_tree_order
+          end
+        EOV
+      else
+        # Fallback to less efficent ways to find leaves.
+        class_eval <<-EOV
+          def self.leaves
+            internal_ids = select(:#{configuration[:foreign_key]}).where(arel_table[:#{configuration[:foreign_key]}].not_eq(nil))
+            where("id NOT IN (\#{internal_ids.to_sql})").default_tree_order
+          end
+        EOV
+      end
     end
 
   end

data/lib/acts_as_tree/version.rb

@@ -1,3 +1,3 @@
 module ActsAsTree
-  VERSION = "1.5.1"
+  VERSION = "1.6.0"
 end

data/test/acts_as_tree_test.rb

@@ -67,6 +67,7 @@ class TreeTest < MiniTest::Unit::TestCase
 
   def setup
     setup_db
+
     @root1              = TreeMixin.create!
     @root_child1        = TreeMixin.create! parent_id: @root1.id
     @child1_child       = TreeMixin.create! parent_id: @root_child1.id
@@ -139,6 +140,14 @@ class TreeTest < MiniTest::Unit::TestCase
     assert_equal [@root1, @root2, @root3], TreeMixin.roots
   end
 
+  def test_leaves
+    assert_equal [@child1_child_child, @root_child2, @root2, @root3], TreeMixin.leaves
+  end
+
+  def test_default_tree_order
+    assert_equal [@root1, @root_child1, @child1_child, @child1_child_child, @root_child2, @root2, @root3], TreeMixin.default_tree_order
+  end
+
   def test_siblings
     assert_equal [@root2, @root3], @root1.siblings
     assert_equal [@root_child2], @root_child1.siblings
@@ -262,6 +271,7 @@ class TestDeepDescendantsPerformance < MiniTest::Unit::TestCase
   end
 
   def bench_descendants
+    skip("until I deal with the performance difference on travis")
     assert_performance_linear 0.99 do |x|
       obj = instance_variable_get "@root#{x}"
       obj.descendants
@@ -407,4 +417,7 @@ class TreeTestWithCounterCache < MiniTest::Unit::TestCase
     assert_equal 0, @child1.reload.children_count
   end
 
+  def test_leaves
+    assert_equal [@child1_child1, @child2], TreeMixinWithCounterCache.leaves
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_tree
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.0
 platform: ruby
 authors:
 - Erik Dahlstrand
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-28 00:00:00.000000000 Z
+date: 2014-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord