treevisitor 0.1.6 → 0.2.0

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 0
-:minor: 1
-:patch: 6
+:minor: 2
+:patch: 0
 :build: 

data/examples/directory_walker/directory_without_subdirectory.rb

@@ -16,13 +16,13 @@ class DirWithoutSubDir < TreeVisitor::BasicTreeNodeVisitor
     @nr = 0
   end
 
-  def enter_tree_node( pathname )
+  def enter_node( pathname )
     @nr += 1
     info = OpenStruct.new(:nr => @nr, :pathname => pathname)
     @stack.push( info )
   end
 
-  def exit_tree_node( pathname )
+  def exit_node( pathname )
     info = @stack.pop
     if info.nr == @nr
       puts "leaf: #{pathname}"

data/examples/directory_walker/find_files.rb

@@ -6,12 +6,12 @@ require 'treevisitor'
 include TreeVisitor
 
 class MyVisitor < BasicTreeNodeVisitor
-  def visit_leaf_node( pathname )
+  def visit_leaf( pathname )
     puts pathname
   end
 end
 
-dtw = DirTreeWalker.new( ".." )
+dtw = DirTreeWalker.new( File.join(File.dirname(__FILE__), "..", ".." ) )
 dtw.match "leaf_node.rb"
 dtw.match "abs_node.rb"
 dtw.run( MyVisitor.new )

data/examples/directory_walker/print_files.rb

@@ -6,7 +6,7 @@ include TreeVisitor
 
 dtw = DirTreeWalker.new( :ignore => ".git" )
 dtw.run ".." do
-  on_visit_leaf_node do |pathname|
+  on_leaf do |pathname|
     puts pathname
   end
 end

data/lib/treevisitor/abs_node.rb

@@ -34,7 +34,7 @@ module TreeVisitor
 
     attr_reader :parent
     attr_reader :content
-  
+
     attr_accessor :prev
     attr_accessor :next
 
@@ -43,39 +43,38 @@ module TreeVisitor
     #
     # @param content of node
     #
-    def initialize( content )
-      @parent = nil
-      @content = content
+    def initialize(content)
+      @parent      = nil
+      @content     = content
       @prefix_path = nil
       invalidate
     end
-  
+
     #
     # invalidate cached path info
     #
     def invalidate
-      @path = nil
+      @path             = nil
       @path_with_prefix = nil
-      @depth = nil
-      @root = nil
+      @depth            = nil
+      @root             = nil
     end
 
     #
     # Root node could have assigned a path
     #
     def prefix_path
-      if not @parent.nil?
-        raise "Not root!!"
-      end
+      raise "Not root!!" unless @parent.nil?
       @prefix_path
     end
-  
-    def prefix_path=( prefix )
-      if not @parent.nil?
-        raise "Not root!!"
-      end
+
+    def prefix_path=(prefix)
+      raise "Not root!!" unless @parent.nil?
       if prefix != @prefix_path
         @prefix_path = prefix
+        if prefix and prefix !~ /\/$/
+          @prefix_path += AbsNode::path_separator
+        end
         invalidate
       end
     end
@@ -107,13 +106,12 @@ module TreeVisitor
     # @return [String] path to this node with prefix
     #
     def path_with_prefix
-      return @path_with_prefix unless @path_with_prefix.nil?
-      if @parent.nil?
-        @path_with_prefix = @prefix_path.nil? ? @content : @prefix_path + @content
+      return @path_with_prefix if @path_with_prefix
+      if root.prefix_path
+        @path_with_prefix = root.prefix_path + path
       else
-        @path_with_prefix = @parent.path_with_prefix + AbsNode::path_separator + @content
+        @path_with_prefix = path
       end
-      @path_with_prefix
     end
 
     #
@@ -128,7 +126,7 @@ module TreeVisitor
     #
     # Accept a node visitor
     #
-    def accept( visitor )
+    def accept(visitor)
       not_implemented
     end
 
@@ -138,7 +136,7 @@ module TreeVisitor
 
     protected
 
-    def parent=( parent )
+    def parent=(parent)
       @parent = parent
     end
 

data/lib/treevisitor/basic_tree_node_visitor.rb

@@ -9,21 +9,26 @@ module TreeVisitor
     #
     # called on tree node at start of the visit i.e. we start to visit the subtree
     #
-    def enter_tree_node( tree_node )
+    def enter_node( tree_node )
     end
 
+    # alias :enter_tree_node :enter_node
+
     #
     # called on tree node at end of the visit i.e. oll subtree are visited
     #
-    def exit_tree_node( tree_node )
+    def exit_node( tree_node )
     end
 
+    # alias :exit_tree_node :exit_node
+
     #
     # called when visit leaf node
     #
-    def visit_leaf_node( leaf_node )
+    def visit_leaf( leaf_node )
     end
 
+    # alias :visit_leaf_node :visit_leaf
   end
 
 end

data/lib/treevisitor/directory_walker.rb

@@ -17,9 +17,12 @@ module TreeVisitor
     # @overload initialize(dirname)
     #   @param [String] dirname the root of the tree (top level directory)
     # 
