yasuri 3.1.0 → 3.2.0

data/lib/yasuri/yasuri_cli.rb

@@ -0,0 +1,64 @@
+require 'thor'
+require 'json'
+require 'yasuri'
+require 'mechanize'
+
+module Yasuri
+  class CLI < Thor
+    package_name "yasuri"
+
+    default_command :scrape
+    desc "scrape <URI> [[--file <TREE_FILE>] or [--json <JSON>]]", "Getting from <URI> and scrape it. with <JSON> or json/yml from <TREE_FILE>. They should be Yasuri's format json or yaml string."
+    option :file, {aliases: 'f', desc: "path to file that written yasuri tree as json or yaml", type: :string}
+    option :json, {aliases: 'j', desc: "yasuri tree format json string", type: :string}
+    def scrape(uri)
+      # argument validations
+      if [options[:file], options[:json]].compact.count != 1
+        $stderr.puts "ERROR: Only one of `--file` or `--json` option should be specified."
+        return -1
+      end
+      if options[:file]&.empty? or options[:file] == "file" or options[:json]&.empty?
+        $stderr.puts "ERROR: --file option require not empty argument."
+        return -1
+      end
+      if options[:json]&.empty? or options[:json] == "json"
+        $stderr.puts "ERROR: --json option require not empty argument."
+        return -1
+      end
+
+      tree = if options[:file]
+              src = File.read(options[:file])
+
+              begin
+                Yasuri.json2tree(src)
+              rescue
+                begin
+                  Yasuri.yaml2tree(src)
+                rescue => e
+                  $stderr.puts "ERROR: Failed to convert to yasuri tree `#{options[:file]}`. #{e.message}"
+                  return -1
+                end
+              end
+            else
+              begin
+                Yasuri.json2tree(options[:json])
+              rescue => e
+                $stderr.puts "ERROR: Failed to convert json to yasuri tree. #{e.message}"
+                return -1
+              end
+            end
+
+      agent = Mechanize.new
+      root_page = agent.get(uri)
+      result = tree.inject(agent, root_page)
+
+      if result.instance_of?(String)
+        puts result
+      else
+        j result
+      end
+
+      return 0
+    end
+  end
+end

data/lib/yasuri/yasuri_links_node.rb

@@ -7,7 +7,7 @@ module Yasuri
   class LinksNode
     include Node
     def inject(agent, page, opt = {}, element = page)
-      retry_count = opt[:retry_count] || 5
+      retry_count = opt[:retry_count] || Yasuri::DefaultRetryCount
 
       links = element.search(@xpath) || [] # links expected
       links.map do |link|
@@ -15,7 +15,7 @@ module Yasuri
         child_page = Yasuri.with_retry(retry_count) { link_button.click }
 
         child_results_kv = @children.map do |child_node|
-          child_name = Yasuri.NodeName(child_node.name, opt)
+          child_name = Yasuri.node_name(child_node.name, opt)
           [child_name, child_node.inject(agent, child_page, opt)]
         end
 
@@ -24,7 +24,7 @@ module Yasuri
     end
 
     def node_type_str
-      "links"
+      "links".freeze
     end
   end # class
 end # module

data/lib/yasuri/yasuri_map_node.rb

@@ -3,7 +3,7 @@ module Yasuri
   class MapNode
     attr_reader :name, :children
 
-    def initialize(name, children, opt: {})
+    def initialize(name, children, **opt)
       @name = name
       @children = children
       @opt = opt
@@ -16,39 +16,24 @@ module Yasuri
       Hash[child_results_kv]
     end
 
-    def opts
-      {}
-    end
-
     def to_h
-      h = {}
-      h["node"] = "map"
-      h["name"] = self.name
-      h["children"] = self.children.map{|c| c.to_h} if not children.empty?
+      node_hash = {}
+      self.opts.each{|k, v| node_hash[k] = v if not v.nil?}
 
