gf-treevisitor 0.0.11 → 0.0.12

data/VERSION

@@ -1 +1 @@
-0.0.11
+0.0.12

data/lib/treevisitor.rb

@@ -1,3 +1,3 @@
 class TreeVisitor
-  VERSION = '0.0.11'
+  VERSION = '0.0.12'
 end

data/lib/treevisitor/abs_node.rb

@@ -49,7 +49,7 @@ class AbsNode
   #
   def invalidate
     @path = nil
-    @path_from_root = nil
+    @path_with_prefix = nil
     @depth = nil    
   end
   
@@ -81,21 +81,21 @@ class AbsNode
   def path
     return @path unless @path.nil?
     if @parent.nil?
-      @path = @prefix_path.nil? ? @name : @prefix_path + @name
+      @path = @name
     else
       @path = @parent.path + AbsNode::path_separator + @name
     end
     @path
   end
   
-  def path_from_root
-    return @path_from_root unless @path_from_root.nil?
+  def path_with_prefix
+    return @path_with_prefix unless @path_with_prefix.nil?
     if @parent.nil?
-      @path_from_root = @prefix_path.nil? ? "" : @prefix_path
+      @path_with_prefix = @prefix_path.nil? ? @name : @prefix_path + @name
     else
-      @path_from_root = @parent.path_from_root + AbsNode::path_separator + @name
+      @path_with_prefix = @parent.path_with_prefix + AbsNode::path_separator + @name
     end
-    @path_from_root
+    @path_with_prefix
   end
 
   def depth

data/lib/treevisitor/tree_node.rb

@@ -63,14 +63,16 @@ class TreeNode < AbsNode
     @leaves << leaf
   end
 
-  def add_child( treeNode )
-    return if treeNode.parent == self
-    if not treeNode.parent.nil?
-      treeNode.remove_from_parent()
+  def add_child( tree_node )
+    return if tree_node.parent == self
+    if not tree_node.parent.nil?
+      tree_node.remove_from_parent()
+    else
+      tree_node.prefix_path = nil
     end  
-    treeNode.invalidate
-    treeNode.parent = self
-    @children << treeNode
+    tree_node.invalidate
+    tree_node.parent = self
+    @children << tree_node
   end
   
   def find( name )

data/test/treevisitor/tc_tree_node.rb

@@ -86,13 +86,18 @@ class TCTreeNode < Test::Unit::TestCase
       tb = TreeNode.new( "b", ta )
         ln3 = LeafNode.new( "3", tb )
 
-    assert_equal( "a",   ta.path  ) 
+    assert_equal( "a",   ta.path )
     assert_equal( "a/b", tb.path )
+    assert_equal( "a",   ta.path_with_prefix  )
+    assert_equal( "a/b", tb.path_with_prefix )
     
     ta.prefix_path= "<root>/"
-    
-    assert_equal( "<root>/a",   ta.path  ) 
-    assert_equal( "<root>/a/b", tb.path )
+
+    assert_equal("<root>/", ta.prefix_path )
+    assert_equal( "a",   ta.path )
+    assert_equal( "a/b", tb.path )
+    assert_equal( "<root>/a",   ta.path_with_prefix  )
+    assert_equal( "<root>/a/b", tb.path_with_prefix )
   end
 
   def test_invalidate
@@ -101,20 +106,20 @@ class TCTreeNode < Test::Unit::TestCase
       ln2 = LeafNode.new("2", ta)
       tb = TreeNode.new( "b", ta )
         ln3 = LeafNode.new( "3", tb )
-        
-    #@path = nil
-    #@path_from_root = nil
-    #@depth = nil    
 
-    
+    ta.prefix_path="root/"
     assert_equal( "a/b", tb.path )
-    assert_equal( "/b",  tb.path_from_root )
+    assert_equal( "root/a/b",  tb.path_with_prefix )
     assert_equal( 2, tb.depth )
     
     r = TreeNode.new( "r" )
     r.add_child( ta )
     assert_equal( "r/a/b", tb.path )
-    assert_equal( "/a/b", tb.path_from_root )
+    assert_equal( "r/a/b", tb.path_with_prefix )
+
+    r.prefix_path="new_root/"
+    assert_equal( "r/a/b", tb.path )
+    assert_equal( "new_root/r/a/b", tb.path_with_prefix )
     assert_equal( 3, tb.depth )
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gf-treevisitor
 version: !ruby/object:Gem::Version 
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors: 
 - gf