-    # @overload initialize(dirname,options)
+    # @overload initialize(dirname, options)
     #   @param [Hash] options
     #   @option options [String,Regex, Array<String,Regexp>] :ignore list of ignore pattern
+    #   @option options [String] :ignore_dir
+    #   @option options [String] :ignore_file
+    #   @option options [String] :match
     #
     #
     # @example Print the contents of tmp directory
@@ -59,6 +62,27 @@ module TreeVisitor
         options[:ignore].each { |p| ignore(p) }
       end
 
+      if options and options[:ignore_dir]
+        unless options[:ignore_dir].respond_to?(:at)
+          options[:ignore_dir] = [options[:ignore_dir]]
+        end
+        options[:ignore_dir].each { |p| ignore_dir(p) }
+      end
+
+      if options and options[:ignore_file]
+        unless options[:ignore_file].respond_to?(:at)
+          options[:ignore_file] = [options[:ignore_file]]
+        end
+        options[:ignore_file].each { |p| ignore_file(p) }
+      end
+
+      if options and options[:match]
+        unless options[:match].respond_to?(:at)
+          options[:match] = [options[:match]]
+        end
+        options[:match].each { |p| match(p) }
+      end
+
       #
       # options
       #
@@ -179,7 +203,7 @@ module TreeVisitor
       #
       # args detection
       #
-      if dirname and dirname.respond_to?(:enter_tree_node)
+      if dirname and dirname.respond_to?(:enter_node)
         tree_node_visitor = dirname
         dirname           = nil
       end
@@ -235,7 +259,7 @@ module TreeVisitor
     # recurse on other directories
     #
     def process_directory(dirname)
-      @visitor.enter_tree_node(dirname)
+      @visitor.enter_node(dirname)
       # return if ignore_dir?( dirname )
 
       begin
@@ -247,14 +271,14 @@ module TreeVisitor
             process_directory(pathname) unless ignore_dir?(basename)
           else
             if !!@visit_file && match?(basename) && !ignore_file?(basename)
-              @visitor.visit_leaf_node(pathname)
+              @visitor.visit_leaf(pathname)
             end
           end
         }
       rescue Errno::EACCES => e
         $stderr.puts e
       end
-      @visitor.exit_tree_node(dirname)
+      @visitor.exit_node(dirname)
     end
   end
 end

data/lib/treevisitor/leaf_node.rb

@@ -25,7 +25,7 @@ module TreeVisitor
     # @return [TreeNodeVisitor] the visitor
     #
     def accept( visitor )
-      visitor.visit_leaf_node( self )
+      visitor.visit_leaf( self )
       visitor
     end
 

data/lib/treevisitor/tree_node.rb

@@ -170,8 +170,8 @@ module TreeVisitor
 
     #
     # Find a node down the hierarchy with content
-    # @param [Object] content of searched node
-    # @return [Object, nil] nil if no
+    # @param [Object,Regexp] content of searched node
+    # @return [Object, nil] nil if not found
     #
     def find(content = nil, &block)
       if content and block_given?
@@ -179,11 +179,15 @@ module TreeVisitor
       end
 
       if content
-        block = proc { |c| c == content }
+        if content.class == Regexp
+          block = proc { |l| l.content =~ content }
+        else
+          block = proc { |l| l.content == content }
+        end
       end
-      return self if block.call(self.content)
+      return self if block.call(self)
 
-      leaf = @leaves.find { |l| block.call(l.content) }
+      leaf = @leaves.find { |l| block.call(l) }
       return leaf if leaf
 
       @children.each do |child|
@@ -197,14 +201,14 @@ module TreeVisitor
     # return the visitor
     #
     def accept(visitor)
-      visitor.enter_tree_node(self)
+      visitor.enter_node(self)
       @leaves.each { |leaf|
         leaf.accept(visitor)
       }
       @children.each { |child|
         child.accept(visitor)
       }
-      visitor.exit_tree_node(self)
+      visitor.exit_node(self)
       visitor
     end
 

data/lib/treevisitor/tree_node_visitor.rb

@@ -1,14 +1,32 @@
 # -*- coding: utf-8 -*-
 module TreeVisitor
+
   #
-  # More complex TreeNodeVisitor
+  # More complex TreeNodeVisitor, define a simple dsl
+  # @example
+  #   TreeNodeVisitor.new do
+  #     on_enter_node do |node|
+  #       puts "hello #{node}"
+  #     end
+  #     on_exit_node do |node|
+  #       puts "bye #{node}"
+  #     end
+  #     on_leaf do |leaf|
+  #       puts "how you do #{leaf}"
+  #     end
+  #   end
   #
   class TreeNodeVisitor
 
     def initialize(&block)
+
       @on_enter_tree_node_blocks = []
-      @on_exit_tree_node_blocks = []
+      @on_exit_tree_node_blocks  = []
       @on_visit_leaf_node_blocks = []
+
+      @stack                     = []
+      @root                      = nil
+
       if block
         instance_eval(&block)
       end
@@ -17,41 +35,66 @@ module TreeVisitor
     #
     # called on tree node at start of the visit i.e. we start to visit the subtree
     #