-      self.opts.each do |key,value|
-        h[key] = value if not value.nil?
+      children.each do |child|
+        child_node_name = "#{child.node_type_str}_#{child.name}"
+        node_hash[child_node_name] = child.to_h
       end
 
-      h
+      node_hash
     end
 
-    def self.hash2node(node_h)
-      reservedKeys = %i|node name children|
-
-      node, name, children = reservedKeys.map do |key|
-        node_h[key]
-      end
-
-      fail "Not found 'name' value in map" if name.nil?
-      fail "Not found 'children' value in map" if children.nil?
-      children ||= []
-
-      childnodes = children.map{|c| Yasuri.hash2node(c) }
-      reservedKeys.each{|key| node_h.delete(key)}
-      opt = node_h
+    def opts
+      {}
+    end
 
-      self.new(name, childnodes, **opt)
+    def node_type_str
+      "map".freeze
     end
   end
 end

data/lib/yasuri/yasuri_node.rb

@@ -7,7 +7,7 @@ module Yasuri
   module Node
     attr_reader :url, :xpath, :name, :children
 
-    def initialize(xpath, name, children = [], opt: {})
+    def initialize(xpath, name, children = [], **opt)
       @xpath, @name, @children = xpath, name, children
     end
 
@@ -15,50 +15,28 @@ module Yasuri
       fail "#{Kernel.__method__} is not implemented in included class."
     end
 
-    def opts
-      {}
-    end
-
     def to_h
-      h = {}
-      h["node"] = self.node_type_str
-      h["name"] = self.name
-      h["path"] = self.xpath
-      h["children"] = self.children.map{|c| c.to_h} if not children.empty?
-
-      self.opts.each do |key,value|
-        h[key] = value if not value.nil?
-      end
-
-      h
-    end
+      return @xpath if @xpath and @children.empty? and self.opts.values.compact.empty?
 
-    module ClassMethods
-      def hash2node(node_h)
-        reservedKeys = %i|node name path children|
+      node_hash = {}
+      self.opts.each{|k, v| node_hash[k] = v if not v.nil?}
 
-        node, name, path, children = ReservedKeys.map do |key|
-          node_h[key]
-        end
+      node_hash[:path] = @xpath if @xpath
 
-        fail "Not found 'name' value in map" if name.nil?
-        fail "Not found 'path' value in map" if path.nil?
-        children ||= []
-
-        childnodes = children.map{|c| Yasuri.hash2node(c) }
-        reservedKeys.each{|key| node_h.delete(key)}
-        opt = node_h
-
-        self.new(path, name, childnodes, **opt)
+      children.each do |child|
+        child_node_name = "#{child.node_type_str}_#{child.name}"
+        node_hash[child_node_name] = child.to_h
       end
 
-      def node_type_str
-        fail "#{Kernel.__method__} is not implemented in included class."
-      end
+      node_hash
+    end
+
+    def opts
+      {}
     end
 
-    def self.included(base)
-      base.extend(ClassMethods)
+    def node_type_str
+      fail "#{Kernel.__method__} is not implemented in included class."
     end
   end
 end

data/lib/yasuri/yasuri_paginate_node.rb

@@ -14,7 +14,7 @@ module Yasuri
     end
 
     def inject(agent, page, opt = {}, element = page)
-      retry_count = opt[:retry_count] || 5
+      retry_count = opt[:retry_count] || Yasuri::DefaultRetryCount
 
       raise NotImplementedError.new("PagenateNode inside StructNode, Not Supported") if page != element
 
@@ -22,12 +22,12 @@ module Yasuri
       limit = @limit.nil? ? Float::MAX : @limit
       while page
         child_results_kv = @children.map do |child_node|
-          child_name = Yasuri.NodeName(child_node.name, opt)
+          child_name = Yasuri.node_name(child_node.name, opt)
           [child_name, child_node.inject(agent, page, opt)]
         end
         child_results << Hash[child_results_kv]
 
