gf-treevisitor 0.0.8 → 0.0.10

data/lib/treevisitor/visitors/build_dir_tree_visitor.rb

@@ -1,46 +1,44 @@
-# common
-require 'treevisitor/tree_node'
-require 'treevisitor/dir_tree_walker'
-require 'treevisitor/tree_node_visitor'
-
-#
-# costruisce una albero TreeNode a partire dalla struttura
-# della directory, simile a clona
-# Clona un TreeNode
-#
-class BuildDirTreeVisitor < TreeNodeVisitor
-  
-  attr_reader :root
-
-  attr_reader :nr_directories
-  attr_reader :nr_files
-  
-  def initialize
-    super
-    @root = nil
-    @stack = []
-    @nr_directories = 0
-    @nr_files = 0
-  end
-  
-  def enter_treeNode( pathname )
-    if @stack.empty?
-      treeNode = TreeNode.new( File.basename( pathname ) )
-      @root = treeNode
-    else
-      treeNode = TreeNode.new( File.basename( pathname ), @stack.last )
-    end
-    @nr_directories += 1
-    @stack.push( treeNode )
-  end
-
-  def exit_treeNode( pathname )
-    @stack.pop
-  end
-
-  def visit_leafNode( pathname )
-    @nr_files  += 1
-    leafNode = LeafNode.new( File.basename(pathname), @stack.last )
-  end
-
-end
+require 'treevisitor/tree_node'
+require 'treevisitor/dir_tree_walker'
+require 'treevisitor/tree_node_visitor'
+
+#
+# Buils a TreeNode from a filesystem directory
+# It similar to CloneTreeNodeVisitor
+#
+class BuildDirTreeVisitor < TreeNodeVisitor
+  
+  attr_reader :root
+
+  attr_reader :nr_directories
+  attr_reader :nr_files
+  
+  def initialize
+    super
+    @root = nil
+    @stack = []
+    @nr_directories = 0
+    @nr_files = 0
+  end
+  
+  def enter_tree_node( pathname )
+    if @stack.empty?
+      treeNode = TreeNode.new( File.basename( pathname ) )
+      @root = treeNode
+    else
+      treeNode = TreeNode.new( File.basename( pathname ), @stack.last )
+    end
+    @nr_directories += 1
+    @stack.push( treeNode )
+  end
+
+  def exit_tree_node( pathname )
+    @stack.pop
+  end
+
+  def visit_leaf_node( pathname )
+    @nr_files  += 1
+    leafNode = LeafNode.new( File.basename(pathname), @stack.last )
+  end
+
+end

data/lib/treevisitor/visitors/callback_tree_node_visitor.rb

@@ -1,5 +1,7 @@
 #
-# CallbackTreeNodeVisitor
+# Executes a block when enter in a node
+# The block are defined from on_enter_X methods
+# The blocks take as argument only the node
 #
 class CallbackTreeNodeVisitor < TreeNodeVisitor
 
@@ -20,7 +22,7 @@ class CallbackTreeNodeVisitor < TreeNodeVisitor
     @action_visitLeafNode = action
   end
 
-  def enter_treeNode( treeNode )
+  def enter_tree_node( treeNode )
     parentNode = if @stack.empty?
                    nil
                  else
@@ -31,11 +33,11 @@ class CallbackTreeNodeVisitor < TreeNodeVisitor
     @action_enterTreeNode.call( treeNode ) if @action_enterTreeNode
   end
 
-  def exit_treeNode( treeNode )
+  def exit_tree_node( treeNode )
     @stack.pop
   end
 
-  def visit_leafNode( leafNode )
+  def visit_leaf_node( leafNode )
     parentNode = @stack.last
     @action_visitLeafNode.call( leafNode ) if @action_visitLeafNode
   end

data/lib/treevisitor/visitors/callback_tree_node_visitor2.rb

@@ -1,6 +1,8 @@
 
 #
-# CallbackTreeNodeVisitor
+# Executes a block when enter in a node
+# The block are defined from on_enter_X methods
+# The blocks take as argument the node and the parent_node
 #
 class CallbackTreeNodeVisitor2 < TreeNodeVisitor
 
@@ -21,7 +23,7 @@ class CallbackTreeNodeVisitor2 < TreeNodeVisitor
     @action_visitLeafNode = action
   end
 
-  def enter_treeNode( treeNode )
+  def enter_tree_node( treeNode )
     newParentNode = if @stack.empty?
                       nil
                     else
@@ -32,11 +34,11 @@ class CallbackTreeNodeVisitor2 < TreeNodeVisitor
     @stack.push( newTreeNode )
   end
 
-  def exit_treeNode( treeNode )
+  def exit_tree_node( treeNode )
     @stack.pop
   end
 
-  def visit_leafNode( leafNode )
+  def visit_leaf_node( leafNode )
     newParentNode = @stack.last
     @action_visitLeafNode.call( leafNode, newParentNode )
   end