-    def enter_tree_node(tree_node)
-      @on_enter_tree_node_blocks.each{ |b| b.call(tree_node) }
+    def enter_node(tree_node)
+      parent = @stack.last
+      @on_enter_tree_node_blocks.each { |b| b.call(tree_node, parent) }
+      @root = tree_node if @stack.empty?
+      @stack.push(tree_node)
     end
 
+    # alias :enter_tree_node :enter_node
+
     #
     # called on tree node at end of the visit i.e. oll subtree are visited
     #
-    def exit_tree_node(tree_node)
-      @on_exit_tree_node_blocks.each{ |b| b.call(tree_node) }
+    def exit_node(tree_node)
+      parent = @stack.last
+      @on_exit_tree_node_blocks.each { |b| b.call(tree_node, parent) }
+      @stack.pop
     end
 
+    # alias :exit_tree_node :exit_node
+
     #
     # called when visit leaf node
     #
-    def visit_leaf_node(leaf_node)
-      @on_visit_leaf_node_blocks.each{ |b| b.call(leaf_node) }
+    def visit_leaf(leaf_node)
+      parent = @stack.last
+      @on_visit_leaf_node_blocks.each { |b| b.call(leaf_node, parent) }
     end
 
-    private
+    # alias :visit_leaf_node :visit_leaf
 
-    def on_enter_tree_node(&block)
+    #
+    # add a block to be called when entering into a tree_node
+    #
+    def on_enter_node(&block)
       raise "block missing" unless block
       @on_enter_tree_node_blocks << block
     end
 
-    def on_exit_tree_node(&block)
+    # alias :on_enter_tree_node :on_enter_node
+
+    #
+    # add a block to be called when exiting from a TreeNode
+    #
+    def on_exit_node(&block)
       raise "block missing" unless block
       @on_exit_tree_node_blocks << block
     end
 
-    def on_visit_leaf_node(&block)
+    # alias :on_exit_tree_node :on_exit_node
+
+    #
+    # add a block to be called when visiting a leaf node
+    #
+    def on_leaf(&block)
       raise "block missing" unless block
       @on_visit_leaf_node_blocks << block
     end
 
+    # alias :on_visit_leaf_node :on_leaf
+
   end
 
 end

data/lib/treevisitor/visitors/block_tree_node_visitor.rb

@@ -9,11 +9,11 @@ module TreeVisitor
       @block = action
     end
 
-    def enter_tree_node( tree_node )
+    def enter_node( tree_node )
       @block.call( tree_node )
     end
 
-    def visit_leaf_node( leaf_node )
+    def visit_leaf( leaf_node )
       @block.call( leaf_node )
     end
 

data/lib/treevisitor/visitors/build_dir_tree_visitor.rb

@@ -4,7 +4,7 @@ module TreeVisitor
   # Builds a TreeNode from a filesystem directory
   # It similar to CloneTreeNodeVisitor
   #
-  class BuildDirTreeVisitor < BasicTreeNodeVisitor
+  class BuildDirTreeVisitor # < BasicTreeNodeVisitor
   
     attr_reader :root
 
@@ -28,7 +28,7 @@ module TreeVisitor
       @nr_files = 0
     end
   
-    def enter_tree_node( pathname )
+    def enter_node( pathname )
       if @stack.empty?
         tree_node = TreeNode.new( File.basename( pathname ) )
         @root = tree_node
@@ -39,11 +39,11 @@ module TreeVisitor
       @stack.push( tree_node )
     end
 
-    def exit_tree_node( pathname )
+    def exit_node( pathname )
       @stack.pop
     end
 
-    def visit_leaf_node( pathname )
+    def visit_leaf( pathname )
       @nr_files  += 1
       # connect the leaf_node created to the last tree_node on the stack
       LeafNode.new( File.basename(pathname), @stack.last )

data/lib/treevisitor/visitors/callback_tree_node_visitor.rb

@@ -5,7 +5,7 @@ module TreeVisitor
   # The block are defined from on_enter_X methods
   # The blocks take as argument only the node
   #
-  class CallbackTreeNodeVisitor < BasicTreeNodeVisitor
+  class CallbackTreeNodeVisitor # < BasicTreeNodeVisitor
 
     def initialize
       @root = nil
@@ -14,26 +14,26 @@ module TreeVisitor
       @action_visit_leaf_node = nil
     end
 
-    def on_enter_tree_node( &action )
+    def on_enter_node( &action )
       @action_enter_tree_node = action
     end
 
-    def on_visit_leaf_node( &action )
+    def on_visit_leaf( &action )
       @action_visit_leaf_node = action
     end
 
-    def enter_tree_node( tree_node )
+    def enter_node( tree_node )
       # parent_node = @stack.empty? ? nil : @stack.last
       @root = tree_node if @stack.empty?
       @stack.push( tree_node )
       @action_enter_tree_node.call( tree_node ) if @action_enter_tree_node
     end
 
-    def exit_tree_node( tree_node )
+    def exit_node( tree_node )
       @stack.pop
     end
 
-    def visit_leaf_node( leaf_node )
+    def visit_leaf( leaf_node )
       # parent_node = @stack.last
       @action_visit_leaf_node.call( leaf_node ) if @action_visit_leaf_node
     end

