gf-treevisitor 0.0.16 → 0.0.18

data/VERSION

@@ -1 +1 @@
-0.0.16
+0.0.18

data/lib/treevisitor.rb

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

data/lib/treevisitor/tree_node.rb

@@ -30,17 +30,19 @@ class TreeNode < AbsNode
 
     private
 
-    def node(name, &block)
+    def node(*args, &block)
       parent_node = @scope_stack.length > 0 ? @scope_stack[-1] : nil
-      tree_node = @tree_node_class.new(name, parent_node)
+      args << parent_node
+      tree_node = @tree_node_class.new(*args)
       @scope_stack.push tree_node
-      class_eval(&block)
+      class_eval(&block) if block 
       @scope_stack.pop
     end
 
-    def leaf(name)
+    def leaf(*args)
       tree_node = @scope_stack[-1]
-      @leaf_node_class.new(name, tree_node)
+      args << tree_node
+      @leaf_node_class.new(*args)
     end
   end
 

data/test/treevisitor/tc_tree_node_dsl.rb

@@ -15,6 +15,35 @@ class DLeafNode < LeafNode
   end
 end
 
+class ArgsTreeNode < TreeNode
+
+  attr_reader :description
+
+  def initialize(name, description, parent)
+    super(name, parent)
+    @description =  description
+  end
+
+  def to_s
+    "a: #{description}"
+  end
+end
+
+class ArgsLeafNode < LeafNode
+
+  attr_reader :description
+
+  def initialize(name, description, parent)
+    super(name, parent)
+    @description =  description
+  end
+
+  def to_s
+    "a: #{description}"
+  end
+end
+
+
 class TCTreeNodeDsl < Test::Unit::TestCase
 
   def test_dsl
@@ -26,6 +55,7 @@ class TCTreeNodeDsl < Test::Unit::TestCase
         node "sub" do
           leaf "l3"
         end
+        node "woleaves"
       end
     end
 
@@ -34,14 +64,13 @@ class TCTreeNodeDsl < Test::Unit::TestCase
 root
 |-- l1
 |-- l2
-`-- sub
-    `-- l3
+|-- sub
+|   `-- l3
+`-- woleaves
 EOS
     assert_equal out, tree.to_str
-
   end
 
-
   def test_derivated
     tree = TreeNode.create(DTreeNode, DLeafNode) do
       node "root" do
@@ -75,4 +104,25 @@ EOS
     assert_equal out, tree.to_str
   end
 
+  def test_derivated_args
+    tree = TreeNode.create(ArgsTreeNode, ArgsLeafNode) do
+      node "root", "droot" do
+        leaf "l1", "dl1"
+        leaf "l2", "dl2"
+        node "sub", "dsub" do
+          leaf "l3", "dl3"
+        end
+      end
+    end
+
+    # puts tree.to_str
+    out =<<EOS
+a: droot
+|-- a: dl1
+|-- a: dl2
+`-- a: dsub
+    `-- a: dl3
+EOS
+    assert_equal out, tree.to_str
+  end
 end

metadata

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