treevisitor 0.2.0 → 0.2.1

data/VERSION.yml

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

data/lib/treevisitor/tree_node_visitor.rb

@@ -18,15 +18,13 @@ module TreeVisitor
   #
   class TreeNodeVisitor
 
-    def initialize(&block)
-
+    def initialize(delegate = nil, &block)
       @on_enter_tree_node_blocks = []
       @on_exit_tree_node_blocks  = []
       @on_visit_leaf_node_blocks = []
-
       @stack                     = []
       @root                      = nil
-
+      @delegate                  = delegate
       if block
         instance_eval(&block)
       end
@@ -37,64 +35,67 @@ module TreeVisitor
     #
     def enter_node(tree_node)
       parent = @stack.last
-      @on_enter_tree_node_blocks.each { |b| b.call(tree_node, parent) }
+      if @delegate
+        @delegate.enter_node(tree_node) if @delegate.respond_to? :enter_node
+      else
+        @on_enter_tree_node_blocks.each { |b| b.call(tree_node, parent) }
+      end
       @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_node(tree_node)
       parent = @stack.last
-      @on_exit_tree_node_blocks.each { |b| b.call(tree_node, parent) }
+      if @delegate
+        @delegate.exit_node(tree_node) if @delegate.respond_to? :exit_node
+      else
+        @on_exit_tree_node_blocks.each { |b| b.call(tree_node, parent) }
+      end
       @stack.pop
     end
 
-    # alias :exit_tree_node :exit_node
-
     #
     # called when visit leaf node
     #
     def visit_leaf(leaf_node)
       parent = @stack.last
-      @on_visit_leaf_node_blocks.each { |b| b.call(leaf_node, parent) }
+      if @delegate
+        @delegate.visit_leaf(leaf_node) if @delegate.respond_to? :visit_leaf
+      else
+        @on_visit_leaf_node_blocks.each { |b| b.call(leaf_node, parent) }
+      end
     end
 
-    # alias :visit_leaf_node :visit_leaf
-
     #
     # add a block to be called when entering into a tree_node
     #
     def on_enter_node(&block)
+      raise "already defined a delegate" if @delegate
       raise "block missing" unless block
       @on_enter_tree_node_blocks << block
     end
 
-    # 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 "already defined a delegate" if @delegate
       raise "block missing" unless block
       @on_exit_tree_node_blocks << block
     end
 
-    # alias :on_exit_tree_node :on_exit_node
-
     #
     # add a block to be called when visiting a leaf node
     #
     def on_leaf(&block)
+      raise "already defined a delegate" if @delegate
       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/callback_tree_node_visitor.rb

@@ -1,42 +1,45 @@
-# -*- coding: utf-8 -*-
-module TreeVisitor
-  #
-  # 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 # < BasicTreeNodeVisitor
-
-    def initialize
-      @root = nil
-      @stack = []
-      @action_enter_tree_node = nil
-      @action_visit_leaf_node = nil
-    end
-
-    def on_enter_node( &action )
-      @action_enter_tree_node = action
-    end
-
-    def on_visit_leaf( &action )
-      @action_visit_leaf_node = action
-    end
-
-    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_node( tree_node )
-      @stack.pop
-    end
-
-    def visit_leaf( leaf_node )
-      # parent_node = @stack.last
-      @action_visit_leaf_node.call( leaf_node ) if @action_visit_leaf_node
-    end
-
-  end
-end
+## -*- coding: utf-8 -*-
+#module TreeVisitor
+#  #
+#  # 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
+#
+#    def initialize(delegate = nil)
+#      @root                   = nil
+#      @stack                  = []
+#      @action_enter_tree_node = nil
+#      @action_visit_leaf_node = nil
+#      @delegate               = delegate
+#    end
+#
+#    def on_enter_node(&block)
+#      raise "already defined a delegate" if @delegate
+#      @action_enter_tree_node = block
+#    end
+#
+#    def on_visit_leaf(&block)
+#      raise "already defined a delegate" if @delegate
+#      @action_visit_leaf_node = block
+#    end
+#
+#    def enter_node(tree_node)
+#      @root = tree_node if @stack.empty?
+#      @stack.push(tree_node)
+#      @action_enter_tree_node.call(tree_node) if @action_enter_tree_node
+#      @delegate.enter_node(tree_node) if @delegate
+#    end
+#
+#    def exit_node(tree_node)
+#      @stack.pop
+#    end
+#
+#    def visit_leaf(leaf_node)
+#      @action_visit_leaf_node.call(leaf_node) if @action_visit_leaf_node
+#      @delegate.visit_leaf(leaf_node) if @delegate
+#    end
+#
+#  end
+#end