data/lib/treevisitor/visitors/callback_tree_node_visitor2.rb

@@ -5,56 +5,47 @@ module TreeVisitor
   # The block are defined from on_enter_X methods
   # The blocks take as argument the node and the parent_node
   #
-  class CallbackTreeNodeVisitor2 < BasicTreeNodeVisitor
+  class CallbackTreeNodeVisitor2 # < BasicTreeNodeVisitor
 
     attr_reader :root
 
-    def initialize( delegate = nil)
+    def initialize(delegate = nil)
       super()
-      @stack = []
-      @root = nil
+      @stack    = []
+      @root     = nil
       @delegate = delegate
     end
 
-    def on_enter_tree_node( &action )
+    def on_enter_node(&action)
       @action_enter_tree_node = action
     end
 
-    def on_visit_leaf_node( &action )
+    def on_visit_leaf(&action)
       @action_visit_leaf_node = action
     end
 
-    def _on_enter_tree_node( src_tree_node, dst_parent_node )
+    def enter_node(src_tree_node)
+      dst_parent_node = @stack.empty? ? nil : @stack.last
       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 _on_visit_leaf_node( src_leaf_node, parent_node )
-      if @action_visit_leaf_node
-        @action_visit_leaf_node.call( src_leaf_node, parent_node )
+        dst_tree_node = @action_enter_tree_node.call(src_tree_node, dst_parent_node)
       elsif @delegate
-        @delegate.on_visit_leaf_node( src_leaf_node, parent_node )
+        dst_tree_node = @delegate.on_enter_tree_node(src_tree_node, dst_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 )
+      @stack.push(dst_tree_node)
     end
 
-    def exit_tree_node( src_tree_node )
+    def exit_node(src_tree_node)
       @stack.pop
     end
 
-    def visit_leaf_node( src_leaf_node )
+    def visit_leaf(src_leaf_node)
       parent_node = @stack.last
-      _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
   end
 

data/lib/treevisitor/visitors/clone_tree_node_visitor.rb

@@ -4,7 +4,7 @@ module TreeVisitor
   # Clone a tree_node, nodes are duplicated.
   # Node content are not duplicated!
   #
-  class CloneTreeNodeVisitor < BasicTreeNodeVisitor
+  class CloneTreeNodeVisitor # < BasicTreeNodeVisitor
 
     #
     # Contains the cloned tree node after the visit
@@ -17,7 +17,7 @@ module TreeVisitor
       @stack = []
     end
 
-    def enter_tree_node( tree_node )
+    def enter_node( tree_node )
       if @stack.empty?
         cloned_tree_node = TreeNode.new( tree_node.content )
         @cloned_root = cloned_tree_node
@@ -27,11 +27,11 @@ module TreeVisitor
       @stack.push( cloned_tree_node )
     end
 
-    def exit_tree_node( tree_node )
+    def exit_node( tree_node )
       @stack.pop
     end
 
-    def visit_leaf_node( leaf_node )
+    def visit_leaf( leaf_node )
       LeafNode.new( leaf_node.content, @stack.last )
     end
 

data/lib/treevisitor/visitors/depth_tree_node_visitor.rb

@@ -3,7 +3,7 @@ module TreeVisitor
   #
   # Simple visitor: show how calculate the depth of a tree
   #
-  class DepthTreeNodeVisitor < BasicTreeNodeVisitor
+  class DepthTreeNodeVisitor # < BasicTreeNodeVisitor
 
     attr_reader :depth
 
@@ -12,15 +12,15 @@ module TreeVisitor
       @depth = 0
     end
 
-    def enter_tree_node( tree_node )
+    def enter_node( tree_node )
       @depth += 1
     end
 
-    def exit_tree_node( tree_node )
+    def exit_node( tree_node )
       @depth -= 1
     end
 
-    def visit_leaf_node( leaf_node )
+    def visit_leaf( leaf_node )
     end
 
   end

data/lib/treevisitor/visitors/directory_to_hash_visitor.rb

@@ -4,7 +4,7 @@ module TreeVisitor
   #
   # Build hash with directory structure
   #
-  class DirectoryToHashVisitor < TreeVisitor::BasicTreeNodeVisitor
+  class DirectoryToHashVisitor # < TreeVisitor::BasicTreeNodeVisitor
 
     attr_reader :root
 
@@ -14,18 +14,18 @@ module TreeVisitor
       @root = @node
     end
 
-    def enter_tree_node(pathname)
+    def enter_node(pathname)
       subnode                        = {}
       @node[File.basename(pathname)] = subnode
       @stack.push(@node)
       @node = subnode
     end
 
-    def exit_tree_node(pathname)
+    def exit_node(pathname)
       @node = @stack.pop
     end
 
-    def visit_leaf_node(pathname)
+    def visit_leaf(pathname)
       @node[File.basename(pathname)] = File.stat(pathname).size
     end
 

data/lib/treevisitor/visitors/flat_print_tree_node_visitors.rb

@@ -3,16 +3,16 @@ module TreeVisitor
   #
   # Print for every node the name
   #
-  class FlatPrintTreeNodeVisitor < BasicTreeNodeVisitor
+  class FlatPrintTreeNodeVisitor # < BasicTreeNodeVisitor
 