data/lib/treevisitor/visitors/clone_tree_node_visitor.rb

@@ -1,6 +1,5 @@
 #
-# Esempio
-# Clona un TreeNode
+# Clone a tree_node
 #
 class CloneTreeNodeVisitor < TreeNodeVisitor
 
@@ -12,7 +11,7 @@ class CloneTreeNodeVisitor < TreeNodeVisitor
     @stack = []
   end
 
-  def enter_treeNode( treeNode )
+  def enter_tree_node( treeNode )
     if @stack.empty?
       clonedTreeNode = TreeNode.new( treeNode.name )
       @clonedRoot = clonedTreeNode
@@ -22,11 +21,11 @@ class CloneTreeNodeVisitor < TreeNodeVisitor
     @stack.push( clonedTreeNode )
   end
 
-  def exit_treeNode( treeNode )
+  def exit_tree_node( treeNode )
     @stack.pop
   end
 
-  def visit_leafNode( leafNode )
+  def visit_leaf_node( leafNode )
     clonedLeafNode = LeafNode.new( leafNode.name, @stack.last )
   end
 

data/lib/treevisitor/visitors/depth_tree_node_visitor.rb

@@ -1,5 +1,5 @@
 #
-#
+# Simple visitor: show how calculate the depth of a tree
 #
 class DepthTreeNodeVisitor < TreeNodeVisitor
 
@@ -10,15 +10,15 @@ class DepthTreeNodeVisitor < TreeNodeVisitor
     @depth = 0
   end
 
-  def enter_treeNode( treeNode )
+  def enter_tree_node( treeNode )
     @depth += 1
   end
 
-  def exit_treeNode( treeNode )
+  def exit_tree_node( treeNode )
     @depth -= 1
   end
 
-  def visit_leafNode( leafNode )
+  def visit_leaf_node( leafNode )
   end
 
 end

data/lib/treevisitor/visitors/flat_print_tree_node_visitors.rb

@@ -1,17 +1,16 @@
 #
-# Utilizzo della classa astratta DirTreeProcessor
-# per stampare i nodi di un TreeNode
+# Print for every node the name
 #
 class FlatPrintTreeNodeVisitor < TreeNodeVisitor
 
-  def enter_treeNode( treeNode )
+  def enter_tree_node( treeNode )
     puts treeNode.name
   end
 
-  def exit_treeNode( treeNode )
+  def exit_tree_node( treeNode )
   end
 
-  def visit_leafNode( leafNode )
+  def visit_leaf_node( leafNode )
     puts leafNode.name
   end
 

data/lib/treevisitor/visitors/print_dir_tree_visitor.rb

@@ -1,17 +1,17 @@
 #
-# Utilizzo della classa astratta DirTreeProcessor
-# per stampare i nodi di un TreeNode
-#
+# Visitor for DirTreeWalker
+# Prints the node at enter
+# TODO: join this con PrintTreeNodeVisitor
 class PrintDirTreeVisitor < TreeNodeVisitor
 
-  def enter_treeNode( pathname )
+  def enter_tree_node( pathname )
     puts pathname
   end
 
-  def exit_treeNode( treeNode )
+  def exit_tree_node( treeNode )
   end
 
-  def visit_leafNode( pathname )
+  def visit_leaf_node( pathname )
     puts pathname
   end
 

data/lib/treevisitor/visitors/print_tree_node_visitor.rb

@@ -1,3 +1,6 @@
+#
+# Prints TreeNode names indenting according to depth
+#
 class PrintTreeNodeVisitor < TreeNodeVisitor
 
   def initialize( *args )
@@ -5,7 +8,7 @@ class PrintTreeNodeVisitor < TreeNodeVisitor
     @depth = 0
   end
 