data/lib/treevisitor/visitors/callback_tree_node_visitor2.rb

@@ -5,7 +5,7 @@ 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
 
     attr_reader :root
 
@@ -16,21 +16,20 @@ module TreeVisitor
       @delegate = delegate
     end
 
-    def on_enter_node(&action)
-      @action_enter_tree_node = action
+    def on_enter_node(&block)
+      raise "already defined a delegate" if @delegate
+      @action_enter_tree_node = block
     end
 
-    def on_visit_leaf(&action)
-      @action_visit_leaf_node = action
+    def on_visit_leaf(&block)
+      raise "already defined a delegate" if @delegate
+      @action_visit_leaf_node = block
     end
 
     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 = @action_enter_tree_node.call(src_tree_node, dst_parent_node) if @action_enter_tree_node
+      dst_tree_node = @delegate.enter_node(src_tree_node, dst_parent_node) if @delegate and @delegate.respond_to? :enter_node
       @root = dst_tree_node if @stack.empty?
       @stack.push(dst_tree_node)
     end
@@ -41,11 +40,8 @@ module TreeVisitor
 
     def visit_leaf(src_leaf_node)
       parent_node = @stack.last
-      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
+      @action_visit_leaf_node.call(src_leaf_node, parent_node) if @action_visit_leaf_node
+      @delegate.visit_leaf(src_leaf_node, parent_node) if @delegate and @delegate.respond_to? :visit_leaf
     end
   end
 

data/spec/treevisitor/tree_node_visitor_delegate_spec.rb

@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+require File.join(File.dirname(__FILE__), "..", "spec_helper")
+
+describe TreeNodeVisitor do
+
+  class Delegate
+    def enter_node(node)
+      @entered_node= true
+    end
+
+    def exit_node(node)
+      @exit_node= true
+    end
+
+    def visit_leaf(leaf)
+      @visited_leaf= true
+    end
+  end
+
+  it "should use a delegate" do
+
+    delegate = Delegate.new
+    visitor = TreeNodeVisitor.new(delegate)
+
+    visitor.enter_node(nil)
+    delegate.instance_eval{ @entered_node }.should be_true
+
+    visitor.exit_node(nil)
+    delegate.instance_eval{ @exit_node }.should be_true
+
+    visitor.visit_leaf(nil)
+    delegate.instance_eval{ @visited_leaf }.should be_true
+  end
+
+end

data/spec/treevisitor/visitors/{callback_tree_node_visitors_spec.rb → tree_node_visitors_spec.rb}

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 require File.join(File.dirname(__FILE__), "..", "..", "spec_helper")
 
-describe "Tree Node Visitors" do
+describe TreeNodeVisitor do
 
   before do
     ta = TreeNode.new( "a", nil )
@@ -14,11 +14,11 @@ describe "Tree Node Visitors" do
     @tree = ta
   end
 
-  it CallbackTreeNodeVisitor do
+  it TreeNodeVisitor do
     accumulator = []
-    visitor = CallbackTreeNodeVisitor.new
+    visitor = TreeNodeVisitor.new
     visitor.on_enter_node{ |tree_node| accumulator << tree_node.content }
-    visitor.on_visit_leaf{ |leaf_node| accumulator << leaf_node.content }
+    visitor.on_leaf{ |leaf_node| accumulator << leaf_node.content }
     @tree.accept( visitor )
     accumulator.length.should == 5
     accumulator.should == %w{ a 1 2 b 3 }

