yasuri 2.0.12 → 2.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4fed4a13bb125758515e3c0ced665b1ca3d20b6
-  data.tar.gz: e9dfb2ed6256a367db2e5b6a78d23fa097c422d7
+  metadata.gz: 5788b7152b19e7be6d0da7ae376784eeedc52b5f
+  data.tar.gz: 40b187d47b1bf468c8d37fe688906a0c7c3f2858
 SHA512:
-  metadata.gz: 8b9d6345f3f49b1f7d9445ce18bca736b8cbeedc69979a45d541b59af4e09092d7c1d12886801a24296e9e3d73f39a7c2d53a7c2de12e1a0ff890623b47cfe84
-  data.tar.gz: 6d755f266062052dd5244599deefefea85f7570c827a898e48eee22c44510dde287b0554ed2cae85e3b94b44fe4eb6f74b512c44047e6cc1bb43fe27a93143b0
+  metadata.gz: a338eecbdb1412b8da0f7201fc333b30aaab59e9065f6b92eef1c0d542705fa8a536907e9084809f2a7a2156d39462e4f397ac0e4e9352b94d9cef9617bab6b2
+  data.tar.gz: 99a7ecad43ba424566ae4a3635d03dab35f9224de800a3f865c01f8075c91ba5db1451f8481b35e397ab4877c790da3ecea6fce646e2981190a86835f0abc3ca

data/.gitignore

@@ -66,5 +66,4 @@ tramp
 # cask packages
 .cask/
 
-.ruby-version
-Gemfile.lock
+Gemfile.lock

data/.ruby-version

@@ -0,0 +1 @@
+2.3.2

data/.travis.yml

@@ -1,9 +1,7 @@
 language: ruby
-rvm:
-  - 2.2.0
 script:
   - ruby --version
   - rspec spec
 addons:
   code_climate:
-    repo_token: 0dc78d33107a7f11f257c0218ac1a37e0073005bb9734f2fd61d0f7e803fc151
+    repo_token: 0dc78d33107a7f11f257c0218ac1a37e0073005bb9734f2fd61d0f7e803fc151

data/README.md

@@ -52,6 +52,23 @@ root = Yasuri.links_root '//*[@id="menu"]/ul/li/a' do
          text_content '//*[@id="contents"]/p[1]'
        end
 