-        link = page.search(@xpath).first
+        link = page.search(@xpath).first # Todo raise:  link is not found
         break if link == nil
 
         link_button = Mechanize::Page::Link.new(link, agent, page)
@@ -41,12 +41,13 @@ module Yasuri
 
       child_results
     end
+
     def opts
       {limit:@limit, flatten:@flatten}
     end
 
     def node_type_str
-      "pages"
+      "pages".freeze
     end
   end
 end

data/lib/yasuri/yasuri_struct_node.rb

@@ -10,12 +10,16 @@ module Yasuri
       sub_tags = element.search(@xpath)
       tree = sub_tags.map do |sub_tag|
         child_results_kv = @children.map do |child_node|
-          child_name = Yasuri.NodeName(child_node.name, opt)
+          child_name = Yasuri.node_name(child_node.name, opt)
           [child_name, child_node.inject(agent, page, opt, sub_tag)]
         end
         Hash[child_results_kv]
       end
       tree.size == 1 ? tree.first : tree
     end # inject
+
+    def node_type_str
+      "struct".freeze
+    end
   end
 end

data/lib/yasuri/yasuri_text_node.rb

@@ -18,7 +18,6 @@ module Yasuri
       @truncate = Regexp.new(@truncate.to_s) if not @truncate.nil?
 
       @proc = proc.nil? ? nil : proc.to_sym
-
     end
 
     def inject(agent, page, opt = {}, element = page)
@@ -31,15 +30,16 @@ module Yasuri
       end
 
       text = text.__send__(@proc) if @proc && text.respond_to?(@proc)
-      text
-    end
 
-    def node_type_str
-      "text"
+      text
     end
 
     def opts
       {truncate:@truncate, proc:@proc}
     end
+
+    def node_type_str
+      "text".freeze
+    end
   end
 end

data/spec/cli_resources/tree.json

@@ -0,0 +1,8 @@
+{
+  "pages_root": {
+    "path": "/html/body/nav/span/a[@class='next']",
+    "limit": 10,
+    "flatten": false,
+    "text_content": "/html/body/p"
+  }
+}

data/spec/cli_resources/tree.yml

@@ -0,0 +1,5 @@
+pages_root:
+  path: "/html/body/nav/span/a[@class='next']"
+  limit: 10
+  flatten: false
+  text_content: "/html/body/p"

data/spec/cli_resources/tree_wrong.json

@@ -0,0 +1,9 @@
+{
+  ,,,
+  "pages_root": {
+    "path": "/html/body/nav/span/a[@class='next']",
+    "limit": 10,
+    "flatten": false,
+    "text_content": "/html/body/p"
+  }
+}

data/spec/cli_resources/tree_wrong.yml

@@ -0,0 +1,6 @@
+,,,
+pages_root:
+  path: "/html/body/nav/span/a[@class='next']"
+  limit: 10
+  flatten: false
+  text_content: "/html/body/p"

data/spec/spec_helper.rb

@@ -16,7 +16,7 @@ require 'simplecov'
 require 'coveralls'
 Coveralls.wear!
 
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new [
   SimpleCov::Formatter::HTMLFormatter,
   Coveralls::SimpleCov::Formatter
 ]

data/spec/yasuri_cli_spec.rb

