Ticket #37: leaves_and_parents_class_methods.patch

test/acts_as_nested_set_test.rb

@@ -87 +87 @@
-    assert_equal(10, NestedSet.roots.size) # May change if STI behavior changes
-  end
-  
+  def test_class_parents
+    assert_equal(8, NestedSetWithStringScope.parents.size)
+  end
+  
+  def test_class_leaves
+    assert_equal(12, NestedSetWithStringScope.leaves.size)
+  end
+  
+  def test_class_proper_count_of_leaves_and_parents
+    assert_equal(NestedSetWithStringScope.count, NestedSetWithStringScope.parents.size + NestedSetWithStringScope.leaves.size)
+  end
+  
-  def test_check_all_1
-    assert_nothing_raised {NestedSetWithStringScope.check_all}
-    NestedSetWithStringScope.update_all("lft = 3", "id = 103")

lib/better_nested_set.rb

@@ -90 +90 @@
-          acts_as_nested_set_options[:class].find(:all, :conditions => "(#{acts_as_nested_set_options[:parent_column]} IS NULL OR #{acts_as_nested_set_options[:parent_column]} = 0)", :order => "#{acts_as_nested_set_options[:left_column]}")
-        end
-        
+        # Returns all items which have children across all trees
+        def parents
+          acts_as_nested_set_options[:class].find(:all, :conditions => "(#{acts_as_nested_set_options[:right_column]} <> #{acts_as_nested_set_options[:left_column]} + 1)", :order => "#{acts_as_nested_set_options[:left_column]}")
+        end
+        
+        # Returns all items which do not have children across all trees
+        def leaves
+          acts_as_nested_set_options[:class].find(:all, :conditions => "(#{acts_as_nested_set_options[:right_column]} = #{acts_as_nested_set_options[:left_column]} + 1)", :order => "#{acts_as_nested_set_options[:left_column]}")
+        end
+        
-        # Checks the left/right indexes of all records, 
-        # returning the number of records checked. Throws ActiveRecord::ActiveRecordError if it finds a problem.
-        def check_all

README

@@ -93 +93 @@
-Other instance methods added by this plugin include:
-* <tt>root</tt> - root item of the tree (the one that has a nil parent)
-* <tt>roots</tt> - root items, in case of multiple roots (the ones that have a nil parent)
+* <tt>parents</tt> - parent items, all items that have children
+* <tt>leaves</tt> - leaf items, all items that do not have children
-* <tt>level</tt> - number indicating the level, a root being level 0
-* <tt>ancestors</tt> - array of all parents, with root as first item
-* <tt>self_and_ancestors</tt> - array of all parents and self