Ticket #42: betternestedset.patch

test/acts_as_nested_set_test.rb

@@ -310 +310 @@
-    assert_equal(set2(1), set2(2).parent)
-    assert_equal(set2(3), set2(7).parent)
-  end
+
+  def test_descendant_of_returns_true_when_the_childs_left_and_right_is_within_the_left_and_right_of_the_passed_in_node
+    child = set2(9)
+    root = set2(1)
+    assert child.descendant_of?(root), "child should have been a descendant of root"
+    
+    parent = set2(4)
+    assert_equal parent.id, child.parent_id
+    assert child.descendant_of?(parent), "child should have been a descendant of its parent"
+    
+    assert parent.descendant_of?(parent), "parent should have been a descendant of itself"
+  end
-  
+  def test_descendant_of_returns_false_when_the_childs_left_and_right_are_not_within_the_left_and_right_of_the_passed_in_node
+    child = set2(9)
+    parent = set2(4)
+    assert !parent.descendant_of?(child), "parent should not have been a descendant of its child"
+
+    sibling = set2(8)
+    assert !sibling.descendant_of?(child), "sibling should not have been a descendant of the child"
+    assert !child.descendant_of?(sibling), "child should not have been a descendant of the sibling"
+    
+    cousin = set2(7)
+    assert !cousin.descendant_of?(child), "cousin should not have been a descendant of the child"
+    assert !child.descendant_of?(cousin), "child should not have been a descendant of the cousin"
+  end
+  
-  def test_ancestors
-    assert_equal([], set2(1).ancestors)
-    assert_equal([set2(1), set2(4), set2(9)], set2(10).ancestors)

lib/better_nested_set.rb

@@ -449 +449 @@
-          self[left_col_name] <=> x[left_col_name]
-        end
-        
+        # Returns true if this is a descendant of the passed in node. Also returns true if this is the passed in node.
+        def descendant_of?(node)
+          node[left_col_name] <= self[left_col_name] && node[right_col_name] >= self[right_col_name]
+        end
+        
-        # Deprecated. Returns true if this is a root node.
-        def root?
-          parent_id = self[parent_col_name]
@@ -925 +930 @@
-          raise ActiveRecord::ActiveRecordError, "You cannot move a node if left or right is nil" unless self[left_col_name] && self[right_col_name]
-          
-          with_optional_transaction(transact) do
-
+ #
-            if target.is_a?(base_set_class)
-
+ #
-            else
-              target = self.class.find_in_nested_set(target) # load object if we were given an ID
-            end
@@ -1003 +1008 @@
-                  ELSE #{parent_col_name} END",
-                scope_condition)
-            end
-
-
+ #
+ #
-          end
-        end
-