@@ -0,0 +1,83 @@
+require_relative 'spec_helper'
+
+describe 'Yasuri' do
+  include_context 'httpserver'
+
+  before do
+    @agent = Mechanize.new
+    @index_page = @agent.get(uri)
+
+    @res_dir = File.expand_path('../cli_resources', __FILE__)
+  end
+
+  describe 'cli scrape' do
+    it "require --file or --json option" do
+      expect {
+        Yasuri::CLI.new.invoke(:scrape, [uri], {})
+      }.to output("ERROR: Only one of `--file` or `--json` option should be specified.\n").to_stderr
+    end
+
+    it "only one of --file or --json option" do
+      expect {
+        Yasuri::CLI.new.invoke(:scrape, [uri], {file: "path.json", json: '{"text_title": "/html/head/title"}'})
+      }.to output("ERROR: Only one of `--file` or `--json` option should be specified.\n").to_stderr
+    end
+
+    it "require --file option is not empty string" do
+      expect {
+        Yasuri::CLI.new.invoke(:scrape, [uri], {file: "file"})
+      }.to output("ERROR: --file option require not empty argument.\n").to_stderr
+    end
+
+    it "require --json option is not empty string" do
+      expect {
+        Yasuri::CLI.new.invoke(:scrape, [uri], {json: "json"})
+      }.to output("ERROR: --json option require not empty argument.\n").to_stderr
+    end
+
+
+    it "display text node as simple string" do
+      expect {
+        Yasuri::CLI.new.invoke(:scrape, [uri], {json: '{"text_title": "/html/head/title"}'})
+      }.to output("Yasuri Test\n").to_stdout
+    end
+
+    it "display texts in single json" do
+      expect {
+        Yasuri::CLI.new.invoke(:scrape, [uri], {json: '{"text_c1":"/html/body/p[1]", "text_c2":"/html/body/p[2]"}'})
+      }.to output('{"c1":"Hello,Yasuri","c2":"Last Modify - 2015/02/14"}'+"\n").to_stdout
+    end
+
+
+    it "display text node as simple string via json file" do
+      expect {
+        Yasuri::CLI.new.invoke(:scrape, [uri], {file: "#{@res_dir}/tree.json"})
+      }.to output('[{"content":"Hello,YasuriLast Modify - 2015/02/14"}]' + "\n").to_stdout
+    end
+    it "display text node as simple string via yaml file" do
+      expect {
+        Yasuri::CLI.new.invoke(:scrape, [uri], {file: "#{@res_dir}/tree.yml"})
+      }.to output('[{"content":"Hello,YasuriLast Modify - 2015/02/14"}]' + "\n").to_stdout
+    end
+
+
+    it "display ERROR when json string is wrong" do
+      wrong_json = '{,,}'
+      expect {
+        Yasuri::CLI.new.invoke(:scrape, [uri], {json: wrong_json})
+      }.to output("ERROR: Failed to convert json to yasuri tree. 809: unexpected token at '#{wrong_json}'\n").to_stderr
+    end
+    it "display ERROR when json file contains is wrong" do
+      file_path = "#{@res_dir}/tree_wrong.json"
+      expect {
+        Yasuri::CLI.new.invoke(:scrape, [uri], {file: file_path})
+      }.to output("ERROR: Failed to convert to yasuri tree `#{file_path}`. (<unknown>): did not find expected node content while parsing a flow node at line 2 column 3\n").to_stderr
+    end
+    it "display ERROR when yaml file contains is wrong" do
+      file_path = "#{@res_dir}/tree_wrong.yml"
+      expect {
+        Yasuri::CLI.new.invoke(:scrape, [uri], {file: file_path})
+      }.to output("ERROR: Failed to convert to yasuri tree `#{file_path}`. (<unknown>): did not find expected node content while parsing a block node at line 1 column 1\n").to_stderr
+    end
+  end
+end

data/spec/yasuri_spec.rb

@@ -13,6 +13,7 @@ describe 'Yasuri' do
     @index_page = @agent.get(@uri)
   end
 
+
   ############
   # yam2tree #
   ############
@@ -23,10 +24,8 @@ describe 'Yasuri' do
 
     it "return text node" do
       src = <<-EOB
-content:
-  node: text
-  path: "/html/body/p[1]"
-EOB
+        text_content: "/html/body/p[1]"
+      EOB
       generated = Yasuri.yaml2tree(src)
       original  = Yasuri::TextNode.new('/html/body/p[1]', "content")
 
@@ -35,10 +34,9 @@ EOB
 
     it "return text node as symbol" do
       src = <<-EOB