-    def enter_tree_node( tree_node )
+    def enter_node( tree_node )
       puts tree_node.name
     end
 
-    def exit_tree_node( tree_node )
+    def exit_node( tree_node )
     end
 
-    def visit_leaf_node( leaf_node )
+    def visit_leaf( leaf_node )
       puts leaf_node.name
     end
 

data/lib/treevisitor/visitors/print_dir_tree_visitor.rb

@@ -4,16 +4,16 @@ module TreeVisitor
   # Visitor for DirTreeWalker
   # Prints the node at enter
   # TODO: join this con PrintTreeNodeVisitor
-  class PrintDirTreeVisitor < BasicTreeNodeVisitor
+  class PrintDirTreeVisitor # < BasicTreeNodeVisitor
 
-    def enter_tree_node( pathname )
+    def enter_node( pathname )
       puts pathname
     end
 
-    def exit_tree_node( pathname )
+    def exit_node( pathname )
     end
 
-    def visit_leaf_node( pathname )
+    def visit_leaf( pathname )
       puts pathname
     end
 

data/lib/treevisitor/visitors/print_tree_node_visitor.rb

@@ -3,13 +3,13 @@ module TreeVisitor
   #
   # Prints TreeNode names indenting according to depth
   #
-  class PrintTreeNodeVisitor < BasicTreeNodeVisitor
+  class PrintTreeNodeVisitor # < BasicTreeNodeVisitor
 
     def initialize
       @depth = 0
     end
 