data/treevisitor.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{treevisitor}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tokiro"]
-  s.date = %q{2011-02-01}
+  s.date = %q{2011-02-06}
   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.
@@ -61,7 +61,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://github.com/tokiro/treevisitor}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.5.0}
   s.summary = %q{Implementation of visitor design pattern}
   s.test_files = [
     "spec/fixtures/test_dir_1/.dir_with_dot/dummy.txt",
@@ -76,16 +76,16 @@ Gem::Specification.new do |s|
     "spec/treevisitor/tree_dsl_with_derived_class_spec.rb",
     "spec/treevisitor/tree_node_paths_spec.rb",
     "spec/treevisitor/tree_node_spec.rb",
+    "spec/treevisitor/tree_node_visitor_delegate_spec.rb",
+    "spec/treevisitor/tree_node_visitor_dsl_spec.rb",
     "spec/treevisitor/util/dir_processor_spec.rb",
-    "spec/treevisitor/visitor_dsl_spec.rb",
     "spec/treevisitor/visitors/block_tree_node_visitor_spec.rb",
     "spec/treevisitor/visitors/callback_tree_node_visitor2_spec.rb",
-    "spec/treevisitor/visitors/callback_tree_node_visitors_spec.rb",
-    "spec/treevisitor/visitors/depth_tree_node_visitor_spec.rb"
+    "spec/treevisitor/visitors/depth_tree_node_visitor_spec.rb",
+    "spec/treevisitor/visitors/tree_node_visitors_spec.rb"
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: treevisitor
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 0
-  version: 0.2.0
+  prerelease: 
+  version: 0.2.1
 platform: ruby
 authors: 
 - Tokiro
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-01 00:00:00 +01:00
+date: 2011-02-06 00:00:00 +01:00
 default_executable: tree.rb
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,8 +20,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   prerelease: false
@@ -37,8 +31,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   prerelease: false
@@ -50,8 +42,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   prerelease: false
@@ -63,8 +53,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   prerelease: false
@@ -76,8 +64,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   prerelease: false
@@ -89,8 +75,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   prerelease: false
@@ -154,12 +138,13 @@ files:
 - spec/treevisitor/tree_dsl_with_derived_class_spec.rb
 - spec/treevisitor/tree_node_paths_spec.rb
 - spec/treevisitor/tree_node_spec.rb
+- spec/treevisitor/tree_node_visitor_delegate_spec.rb
+- spec/treevisitor/tree_node_visitor_dsl_spec.rb
 - spec/treevisitor/util/dir_processor_spec.rb
-- spec/treevisitor/visitor_dsl_spec.rb
 - spec/treevisitor/visitors/block_tree_node_visitor_spec.rb
 - spec/treevisitor/visitors/callback_tree_node_visitor2_spec.rb
-- spec/treevisitor/visitors/callback_tree_node_visitors_spec.rb
 - spec/treevisitor/visitors/depth_tree_node_visitor_spec.rb
+- spec/treevisitor/visitors/tree_node_visitors_spec.rb
 - bin/tree.rb
 has_rdoc: true
 homepage: http://github.com/tokiro/treevisitor
@@ -175,21 +160,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Implementation of visitor design pattern
@@ -206,9 +187,10 @@ test_files:
 - spec/treevisitor/tree_dsl_with_derived_class_spec.rb
 - spec/treevisitor/tree_node_paths_spec.rb
 - spec/treevisitor/tree_node_spec.rb
+- spec/treevisitor/tree_node_visitor_delegate_spec.rb
+- spec/treevisitor/tree_node_visitor_dsl_spec.rb
 - spec/treevisitor/util/dir_processor_spec.rb
-- spec/treevisitor/visitor_dsl_spec.rb
 - spec/treevisitor/visitors/block_tree_node_visitor_spec.rb
 - spec/treevisitor/visitors/callback_tree_node_visitor2_spec.rb
-- spec/treevisitor/visitors/callback_tree_node_visitors_spec.rb
 - spec/treevisitor/visitors/depth_tree_node_visitor_spec.rb
+- spec/treevisitor/visitors/tree_node_visitors_spec.rb