-:content:
-  :node: text
-  :path: "/html/body/p[1]"
-EOB
+      :text_content:
+        :path: "/html/body/p[1]"
+      EOB
       generated = Yasuri.yaml2tree(src)
       original  = Yasuri::TextNode.new('/html/body/p[1]', "content")
 
@@ -48,14 +46,10 @@ EOB
     it "return LinksNode/TextNode" do
 
       src = <<-EOB
-root:
-  node: links
-  path: "/html/body/a"
-  children:
-    - content:
-        node: text
-        path: "/html/body/p"
-EOB
+      links_root:
+        path: "/html/body/a"
+        text_content: "/html/body/p"
+      EOB
       generated = Yasuri.yaml2tree(src)
       original  = Yasuri::LinksNode.new('/html/body/a', "root", [
                     Yasuri::TextNode.new('/html/body/p', "content"),
@@ -66,21 +60,13 @@ EOB
 
     it "return StructNode/StructNode/[TextNode,TextNode]" do
       src = <<-EOB
-tables:
-  node: struct
-  path: "/html/body/table"
-  children:
-    - table:
-        node: struct
-        path: "./tr"
-        children:
-          - title:
-              node: text
-              path: "./td[1]"
-          - pub_date:
-              node: text
-              path: "./td[2]"
-EOB
+      struct_tables:
+        path: "/html/body/table"
+        struct_table:
+          path: "./tr"
+          text_title: "./td[1]"
+          text_pub_date: "./td[2]"
+      EOB
 
       generated = Yasuri.yaml2tree(src)
       original  = Yasuri::StructNode.new('/html/body/table', "tables", [
@@ -105,10 +91,10 @@ EOB
     end
 
     it "return TextNode" do
-      src = %q| { "node"  : "text",
-                  "name"  : "content",
-                  "path"  : "/html/body/p[1]"
-                }|
+      src = %q|
+      {
+        "text_content": "/html/body/p[1]"
+      }|
       generated = Yasuri.json2tree(src)
       original  = Yasuri::TextNode.new('/html/body/p[1]', "content")
 
@@ -116,30 +102,24 @@ EOB
     end
 
     it "return TextNode with truncate_regexp" do
-      src = %q| { "node"  : "text",
-                  "name"  : "content",
-                  "path"  : "/html/body/p[1]",
-                  "truncate"  : "^[^,]+"
-                }|
+      src = %q|
+      {
+        "text_content": {
+          "path": "/html/body/p[1]",
+          "truncate"  : "^[^,]+"
+        }
+      }|
       generated = Yasuri.json2tree(src)
       original  = Yasuri::TextNode.new('/html/body/p[1]', "content", truncate:/^[^,]+/)
       compare_generated_vs_original(generated, original, @index_page)
     end
 
     it "return MapNode with TextNodes" do
-      src = %q| { "node" : "map",
-                  "name"  : "parent",
-                  "children" : [
-                    { "node"  : "text",
-                      "name"  : "content01",
-                      "path"  : "/html/body/p[1]"
-                    },
-                    { "node"  : "text",
-                      "name"  : "content02",
-                      "path"  : "/html/body/p[2]"
-                    }
-                  ]
-                }|
+      src = %q|
+      {
+        "text_content01": "/html/body/p[1]",
+        "text_content02": "/html/body/p[2]"
+      }|
       generated = Yasuri.json2tree(src)
       original  = Yasuri::MapNode.new('parent', [
         Yasuri::TextNode.new('/html/body/p[1]', "content01"),
@@ -149,14 +129,14 @@ EOB
     end
 
     it "return LinksNode/TextNode" do
-      src = %q| { "node"     : "links",
-                  "name"     : "root",
-                  "path"     : "/html/body/a",
-                  "children" : [ { "node" : "text",
-                                   "name" : "content",
-                                   "path" : "/html/body/p"
-                                 } ]
-                }|
+      src = %q|
+      {
+        "links_root": {
+          "path": "/html/body/a",
+          "text_content": "/html/body/p"
+        }
+      }|
+
       generated = Yasuri.json2tree(src)
       original  = Yasuri::LinksNode.new('/html/body/a', "root", [
                     Yasuri::TextNode.new('/html/body/p', "content"),
@@ -166,14 +146,13 @@ EOB
     end
 
     it "return PaginateNode/TextNode" do
-      src = %q|{ "node"     : "pages",
-                 "name"     : "root",
-                 "path"     : "/html/body/nav/span/a[@class=\'next\']",
-                 "children" : [ { "node" : "text",
-                                  "name" : "content",
-                                  "path" : "/html/body/p"
-                                } ]
-               }|
+      src = %q|
+      {
+        "pages_root": {
+          "path": "/html/body/nav/span/a[@class=\'next\']",
+          "text_content": "/html/body/p"
+        }
+      }|
       generated = Yasuri.json2tree(src)
       original = Yasuri::PaginateNode.new("/html/body/nav/span/a[@class='next']", "root", [
                    Yasuri::TextNode.new('/html/body/p', "content"),
@@ -185,15 +164,14 @@ EOB
     end
 
     it "return PaginateNode/TextNode with limit" do
-      src = %q|{ "node"     : "pages",
-                 "name"     : "root",
-                 "path"     : "/html/body/nav/span/a[@class=\'next\']",
-                 "limit"    : 2,
-                 "children" : [ { "node" : "text",
-                                  "name" : "content",
-                                  "path" : "/html/body/p"
-                                } ]
-               }|
+      src = %q|
+      {
+        "pages_root": {
+          "path": "/html/body/nav/span/a[@class=\'next\']",
+          "limit": 2,
+          "text_content": "/html/body/p"
+        }
+      }|
       generated = Yasuri.json2tree(src)
       original = Yasuri::PaginateNode.new("/html/body/nav/span/a[@class='next']", "root", [
                    Yasuri::TextNode.new('/html/body/p', "content"),
@@ -205,24 +183,17 @@ EOB
     end
 
     it "return StructNode/StructNode/[TextNode,TextNode]" do
-     src = %q| { "node"     : "struct",
-                 "name"     : "tables",
-                 "path"     : "/html/body/table",
-                 "children" : [
-                   { "node"       : "struct",
-                     "name"       : "table",
-                     "path"       : "./tr",
-                     "children"   : [
-                       { "node" : "text",
-                         "name" : "title",
-                         "path" : "./td[1]"
-                       },
-                       { "node" : "text",
-                         "name" : "pub_date",
-                         "path" : "./td[2]"
-                       }]
-                   }]
-               }|
+      src = %q|
+      {
+        "struct_tables": {
+          "path": "/html/body/table",
+          "struct_table": {
+            "path": "./tr",
+            "text_title": "./td[1]",
+            "text_pub_date": "./td[2]"
+          }
+        }
+      }|
       generated = Yasuri.json2tree(src)
       original  = Yasuri::StructNode.new('/html/body/table', "tables", [
         Yasuri::StructNode.new('./tr', "table", [
@@ -235,22 +206,22 @@ EOB
     end
   end
 
+
   #############
   # tree2json #
   #############
   describe '.tree2json' do
     it "return empty json" do
-      json = Yasuri.tree2json(nil)
-      expect(json).to match "{}"
+      expect { Yasuri.tree2json(nil) }.to raise_error(RuntimeError)
     end
 
     it "return text node" do
       node = Yasuri::TextNode.new("/html/head/title", "title")
       json = Yasuri.tree2json(node)
-      expected_str = %q| { "node": "text",
-                           "name": "title",
-                           "path": "/html/head/title"
-                         } |
+      expected_str = %q|
+      {
+        "text_title": "/html/head/title"
+      }|
       expected = JSON.parse(expected_str)
       actual   = JSON.parse(json)
       expect(actual).to match expected
@@ -259,11 +230,13 @@ EOB
     it "return text node with truncate_regexp" do
       node = Yasuri::TextNode.new("/html/head/title", "title", truncate:/^[^,]+/)
       json = Yasuri.tree2json(node)
-      expected_str = %q| { "node": "text",
-                           "name": "title",
-                           "path": "/html/head/title",
-                           "truncate": "^[^,]+"
-                         } |
+      expected_str = %q|
+      {
+        "text_title": {
+          "path": "/html/head/title",
+          "truncate": "^[^,]+"
+        }
+      }|
       expected = Yasuri.tree2json(Yasuri.json2tree(expected_str))
       actual   = Yasuri.tree2json(Yasuri.json2tree(json))
       expect(actual).to match expected
@@ -276,19 +249,12 @@ EOB
       ])
       actual_json = Yasuri.tree2json(tree)
 
-      expected_json = %q| { "node" : "map",
-        "name"  : "parent",
-        "children" : [
-          { "node"  : "text",
-            "name"  : "content01",
-            "path"  : "/html/body/p[1]"
-          },
-          { "node"  : "text",
-            "name"  : "content02",
-            "path"  : "/html/body/p[2]"
-          }
-        ]
+      expected_json = %q|
+      {
+        "text_content01": "/html/body/p[1]",
+        "text_content02": "/html/body/p[2]"
       }|
+
       expected = Yasuri.tree2json(Yasuri.json2tree(expected_json))
       actual   = Yasuri.tree2json(Yasuri.json2tree(actual_json))
       expect(actual).to match expected
@@ -299,14 +265,14 @@ EOB
                 Yasuri::TextNode.new('/html/body/p', "content"),
               ])
       json   = Yasuri.tree2json(tree)
-      expected_src = %q| { "node"     : "links",
-                           "name"     : "root",
-                           "path"     : "/html/body/a",
-                           "children" : [ { "node" : "text",
-                                            "name" : "content",
-                                            "path" : "/html/body/p"
-                                          } ]
-                         }|
+
+      expected_src = %q|
+      {
+        "links_root": {
+          "path": "/html/body/a",
+          "text_content":"/html/body/p"
+        }
+      }|
       expected  = JSON.parse(expected_src)
       actual    = JSON.parse(json)
       expect(actual).to match expected
@@ -318,25 +284,44 @@ EOB
              ], limit:10)
 
       json   = Yasuri.tree2json(tree)
-      expected_src = %q| { "node"     : "pages",
-                           "name"     : "root",
-                           "path"     : "/html/body/nav/span/a[@class='next']",
-                           "limit"    : 10,
-                           "flatten"  : false,
-                           "children" : [ { "node" : "text",
-                                            "name" : "content",
-                                            "path" : "/html/body/p"
-                                          } ]
-                         }|
+      expected_src = %q|
+      {
+        "pages_root": {
+          "path": "/html/body/nav/span/a[@class='next']",
+          "limit": 10,
+          "flatten": false,
+          "text_content": "/html/body/p"
+        }
+      }|
       expected  = JSON.parse(expected_src)
       actual    = JSON.parse(json)
       expect(actual).to match expected
     end
-
-
-
   end
 
+  it "return StructNode/StructNode/[TextNode,TextNode]" do
+    tree  = Yasuri::StructNode.new('/html/body/table', "tables", [
+      Yasuri::StructNode.new('./tr', "table", [
+        Yasuri::TextNode.new('./td[1]', "title"),
+        Yasuri::TextNode.new('./td[2]', "pub_date"),
+      ])
+    ])
+    json   = Yasuri.tree2json(tree)
+    expected_src = %q|
+    {
+      "struct_tables": {
+        "path": "/html/body/table",
+        "struct_table": {
+          "path": "./tr",
+          "text_title": "./td[1]",
+          "text_pub_date": "./td[2]"
+        }
+      }
+    }|
+    expected  = JSON.parse(expected_src)
+    actual    = JSON.parse(json)
+    expect(actual).to match expected
+  end
 
   it 'has a version number' do
     expect(Yasuri::VERSION).not_to be nil