gf-treevisitor 0.0.18 → 0.0.19

data/VERSION

@@ -1 +1 @@
-0.0.18
+0.0.19

data/lib/treevisitor.rb

@@ -1,3 +1,3 @@
 class TreeVisitor
-  VERSION = '0.0.18'
+  VERSION = '0.0.19'
 end

data/lib/treevisitor/tree_node.rb

@@ -35,14 +35,34 @@ class TreeNode < AbsNode
       args << parent_node
       tree_node = @tree_node_class.new(*args)
       @scope_stack.push tree_node
-      class_eval(&block) if block 
+      if block
+        if block.arity == 0 || block.arity == -1
+          class_eval(&block)
+        elsif block.arity == 1
+          new_block = Proc.new{ block.call(tree_node) }
+          class_eval(&new_block)
+        else
+          raise "block take too much arguments #{block.arity}"
+        end
+      end
       @scope_stack.pop
     end
 
-    def leaf(*args)
+    def leaf(*args, &block)
       tree_node = @scope_stack[-1]
       args << tree_node
-      @leaf_node_class.new(*args)
+      leaf_node = @leaf_node_class.new(*args)
+      if block
+        if block.arity == 0 || block.arity == -1
+          class_eval(&block)
+        elsif block.arity == 1
+          new_block = Proc.new{ block.call(leaf_node) }
+          class_eval(&new_block)
+        else
+          raise "block take too much arguments #{block.arity}"
+        end
+      end
+      leaf_node
     end
   end
 
@@ -89,7 +109,7 @@ class TreeNode < AbsNode
     return if leaf.parent == self
     if not leaf.parent.nil?
       leaf.remove_from_parent
-    end  
+    end
     leaf.parent = self
     if @leaves.length > 0
       @leaves.last.next = leaf
@@ -108,7 +128,7 @@ class TreeNode < AbsNode
       tree_node.remove_from_parent
     else
       tree_node.prefix_path = nil
-    end  
+    end
     tree_node.invalidate
     tree_node.parent = self
     if @children.length > 0
@@ -157,8 +177,8 @@ class TreeNode < AbsNode
     if root?
       str << to_s << "\n"
     else
-      str << prefix 
-      if self.next 
+      str << prefix
+      if self.next
         str << "|-- "
       else
         str << "\`-- "

data/test/treevisitor/tc_tree_node_dsl.rb

@@ -71,6 +71,34 @@ EOS
     assert_equal out, tree.to_str
   end
 
+  def test_dsl_block_with_arg
+
+    tree = TreeNode.create do
+      node "root" do |node|
+        node.prefix_path=("pre/")        
+        leaf "l1"
+        leaf "l2"
+        node "sub" do
+          leaf "l3" do |leaf|            
+          end
+        end
+        node "woleaves"
+      end
+    end
+
+    # puts tree.to_str
+    out =<<EOS
+root
+|-- l1
+|-- l2
+|-- sub
+|   `-- l3
+`-- woleaves
+EOS
+    assert_equal out, tree.to_str   
+    assert_equal "pre/root/sub/l3", tree.find("l3").path_with_prefix
+  end
+
   def test_derivated
     tree = TreeNode.create(DTreeNode, DLeafNode) do
       node "root" do

metadata

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