+
+# Node tree constructing by YAML
+src = <<-EOYAML
+root:
+  node: links
+  path: "//*[@id='menu']/ul/li/a"
+  children:
+    - title:
+        node: text
+        path: "//*[@id='contents']/h2"
+    - content:
+        node: text
+        path: "//*[@id='contents']/p[1]"
+EOYAML
+root = Yasuri.yaml2tree(src)
+
+
 # Node tree constructing by JSON
 src = <<-EOJSON
    { "node"     : "links",

data/USAGE.ja.md

@@ -67,7 +67,7 @@ page = agent.get(uri)
 tree.inject(agent, page)
 ```
 
-ツリーは、DSLまたはjsonで定義することができます．上の例ではDSLで定義しています．
+ツリーは、json，yaml，またはDSLで定義することができます．上の例ではDSLで定義しています．
 以下は、jsonで上記と等価な解析ツリーを定義した例です．
 
 ```ruby
@@ -87,6 +87,19 @@ EOJSON
 tree = Yasuri.json2tree(src)
 ```
 
+```ruby
+# yaml で構成する場合
+src = <<-EOYAML
+title:
+  node: links
+  path: "/html/body/a"
+  children:
+    - name:
+        node: text
+        path: "/html/body/p"
+EOYAML
+tree = Yasuri.yaml2tree(src)
+```
 
 ### Node
 ツリーは入れ子になった *Node* で構成されます．

data/USAGE.md

@@ -69,7 +69,7 @@ page = agent.get(uri)
 tree.inject(agent, page)
 ```
 
-Tree is definable by 2(+1) ways, DSL and json (and basic ruby code). In above example, DSL.
+Tree is definable by 3(+1) ways, json, yaml, and DSL (or basic ruby code). In above example, DSL.
 
 ```ruby
 # Construct by json.
@@ -88,6 +88,21 @@ EOJSON
 tree = Yasuri.json2tree(src)
 ```
 
+```ruby
+# Construct by yaml.
+src = <<-EOYAML
+title:
+  node: links
+  path: "/html/body/a"
+  children:
+    - name:
+        node: text
+        path: "/html/body/p"
+EOYAML
+tree = Yasuri.yaml2tree(src)
+```
+
+
 ### Node
 Tree is constructed by nested Nodes.
 Node has `Type`, `Name`, `Path`, `Childlen`, and `Options`.

data/lib/yasuri/version.rb

@@ -1,3 +1,3 @@
 module Yasuri
-  VERSION = "2.0.12"
+  VERSION = "2.0.13"
 end

data/lib/yasuri/yasuri.rb

@@ -4,6 +4,7 @@
 
 require 'mechanize'
 require 'json'
+require 'yaml'
 
 require_relative 'yasuri_node'
 require_relative 'yasuri_text_node'
@@ -23,6 +24,36 @@ module Yasuri
     Yasuri.node2hash(node).to_json
   end
 
+  def self.yaml2tree(yaml_string)
+    raise RuntimeError if yaml_string.nil? or yaml_string.empty?
+
+    yaml = YAML.load(yaml_string)
+    raise RuntimeError if yaml.keys.size < 1
+
+    root_key, root = yaml.keys.first, yaml.values.first
+    hash = Yasuri.yaml2tree_sub(root_key, root)
+
+    Yasuri.hash2node(hash)
+  end
+
+  private
+  def self.yaml2tree_sub(name, body)
+    return nil if name.nil? or body.nil?
+
+    new_body = Hash[:name, name]
+    body.each{|k,v| new_body[k.to_sym] = v}
+    body = new_body
+
+    return body if body[:children].nil?
+
+    body[:children] = body[:children].map do |c|
+      k, b = c.keys.first, c.values.first
+      Yasuri.yaml2tree_sub(k, b)
+    end
+
+    body
+  end
+
   def self.method_missing(name, *args, &block)
     generated = Yasuri::NodeGenerator.gen(name, *args, &block)
     generated || super(name, args)
@@ -44,9 +75,9 @@ module Yasuri
     end
     children ||= []
 
-    fail "Not found 'node' value in json" if node.nil?
-    fail "Not found 'name' value in json" if name.nil?
-    fail "Not found 'path' value in json" if path.nil?
+    fail "Not found 'node' value in map" if node.nil?
+    fail "Not found 'name' value in map" if name.nil?
+    fail "Not found 'path' value in map" if path.nil?
 
     childnodes = children.map{|c| Yasuri.hash2node(c) }
     ReservedKeys.each{|key| node_h.delete(key)}

data/spec/yasuri_spec.rb

@@ -13,6 +13,89 @@ describe 'Yasuri' do
     @index_page = @agent.get(@uri)
   end
 
+  ############
+  # yam2tree #
+  ############
+  describe '.yaml2tree' do
+    it "fail if empty yaml" do
+      expect { Yasuri.yaml2tree(nil) }.to raise_error(RuntimeError)
+    end
+
+    it "return text node" do
+      src = <<-EOB
+content:
+  node: text
+  path: "/html/body/p[1]"
+EOB
+      generated = Yasuri.yaml2tree(src)
+      original  = Yasuri::TextNode.new('/html/body/p[1]', "content")
+
+      compare_generated_vs_original(generated, original, @index_page)
+    end
+
+    it "return text node as symbol" do
+      src = <<-EOB
+:content:
+  :node: text
+  :path: "/html/body/p[1]"
+EOB
+      generated = Yasuri.yaml2tree(src)
+      original  = Yasuri::TextNode.new('/html/body/p[1]', "content")
+
+      compare_generated_vs_original(generated, original, @index_page)
+    end
+
+    it "return LinksNode/TextNode" do
+
+      src = <<-EOB
+root:
+  node: links
+  path: "/html/body/a"
+  children:
+    - content:
+        node: text
+        path: "/html/body/p"
+EOB
+      generated = Yasuri.yaml2tree(src)
+      original  = Yasuri::LinksNode.new('/html/body/a', "root", [
+                    Yasuri::TextNode.new('/html/body/p', "content"),
+                  ])
+
+      compare_generated_vs_original(generated, original, @index_page)
+    end
+
+    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
+
+      generated = Yasuri.yaml2tree(src)
+      original  = 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"),
+        ])
+      ])
+      page = @agent.get(@uri + "/struct/structual_text.html")
+      compare_generated_vs_original(generated, original, page)
+    end
+
+  end # end of describe '.yaml2tree'
+
+
   #############
   # json2tree #
   #############

data/yasuri.gemspec

@@ -18,8 +18,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.7"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "fuubar"
   spec.add_development_dependency "glint"

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: yasuri
 version: !ruby/object:Gem::Version
-  version: 2.0.12
+  version: 2.0.13
 platform: ruby
 authors:
 - TAC
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-15 00:00:00.000000000 Z
+date: 2017-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -146,6 +146,7 @@ files:
 - ".coveralls.yml"
 - ".gitignore"
 - ".rspec"
+- ".ruby-version"
 - ".travis.yml"
 - Gemfile
 - LICENSE