julik-make_like_a_tree 1.0.1 → 1.0.2

data/lib/make_like_a_tree.rb

@@ -1,6 +1,9 @@
 module Julik
   module MakeLikeTree
-    VERSION = '1.0.1'
+    class ImpossibleReparent < RuntimeError
+    end
+    
+    VERSION = '1.0.2'
     def self.included(base) #:nodoc:
       super
       base.extend(ClassMethods)
@@ -215,7 +218,25 @@ module Julik
       # other elements in the tree and shift them to the right, keeping everything
       # balanced.
       def add_child(child)
-        child.reload # Pull in the id
+        begin
+          add_child!(child)
+        rescue ImpossibleReparent
+          false
+        end
+      end
+      
+      # Tells you if a reparent might be invalid
+      def child_can_be_added?(child)
+        impossible = (child[root_column] == self[root_column] && 
+          child[left_col_name] < self[left_col_name]) && 
+          (child[right_col_name] > self[right_col_name])
+        !impossible
+      end
+      
+      # A noisy version of add_child, will raise an ImpossibleReparent if you try to reparent a node onto its indirect child
+      def add_child!(child)
+        raise ImpossibleReparent, "Cannot reparent #{child} onto its child node #{self}" unless child_can_be_added?(child)
+
         k = self.class
         
         new_left, new_right = determine_range_for_child(child)

data/test/test_ordered_tree.rb

@@ -93,6 +93,7 @@ context "A Node used with OrderedTree should" do
     
     reload(root_node, child_node)
     
+    root_node.child_can_be_added?(child_node).should.blaming("possible move").equal true
     root_node._lr.should.blaming("root node with one subset is 1,4").equal [1, 4]
     child_node._lr.should.blaming("first in nested range is 2,3").equal [2, 3]
   end
@@ -115,7 +116,7 @@ context "A Node used with OrderedTree should" do
     end
   end
   
-  specify "properly shift siblings to the right on child assignment to their left neighbour" do
+  specify "shift siblings to the right on child assignment to their left neighbour" do
     root_node = emit :name => "Root one"
     
     sub_node = emit :name => "Child 1", :parent_id => root_node.id
@@ -140,7 +141,7 @@ context "A Node used with OrderedTree should" do
     b.root_id.should.equal b.id
   end
   
-  specify "properly replant a branch" do
+  specify "replant a branch" do
     root_node_1 = emit :name => "First root"
     root_node_2 = emit :name => "Second root"
     root_node_3 = emit :name => "Third root"
@@ -163,7 +164,7 @@ context "A Node used with OrderedTree should" do
     root_node_2._lr.should.blaming("shifted right to make room").equal [9, 10]
   end
   
-  specify "properly report size after moving a branch from underneath" do
+  specify "report size after moving a branch from underneath" do
     root_node_1 = emit :name => "First root"
     root_node_2 = emit :name => "First root"
     
@@ -181,7 +182,7 @@ context "A Node used with OrderedTree should" do
     root_node_1.child_count.should.blaming("now has one child").equal 1
   end
   
-  specify "properly return siblings" do
+  specify "return siblings" do
     root_1 = emit :name => "Foo"
     root_2 = emit :name => "Bar"
     
@@ -191,7 +192,7 @@ context "A Node used with OrderedTree should" do
     root_2.siblings.should.equal [root_1]
   end
   
-  specify "properly return siblings and self" do
+  specify "return siblings and self" do
     root_1 = emit :name => "Foo"
     root_2 = emit :name => "Bar"
     
@@ -310,8 +311,17 @@ context "A Node used with OrderedTree should" do
     c._lr.should.equal [5, 6]
   end
   
-  #specify "support promote_to_root" do
-  def test_promote_to_root
+  specify "should not allow reparenting an item into its child" do
+    root = emit :name => "foo"
+    child = emit :name => "bar", :parent_id => root.id
+    reload(root, child)
+    
+    child.child_can_be_added?(root).should.blaming("Impossible move").equal false
+    lambda { child.add_child!(root)}.should.raise(Julik::MakeLikeTree::ImpossibleReparent)
+    child.add_child(root).should.equal false
+  end
+  
+  specify "support promote_to_root" do
     a, b = emit_many(2)
     c = emit(:name => "Subtree", :parent_id => a.id)
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: julik-make_like_a_tree
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors: 
 - Julik