-  def visit_leafNode( leafNode )
+  def visit_leaf_node( leafNode )
     str = ""
     (0...@depth-1).step {
       str << " |-"
@@ -14,7 +17,7 @@ class PrintTreeNodeVisitor < TreeNodeVisitor
     puts str + leafNode.name.to_s
   end
 
-  def enter_treeNode( treeNode )
+  def enter_tree_node( treeNode )
 
     str = ""
     (0...@depth).step {
@@ -29,7 +32,7 @@ class PrintTreeNodeVisitor < TreeNodeVisitor
     @depth += 1
   end
 
-  def exit_treeNode( treeNode )
+  def exit_tree_node( treeNode )
     @depth -= 1
   end
 end

data/lib/treevisitor/visitors/{print_node_visitor2.rb → print_tree_node_visitor2.rb}

@@ -1,3 +1,6 @@
+#
+# Prints node using "to_s" instead of name
+# TODO: join this with PrintTreeNodeVisitor
 class PrintTreeNodeVisitor2 < TreeNodeVisitor
 
   def initialize( *args )
@@ -5,16 +8,16 @@ class PrintTreeNodeVisitor2 < TreeNodeVisitor
     @depth = 0
   end
 
-  def visit_leafNode( leafNode )
+  def visit_leaf_node( leaf_node )
     str = ""
     (0...@depth-1).step {
       str << " |-"
     }
     str << " |  "
-    puts str + leafNode.to_s
+    puts str + leaf_node.to_s
   end
 
-  def enter_treeNode( treeNode )
+  def enter_tree_node( tree_node )
 
     str = ""
     (0...@depth).step {
@@ -22,14 +25,14 @@ class PrintTreeNodeVisitor2 < TreeNodeVisitor
     }
 
     if @depth == 0
-      puts str + treeNode.to_s
+      puts str + tree_node.to_s
     else
-      puts str + treeNode.to_s
+      puts str + tree_node.to_s
     end
     @depth += 1
   end
 
-  def exit_treeNode( treeNode )
+  def exit_tree_node( tree_node )
     @depth -= 1
   end
 end

data/lib/treevisitor.rb

@@ -1,3 +1,3 @@
-class TreeVisitor
-  VERSION = '0.0.8'
-end
+class TreeVisitor
+  VERSION = '0.0.10'
+end

data/test/gf_utilities/tc_md5.rb

@@ -1,14 +1,14 @@
-require File.join( File.dirname(__FILE__), "test_helper")
-
-require 'gf_utilities/md5.rb'
-
-class TCMD5 < Test::Unit::TestCase
-
-  TEST_FILE = File.join( $TREEVISITOR_HOME, "lib", "gf_utilities", "md5.rb" )
-
-  def test_simple_md5
-    file_name = File.join( TEST_FILE )
-    assert_equal "0cac752fb36269471d8265435ed99443", MD5.file( file_name ).to_s
-  end
-
-end
+require File.join( File.dirname(__FILE__), "test_helper")
+
+require 'gf_utilities/md5.rb'
+
+class TCMD5 < Test::Unit::TestCase
+
+  TEST_FILE = File.join( $TREEVISITOR_HOME, "lib", "gf_utilities", "md5.rb" )
+
+  def test_simple_md5
+    file_name = File.join( TEST_FILE )
+    assert_equal "8777d9d35da17496e21dcc8a4f9f8191", MD5.file( file_name ).to_s
+  end
+
+end

data/test/treevisitor/cli/tc_cli_tree.rb

@@ -11,7 +11,7 @@ class TCCliTree < Test::Unit::TestCase
       args = %w{-h}
       CliTree.new.parse_args(args)
     end
-    assert out.start_with?("Usage:")
+    assert_match /Usage:/, out
   end
 
   def test_version

data/test/treevisitor/tc_dir_processor.rb

@@ -8,8 +8,8 @@ class TCDirProcessor < Test::Unit::TestCase
 
   def test_simple
     files = []
-    dp = DirProcessor.new(TEST_DATA) { |f| files << f }
-    dp.run
+    dp = DirProcessor.new { |f| files << f }
+    dp.process(TEST_DATA)
     assert_equal 3, files.length
   end
 end

data/test/treevisitor/tc_tree_node.rb

@@ -7,8 +7,11 @@ class TCTreeNode < Test::Unit::TestCase
   def test_simple_build
     ta = TreeNode.new( "a" )
     assert( ta.root? )
+
     ln1 = LeafNode.new("1", ta)
     assert_equal( ta, ln1.parent )
+    assert !ln1.root?
+
     ln2 = LeafNode.new("2", ta)
     tb = TreeNode.new( "b", ta )
     ln3 = LeafNode.new( "3", tb )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gf-treevisitor
 version: !ruby/object:Gem::Version 
-  version: 0.0.8
+  version: 0.0.10
 platform: ruby
 authors: 
 - gf
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-30 00:00:00 -07:00
+date: 2009-06-02 00:00:00 -07:00
 default_executable: tree.rb
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,7 +22,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
-description: 
+description: Implementation of visitor design pattern. It contains a 'tree.rb' command line clone of the tree unix tool.
 email: giovanni.ferro@gmail.com
 executables: 
 - tree.rb
@@ -53,8 +53,8 @@ files:
 - lib/treevisitor/visitors/depth_tree_node_visitor.rb
 - lib/treevisitor/visitors/flat_print_tree_node_visitors.rb
 - lib/treevisitor/visitors/print_dir_tree_visitor.rb
-- lib/treevisitor/visitors/print_node_visitor2.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
@@ -90,7 +90,7 @@ rubyforge_project: treevisitor
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 3
-summary: implementation of visitor design pattern
+summary: Implementation of visitor design pattern
 test_files: 
 - test/treevisitor/tc_dir_processor.rb
 - test/treevisitor/cli/tc_cli_tree.rb