gf-treevisitor 0.0.12 → 0.0.13

data/VERSION

@@ -1 +1 @@
-0.0.12
+0.0.13

data/lib/treevisitor.rb

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

data/lib/treevisitor/abs_node.rb

@@ -108,6 +108,10 @@ class AbsNode
     not_implemented
   end
 
+  def to_s
+    @name.to_s
+  end
+
   protected
 
   def parent=( parent )

data/lib/treevisitor/dir_tree_walker.rb

@@ -96,7 +96,7 @@ class DirTreeWalker
     @visitor.enter_tree_node( dirname )
     # return if ignore_dir?( dirname )
 
-    Dir.entries( dirname ).each { |basename|
+    Dir.entries( dirname ).sort.each { |basename|
       next if basename == "." or basename == ".."  # ignore always "." and ".."
       pathname = File.join( dirname, basename )
 

data/lib/treevisitor/leaf_node.rb

@@ -23,8 +23,4 @@ class LeafNode < AbsNode
     visitor
   end
 
-  def to_str
-    name.to_str
-  end
-
 end

data/lib/treevisitor/tree_node.rb

@@ -57,8 +57,10 @@ class TreeNode < AbsNode
     if @leaves.length > 0
       @leaves.last.next = leaf
       leaf.prev = @leaves.last
-      leaf.next = nil
+    else
+      leaf.prev = nil
     end
+    leaf.next = nil
     leaf.invalidate
     @leaves << leaf
   end
@@ -66,12 +68,19 @@ class TreeNode < AbsNode
   def add_child( tree_node )
     return if tree_node.parent == self
     if not tree_node.parent.nil?
-      tree_node.remove_from_parent()
+      tree_node.remove_from_parent
     else
       tree_node.prefix_path = nil
     end  
     tree_node.invalidate
     tree_node.parent = self
+    if @children.length > 0
+      @children.last.next = tree_node
+      tree_node.prev = @children.last
+    else
+      tree_node.prev = nil
+    end
+    tree_node.next = nil
     @children << tree_node
   end
   
@@ -105,33 +114,36 @@ class TreeNode < AbsNode
     visitor
   end
 
-  def to_str( depth = 0 )
+  def to_str( prefix= "" )
     str = ""
-    (0...depth).step {
-      str << " |-"
-    }
-
-    str << @name
-    str << "\n"
 
-    if ! @leaves.empty?
-      @leaves.each{ |l|
-        (0...depth-1).step {
-          str << " |-"
-        }
-        if @children.empty?
-          str << " |    "
-        else
-          str << " |  | "
-        end
-        str << l.to_str
-        str << "\n"
-      }
+    if root?
+      str << to_s << "\n"
+    else
+      str << prefix 
+      if self.next 
+        str << "|-- "
+      else
+        str << "\`-- "
+      end
+      str << to_s << "\n"
+      prefix += self.next ? "|   " : "    "
+    end
+    
+    @leaves.each do |leaf|
+      str << prefix
+      if !leaf.next.nil? or !@children.empty?
+        str << "|-- "
+      else
+        str << "\`-- "
+      end
+      str <<  leaf.to_s << "\n"
     end
 
-    @children.each { |tn|
-      str << tn.to_str( depth + 1 )
-    }
+    @children.each do |child|
+      str << child.to_str( prefix )
+    end
     str
   end
+
 end

data/lib/treevisitor/visitors/callback_tree_node_visitor.rb

@@ -7,8 +7,8 @@ class CallbackTreeNodeVisitor < TreeNodeVisitor
 
   def initialize
     super()
-    @stack = []
     @root = nil
+    @stack = []
     @action_enter_tree_node = nil
     @action_visit_leaf_node = nil
   end

data/lib/treevisitor/visitors/callback_tree_node_visitor2.rb

@@ -8,10 +8,11 @@ class CallbackTreeNodeVisitor2 < TreeNodeVisitor
 
   attr_reader :root
 
-  def initialize
+  def initialize( delegate = nil)
     super()
     @stack = []
     @root = nil
+    @delegate = delegate
   end
 
   def on_enter_tree_node( &action )
@@ -22,21 +23,37 @@ class CallbackTreeNodeVisitor2 < TreeNodeVisitor
     @action_visit_leaf_node = action
   end
 
-  def enter_tree_node( tree_node )
-    parent_node = @stack.empty? ? nil : @stack.last
-    new_tree_node = @action_enter_tree_node.call( tree_node, parent_node )
-    @root = new_tree_node if @stack.empty?
-    @stack.push( new_tree_node )
+  def _on_enter_tree_node( src_tree_node, dst_parent_node )
+    if @action_enter_tree_node
+      dst_tree_node = @action_enter_tree_node.call( src_tree_node, dst_parent_node )
+    elsif @delegate
+      dst_tree_node = @delegate.on_enter_tree_node( src_tree_node, dst_parent_node )
+    end
+    dst_tree_node
   end
 
-  def exit_tree_node( tree_node )
+  def _on_visit_leaf_node( src_leaf_node, parent_node )
+    if @action_visit_leaf_node
+      @action_visit_leaf_node.call( src_leaf_node, parent_node )
+    elsif @delegate
+      @delegate.on_visit_leaf_node( src_leaf_node, parent_node )
+    end
+  end
+
+  def enter_tree_node( src_tree_node )
+    dst_parent_node = @stack.empty? ? nil : @stack.last
+    dst_tree_node = _on_enter_tree_node( src_tree_node, dst_parent_node )
+    @root = dst_tree_node if @stack.empty?
+    @stack.push( dst_tree_node )
+  end
+
+  def exit_tree_node( src_tree_node )
     @stack.pop
   end
 
-  def visit_leaf_node( leaf_node )
+  def visit_leaf_node( src_leaf_node )
     parent_node = @stack.last
-    @action_visit_leaf_node.call( leaf_node, parent_node )
+    _on_visit_leaf_node( src_leaf_node, parent_node )
   end
-
 end
 

data/lib/treevisitor/visitors/print_tree_node_visitor.rb

@@ -8,7 +8,6 @@ class PrintTreeNodeVisitor < TreeNodeVisitor
   end
 
   def enter_tree_node( tree_node )
-
     str = ""
     (0...@depth).step {
       str << " |-"

data/test/treevisitor/tc_dir_tree_walker.rb

@@ -17,7 +17,7 @@ class TCDirTreeWalker < Test::Unit::TestCase
     visitor = BlockTreeNodeVisitor.new { |pathname| accumulator << File.basename( pathname ) }
     dir_tree_walker.run( visitor )
     assert_equal( 9, accumulator.length )
-    assert_equal( %w{ test_data dir.1 dir.1.2 file.1.2.1 file.1.1 dir.2 file.2.1 .dir_with_dot dummy.txt}, accumulator )
+    assert_equal( %w{ test_data dir.1 dir.1.2 file.1.2.1 file.1.1 dir.2 file.2.1 .dir_with_dot dummy.txt}.sort, accumulator.sort )
   end
 
   def test_ignore_function

data/test/treevisitor/tc_tree_node.rb

@@ -4,7 +4,7 @@ require 'treevisitor/tree_node.rb'
 
 class TCTreeNode < Test::Unit::TestCase
 
-  def test_simple_build
+  def test_new
     ta = TreeNode.new( "a" )
     assert( ta.root? )
 
@@ -28,7 +28,7 @@ class TCTreeNode < Test::Unit::TestCase
     # puts ta.to_str
   end
 
-  def test_add_methods
+  def test_add_child_and_add_leaf
     ta = TreeNode.new( "a" )
     assert( ta.root? )
     
@@ -48,22 +48,32 @@ class TCTreeNode < Test::Unit::TestCase
     # puts ta.to_str
   end
   
-  def test_next_prev
+  def test_next_and_prev
     ta = TreeNode.new( "a" )
+    assert_nil ta.prev
+    assert_nil ta.next
     
     ln1 = LeafNode.new("1", ta)
-    assert_nil( ln1.next )
-    assert_nil( ln1.prev )
+    assert_nil ln1.prev
+    assert_nil ln1.next
     
     ln2 = LeafNode.new("2", ta)
-    assert_equal( ln1, ln2.prev )
-    assert_nil( ln2.next )
+    assert_equal ln1, ln2.prev 
+    assert_nil ln2.next 
     
     ln3 = LeafNode.new("3", ta)
-    assert_equal( ln3, ln2.next )
+    assert_equal ln3, ln2.next
+
+    tb = TreeNode.new("b", ta)
+    assert_nil tb.next
+    assert_nil tb.prev
+
+    tc = TreeNode.new("c", ta)
+    assert_equal tb, tc.prev
+    assert_nil tc.next
   end
   
-  def test_nr_methods
+  def test_nr_nodes_and_nr_leaves_adn_nr_children
     ta = TreeNode.new( "a" )
       ln1 = LeafNode.new("1", ta)
       ln2 = LeafNode.new("2", ta)
@@ -134,4 +144,22 @@ class TCTreeNode < Test::Unit::TestCase
     assert_equal(tb, ta.find( "b"))
     assert_nil( ta.find("not existent"))
   end
+
+  def test_to_str
+    ta = TreeNode.new( "a" )
+      ln1 = LeafNode.new("1", ta)
+      ln2 = LeafNode.new("2", ta)
+      tb = TreeNode.new( "b", ta )
+        ln3 = LeafNode.new( "3", tb )
+
+    out = <<EOS
+a
+|-- 1
+|-- 2
+`-- b
+    `-- 3
+EOS
+    assert_equal out, ta.to_str
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gf-treevisitor
 version: !ruby/object:Gem::Version 
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors: 
 - gf
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-06 00:00:00 -07:00
+date: 2009-06-07 00:00:00 -07:00
 default_executable: tree.rb
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -54,7 +54,6 @@ files:
 - lib/treevisitor/visitors/flat_print_tree_node_visitors.rb
 - lib/treevisitor/visitors/print_dir_tree_visitor.rb
 - lib/treevisitor/visitors/print_tree_node_visitor.rb
-- lib/treevisitor/visitors/print_tree_node_visitor2.rb
 - test_data/gf_utility/kwartz_test_data/out.certified/dummy.txt
 - test_data/gf_utility/kwartz_test_data/out/dummy.txt
 - test_data/gf_utility/kwartz_test_data/source/test1.html

data/lib/treevisitor/visitors/print_tree_node_visitor2.rb

@@ -1,38 +0,0 @@
-#
-# Prints node using "to_s" instead of name
-# TODO: join this with PrintTreeNodeVisitor
-class PrintTreeNodeVisitor2 < TreeNodeVisitor
-
-  def initialize
-    @depth = 0
-  end
-
-  def enter_tree_node( tree_node )
-
-    str = ""
-    (0...@depth).step {
-      str << " |-"
-    }
-
-    if @depth == 0
-      puts str + tree_node.to_s
-    else
-      puts str + tree_node.to_s
-    end
-    @depth += 1
-  end
-
-  def exit_tree_node( tree_node )
-    @depth -= 1
-  end
-
-  def visit_leaf_node( leaf_node )
-    str = ""
-    (0...@depth-1).step {
-      str << " |-"
-    }
-    str << " |  "
-    puts str + leaf_node.to_s
-  end
-
-end