-    def enter_tree_node( tree_node )
+    def enter_node( tree_node )
       str = ""
       (0...@depth).step {
         str << " |-"
@@ -23,11 +23,11 @@ module TreeVisitor
       @depth += 1
     end
 
-    def exit_tree_node( tree_node )
+    def exit_node( tree_node )
       @depth -= 1
     end
 
-    def visit_leaf_node( leaf_node )
+    def visit_leaf( leaf_node )
       str = ""
       (0...@depth-1).step {
         str << " |-"

data/lib/treevisitor.rb

@@ -9,7 +9,7 @@ require 'yaml'
 #
 # rubygems
 #
-require 'rubygems'
+# require 'rubygems' # rubygems must be loaded from binary file to not modify $LOAD_PATH
 require 'json'
 
 #
@@ -40,6 +40,10 @@ require 'treevisitor/directory_walker'
 #
 require 'treevisitor/visitors/block_tree_node_visitor'
 require 'treevisitor/visitors/build_dir_tree_visitor'
+require 'treevisitor/visitors/callback_tree_node_visitor'
+require 'treevisitor/visitors/callback_tree_node_visitor2'
+require 'treevisitor/visitors/clone_tree_node_visitor'
+require 'treevisitor/visitors/depth_tree_node_visitor'
 require 'treevisitor/visitors/print_dir_tree_visitor'
 require 'treevisitor/visitors/directory_to_hash_visitor'
 

data/spec/treevisitor/directory_walker_spec.rb

@@ -3,38 +3,53 @@ require File.join(File.dirname(__FILE__), "..", "spec_helper")
 
 describe DirTreeWalker do
 
-  it "should ignore files and directory" do
-    dtp = DirTreeWalker.new(".")
-
-    dtp.ignore(/^\./)
-    dtp.ignore_file?(".thumbnails").should be_true
-    dtp.ignore_dir?(".thumbnails").should be_true
+  it "should accept option :ignore" do
+    walker = DirTreeWalker.new :ignore => /^\./
+    walker.ignore_file?(".thumbnails").should be_true
+    walker.ignore_dir?(".thumbnails").should be_true
+  end
 
-    dtp.ignore_dir("thumbnails")
-    dtp.ignore_dir?(".thumbnails").should be_true
-    dtp.ignore_dir?("thumbnails").should be_true
-    dtp.ignore_dir?("pippo").should be_false
+  it "should accept option :ignore" do
+    walker = DirTreeWalker.new :ignore => ".git"
+    walker.ignore_file?(".git").should be_true
+    walker.ignore_dir?(".git").should be_true
+  end
 
-    dtp.ignore_file("xvpics")
-    dtp.ignore_file?("xvpics").should be_true
 
-    dtp.ignore("sub")
-    dtp.ignore_file?("[Dsube]").should be_false
-    dtp.ignore_dir?("[Dsube]").should be_false
+  it "should accept option :ignore_dir" do
+    dtw = DirTreeWalker.new :ignore_dir => [/^\./, "private_dir" ]
+    dtw.should be_ignore_dir ".git"
+    dtw.should be_ignore_dir "private_dir"
   end
 
-  it "should accept option :ignore" do
-    dtp = DirTreeWalker.new :ignore => /^\./
+  it "should accept option :ignore_file" do
+    dtw = DirTreeWalker.new :ignore_file => [/.xml/, /(ignore)|(orig)/ ]
+    dtw.should be_ignore_file "pippo.xml"
+  end
 
-    dtp.ignore_file?(".thumbnails").should be_true
-    dtp.ignore_dir?(".thumbnails").should be_true
+  it "should accept option :match" do
+    dtw = DirTreeWalker.new :match => /.jpg/
+    dtw.should be_match "foo.jpg"
   end
 
-  it "should accept option :ignore" do
-    dtp = DirTreeWalker.new :ignore => ".git"
+  it "should ignore files and directory" do
+    walker = DirTreeWalker.new(".")
+
+    walker.ignore(/^\./)
+    walker.ignore_file?(".thumbnails").should be_true
+    walker.ignore_dir?(".thumbnails").should be_true
+
+    walker.ignore_dir("thumbnails")
+    walker.ignore_dir?(".thumbnails").should be_true
+    walker.ignore_dir?("thumbnails").should be_true
+    walker.ignore_dir?("pippo").should be_false
+
+    walker.ignore_file("xvpics")
+    walker.ignore_file?("xvpics").should be_true
 
-    dtp.ignore_file?(".git").should be_true
-    dtp.ignore_dir?(".git").should be_true
+    walker.ignore("sub")
+    walker.ignore_file?("[Dsube]").should be_false
+    walker.ignore_dir?("[Dsube]").should be_false
   end
 
   it "should accumulate file names" do

data/spec/treevisitor/tree_node_paths_spec.rb

@@ -0,0 +1,70 @@
+# -*- coding: utf-8 -*-
+require File.join(File.dirname(__FILE__), "..", "spec_helper")
+
+describe TreeNode do
+
+  context "paths" do
+
+    before do
+      @tree     = TreeNode.new("a")
+      ln1       = LeafNode.new("1", @tree)
+      ln2       = LeafNode.new("2", @tree)
+      @sub_tree = TreeNode.new("b", @tree)
+      @ln3      = LeafNode.new("3", @sub_tree)
+      @ln4      = LeafNode.new("12", @sub_tree)
+    end
+
+    it "correct path" do
+      @tree.path.should == "a"
+      @sub_tree.path.should == "a/b"
+      @tree.path_with_prefix.should == "a"
+      @sub_tree.path_with_prefix.should == "a/b"
+    end
+
+    it "assign prefix path with a /" do
+      @tree.prefix_path= "<root>/"
+
+      @tree.prefix_path.should == "<root>/"
+      @tree.path.should == "a"
+      @sub_tree.path.should == "a/b"
+      @tree.path_with_prefix.should == "<root>/a"
+      @sub_tree.path_with_prefix.should == "<root>/a/b"
+    end
+
+    it "assign empty prefix path" do
+      @tree.prefix_path= ""
+
+      @tree.prefix_path.should == "/"
+      @tree.path.should == "a"
+      @sub_tree.path.should == "a/b"
+      @tree.path_with_prefix.should == "/a"
+      @sub_tree.path_with_prefix.should == "/a/b"
+    end
+
+    it "assign prefix path wo a /" do
+      @tree.prefix_path= "<root>"
+
+      @tree.prefix_path.should == "<root>/"
+      @tree.path_with_prefix.should == "<root>/a"
+      @sub_tree.path_with_prefix.should == "<root>/a/b"
+    end
+
+    it "invalidate" do
+      @tree.prefix_path="root/"
+      @sub_tree.path.should == "a/b"
+      @sub_tree.path_with_prefix.should == "root/a/b"
+      @sub_tree.depth.should == 2
+
+      r = TreeNode.new("r")
+      r.add_child(@tree)
+      @sub_tree.path.should == "r/a/b"
+      @sub_tree.path_with_prefix.should == "r/a/b"
+
+      r.prefix_path="new_root/"
+      @sub_tree.path.should == "r/a/b"
+      @sub_tree.path_with_prefix.should == "new_root/r/a/b"
+      @sub_tree.depth.should == 3
+    end
+
+  end
+end

data/spec/treevisitor/tree_node_spec.rb

@@ -79,74 +79,56 @@ describe TreeNode do
       ln1       = LeafNode.new("1", @tree)
       ln2       = LeafNode.new("2", @tree)
       @sub_tree = TreeNode.new("b", @tree)
-      @ln3       = LeafNode.new("3", @sub_tree)
+      @ln3      = LeafNode.new("3", @sub_tree)
+      @ln4      = LeafNode.new("12", @sub_tree)
     end
 
     it "nr_nodes and nr_leaves and nr_children" do
-      @tree.nr_nodes.should == 4
-      @tree.nr_leaves.should == 3
+      @tree.nr_nodes.should == 5
+      @tree.nr_leaves.should == 4
       @tree.nr_children.should == 1
 
-      @sub_tree.nr_nodes.should == 1
-      @sub_tree.nr_leaves.should == 1
+      @sub_tree.nr_nodes.should == 2
+      @sub_tree.nr_leaves.should == 2
       @sub_tree.nr_children.should == 0
     end
 
-    it "prefix_path" do
-      @tree.path.should == "a"
-      @sub_tree.path.should == "a/b"
-      @tree.path_with_prefix.should == "a"
-      @sub_tree.path_with_prefix.should == "a/b"
 
-      @tree.prefix_path= "<root>/"
+    context "find" do
 
-      @tree.prefix_path.should == "<root>/"
-      @tree.path.should == "a"
-      @sub_tree.path.should == "a/b"
-      @tree.path_with_prefix.should == "<root>/a"
-      @sub_tree.path_with_prefix.should == "<root>/a/b"
-    end
-
-    it "invalidate" do
-      @tree.prefix_path="root/"
-      @sub_tree.path.should == "a/b"
-      @sub_tree.path_with_prefix.should == "root/a/b"
-      @sub_tree.depth.should == 2
-
-      r = TreeNode.new("r")
-      r.add_child(@tree)
-      @sub_tree.path.should == "r/a/b"
-      @sub_tree.path_with_prefix.should == "r/a/b"
-
-      r.prefix_path="new_root/"
-      @sub_tree.path.should == "r/a/b"
-      @sub_tree.path_with_prefix.should == "new_root/r/a/b"
-      @sub_tree.depth.should == 3
-    end
+      it "find by string" do
+        @tree.find("a").should === @tree
+        @tree.find("b").should === @sub_tree
+        @tree.find("3").should === @ln3
+        @tree.find("not existent").should be_nil
+      end
 
-    it "find without block" do
-      @tree.find("a").should === @tree
-      @tree.find("b").should === @sub_tree
-      @tree.find("3").should === @ln3
-      @tree.find("not existent").should be_nil
-    end
+      it "find by regex" do
+        @tree.find(/[a,b]/).should === @tree
+        @tree.find(/[b,c]/).should === @sub_tree
+        @tree.find(/\d\d/).should === @ln4
+        @tree.find(/not existent/).should be_nil
+      end
 
-    it "find with block" do
-      @tree.find {|e| e == "a"}.should === @tree
-      @tree.find {|e| e == "b"}.should === @sub_tree
-      @tree.find {|e| e == "3"}.should === @ln3
-      @tree.find {|e| e == "not existent"}.should be_nil
-    end
+      it "find with block" do
+        @tree.find { |e| e.content == "a" }.should === @tree
+        @tree.find { |e| e.content == "b" }.should === @sub_tree
+        @tree.find { |e| e.content == "3" }.should === @ln3
+        @tree.find { |e| e.content == "not existent" }.should be_nil
+      end
 
-    it "to_str" do
-      out = <<EOS
+      it "to_str" do
+        out = <<EOS
 a
 |-- 1
 |-- 2
 `-- b
-    `-- 3
+    |-- 3
+    `-- 12
 EOS
-      @tree.to_str.should == out
+        @tree.to_str.should == out
+      end
+
     end
 
   end

data/spec/treevisitor/visitor_dsl_spec.rb

@@ -6,27 +6,61 @@ describe TreeNodeVisitor do
   it "should initialize correctly" do
     visitor = TreeNodeVisitor.new do
 
-      on_enter_tree_node do |tree_node|
+      on_enter_node do |tree_node|
         @entered_node = true
       end
 
-      on_exit_tree_node do |tree_node|
+      on_exit_node do |tree_node|
         @exit_node = true
       end
 
-      on_visit_leaf_node do |leaf_node|
+      on_leaf do |leaf_node|
         @visit_leaf = true
       end
     end
 
-    visitor.enter_tree_node(nil)
+    visitor.enter_node(nil)
     visitor.instance_eval{ @entered_node }.should be_true
 
-    visitor.exit_tree_node(nil)
+    visitor.exit_node(nil)
     visitor.instance_eval{ @exit_node }.should be_true
 
-    visitor.visit_leaf_node(nil)
+    visitor.visit_leaf(nil)
     visitor.instance_eval{ @visit_leaf }.should be_true
   end
 
+  it "should initialize correctly" do
+    visitor = TreeNodeVisitor.new do
+
+      on_enter_node do |node, parent|
+        @node = node
+        @parent = parent
+      end
+
+      on_exit_node do |node, parent|
+        @node = node
+        @parent = parent
+      end
+
+      on_leaf do |leaf, parent|
+        @leaf = leaf
+        @parent = parent
+      end
+    end
+
+    visitor.instance_eval{ @stack = ["p"] }
+    visitor.enter_node("n")
+    visitor.instance_eval{ @node }.should == "n"
+    visitor.instance_eval{ @parent }.should == "p"
+    visitor.instance_eval{ @stack }.should have(2).node
+
+    visitor.exit_node("n")
+    visitor.instance_eval{ @node }.should == "n"
+    visitor.instance_eval{ @stack }.should have(1).node
+
+    visitor.instance_eval{ @stack = ["p"] }
+    visitor.visit_leaf("l")
+    visitor.instance_eval{ @leaf }.should == "l"
+    visitor.instance_eval{ @parent }.should == "p"
+  end
 end

data/spec/treevisitor/visitors/block_tree_node_visitor_spec.rb

@@ -1,8 +1,6 @@
 # -*- coding: utf-8 -*-
 require File.join(File.dirname(__FILE__), "..", "..", "spec_helper")
 
-require 'treevisitor/visitors/block_tree_node_visitor'
-
 describe "Tree Node Visitors" do
 
   before do

data/spec/treevisitor/visitors/callback_tree_node_visitor2_spec.rb

@@ -1,8 +1,6 @@
 # -*- coding: utf-8 -*-
 require File.join(File.dirname(__FILE__), "..", "..", "spec_helper")
 
-require 'treevisitor/visitors/callback_tree_node_visitor2'
-
 describe "Tree Node Visitors" do
 
   before do
@@ -18,10 +16,12 @@ describe "Tree Node Visitors" do
 
   it CallbackTreeNodeVisitor2 do
     visitor = CallbackTreeNodeVisitor2.new
-    visitor.on_enter_tree_node{ |tree_node, new_parent_node|
+    visitor.on_enter_node{ |tree_node, new_parent_node|
+      # puts "**** #{tree_node}"
       TreeNode.new("n" + tree_node.content, new_parent_node)
     }
-    visitor.on_visit_leaf_node{ |leaf_node, new_parent_node|
+    visitor.on_visit_leaf{ |leaf_node, new_parent_node|
+      # puts "**** #{leaf_node}"
       LeafNode.new( "n" + leaf_node.content, new_parent_node )
     }
     @tree.accept( visitor )

data/spec/treevisitor/visitors/callback_tree_node_visitors_spec.rb

@@ -1,8 +1,6 @@
 # -*- coding: utf-8 -*-
 require File.join(File.dirname(__FILE__), "..", "..", "spec_helper")
 
-require 'treevisitor/visitors/callback_tree_node_visitor'
-
 describe "Tree Node Visitors" do
 
   before do
@@ -19,8 +17,8 @@ describe "Tree Node Visitors" do
   it CallbackTreeNodeVisitor do
     accumulator = []
     visitor = CallbackTreeNodeVisitor.new
-    visitor.on_enter_tree_node{ |tree_node| accumulator << tree_node.content }
-    visitor.on_visit_leaf_node{ |leaf_node| accumulator << leaf_node.content }
+    visitor.on_enter_node{ |tree_node| accumulator << tree_node.content }
+    visitor.on_visit_leaf{ |leaf_node| accumulator << leaf_node.content }
     @tree.accept( visitor )
     accumulator.length.should == 5
     accumulator.should == %w{ a 1 2 b 3 }

data/spec/treevisitor/visitors/depth_tree_node_visitor_spec.rb

@@ -1,8 +1,6 @@
 # -*- coding: utf-8 -*-
 require File.join(File.dirname(__FILE__), "..", "..", "spec_helper")
 
-require 'treevisitor/visitors/depth_tree_node_visitor'
-require 'treevisitor/visitors/clone_tree_node_visitor'
 
 describe "Tree Node Visitors" do
 

data/tasks/jeweler.rake

@@ -31,7 +31,6 @@ begin
     gem.files.concat Dir['tasks/**/*.rake']
     gem.files.concat Dir['examples/**/*']
 
-
     #
     # test files
     #
@@ -40,10 +39,6 @@ begin
     gem.test_files.concat Dir['spec/fixtures/**/.gitkeep']
     gem.test_files.concat Dir['spec/fixtures/**/.dir_with_dot/*']
 
-    #
-    # rubyforge
-    #
-    # gem.rubyforge_project = 'treevisitor'
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/treevisitor.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{treevisitor}
-  s.version = "0.1.6"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tokiro"]
-  s.date = %q{2011-01-21}
+  s.date = %q{2011-02-01}
   s.default_executable = %q{tree.rb}
   s.description = %q{      Implementation of visitor design pattern. It contains a 'tree.rb'
       command line clone of the tree unix tool.
@@ -74,6 +74,7 @@ Gem::Specification.new do |s|
     "spec/treevisitor/tree_dsl_spec.rb",
     "spec/treevisitor/tree_dsl_with_derived_class1_spec.rb",
     "spec/treevisitor/tree_dsl_with_derived_class_spec.rb",
+    "spec/treevisitor/tree_node_paths_spec.rb",
     "spec/treevisitor/tree_node_spec.rb",
     "spec/treevisitor/util/dir_processor_spec.rb",
     "spec/treevisitor/visitor_dsl_spec.rb",

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 6
-  version: 0.1.6
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Tokiro
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-21 00:00:00 +01:00
+date: 2011-02-01 00:00:00 +01:00
 default_executable: tree.rb
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -152,6 +152,7 @@ files:
 - spec/treevisitor/tree_dsl_spec.rb
 - spec/treevisitor/tree_dsl_with_derived_class1_spec.rb
 - spec/treevisitor/tree_dsl_with_derived_class_spec.rb
+- spec/treevisitor/tree_node_paths_spec.rb
 - spec/treevisitor/tree_node_spec.rb
 - spec/treevisitor/util/dir_processor_spec.rb
 - spec/treevisitor/visitor_dsl_spec.rb
@@ -203,6 +204,7 @@ test_files:
 - spec/treevisitor/tree_dsl_spec.rb
 - spec/treevisitor/tree_dsl_with_derived_class1_spec.rb
 - spec/treevisitor/tree_dsl_with_derived_class_spec.rb
+- spec/treevisitor/tree_node_paths_spec.rb
 - spec/treevisitor/tree_node_spec.rb
 - spec/treevisitor/util/dir_processor_spec.rb
 - spec/treevisitor/visitor_dsl_spec.rb