yasuri 2.0.13 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5788b7152b19e7be6d0da7ae376784eeedc52b5f
-  data.tar.gz: 40b187d47b1bf468c8d37fe688906a0c7c3f2858
+SHA256:
+  metadata.gz: 7f360d6efb02954a5a54e2fc308d0cd0c2e5c129c52eba727fb0dfe4a40ce502
+  data.tar.gz: 8d8805a55c7ce16c76eb50945b954ad19327a3a63183eca098dac6ac93d2203b
 SHA512:
-  metadata.gz: a338eecbdb1412b8da0f7201fc333b30aaab59e9065f6b92eef1c0d542705fa8a536907e9084809f2a7a2156d39462e4f397ac0e4e9352b94d9cef9617bab6b2
-  data.tar.gz: 99a7ecad43ba424566ae4a3635d03dab35f9224de800a3f865c01f8075c91ba5db1451f8481b35e397ab4877c790da3ecea6fce646e2981190a86835f0abc3ca
+  metadata.gz: ffe02aee78de5f30f1e583b2aca8c0617324bdbf62d7c64e371e90d139bac8b1d26df23e9725df0b81b946c6a465283f88a7d51945872c56e7be892eac1b5e4e
+  data.tar.gz: c8983dc2cd283c7de0d97357d2a8164426ee3e1017e73c498c0676716a1c9ab4c42cc02a836bf7e559877d50ca23df6fa656c0197b5018a4881997e2fb4c57d0

data/.github/workflows/ruby.yml

@@ -0,0 +1,35 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Ruby
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['2.6', '2.7', '3.0']
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
+    # change this to (see https://github.com/ruby/setup-ruby#versioning):
+    # uses: ruby/setup-ruby@v1
+      uses: ruby/setup-ruby@473e4d8fe5dd94ee328fdfca9f8c9c7afc9dae5e
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: Run tests
+      run: bundle exec rake

data/.ruby-version

@@ -1 +1 @@
-2.3.2
+3.0.0

data/README.md

@@ -1,4 +1,5 @@
-# Yasuri [![Build Status](https://travis-ci.org/tac0x2a/yasuri.svg?branch=master)](https://travis-ci.org/tac0x2a/yasuri) [![Coverage Status](https://coveralls.io/repos/tac0x2a/yasuri/badge.svg?branch=master)](https://coveralls.io/r/tac0x2a/yasuri?branch=master) [![Code Climate](https://codeclimate.com/github/tac0x2a/yasuri/badges/gpa.svg)](https://codeclimate.com/github/tac0x2a/yasuri)
+# Yasuri
+[![Build Status](https://travis-ci.org/tac0x2a/yasuri.svg?branch=master)](https://travis-ci.org/tac0x2a/yasuri) [![Coverage Status](https://coveralls.io/repos/tac0x2a/yasuri/badge.svg?branch=master)](https://coveralls.io/r/tac0x2a/yasuri?branch=master) [![Maintainability](https://api.codeclimate.com/v1/badges/c29480fea1305afe999f/maintainability)](https://codeclimate.com/github/tac0x2a/yasuri/maintainability)
 
 Yasuri (鑢) is an easy web-scraping library for supporting "[Mechanize](https://github.com/sparklemotion/mechanize)".
 
@@ -59,12 +60,8 @@ 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]"
+    - title:   { node: text, path: "//*[@id='contents']/h2" }
+    - content: { node: text, path: "//*[@id='contents']/p[1]" }
 EOYAML
 root = Yasuri.yaml2tree(src)
 
@@ -95,6 +92,17 @@ result = root.inject(agent, root_page)
 # => [ {"title" => "PageTitle", "content" => "Page Contents" }, ...  ]
 ```
 
+## Dev
+```sh
+$ gem install bundler
+$ bundle install
+```
+### Test
+```sh
+$ rake
+# or
+$ rspec spec/*spec.rb
+```
 
 ## Contributing
 

data/lib/yasuri/version.rb

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

data/lib/yasuri/yasuri.rb

@@ -54,9 +54,9 @@ module Yasuri
     body
   end
 
-  def self.method_missing(name, *args, &block)
-    generated = Yasuri::NodeGenerator.gen(name, *args, &block)
-    generated || super(name, args)
+  def self.method_missing(node_name, pattern, **opt, &block)
+    generated = Yasuri::NodeGenerator.gen(node_name, pattern, **opt, &block)
+    generated || super(node_name, **opt)
   end
 
   private
@@ -85,7 +85,7 @@ module Yasuri
 
     klass = Text2Node[node.to_sym]
     fail "Undefined node type #{node}" if klass.nil?
-    klass.new(path, name, childnodes, opt)
+    klass.new(path, name, childnodes, **opt)
   end
 
   def self.node2hash(node)
@@ -109,7 +109,8 @@ module Yasuri
     json
   end
 
-  def self.NodeName(name, symbolize_names:false)
+  def self.NodeName(name, opt)
+    symbolize_names = opt[:symbolize_names]
     symbolize_names ? name.to_sym : name
   end
 

data/lib/yasuri/yasuri_node_generator.rb

@@ -15,26 +15,24 @@ module Yasuri
       @nodes
     end
 
-    def method_missing(name, *args, &block)
-      node = NodeGenerator.gen(name, *args, &block)
+    def method_missing(name, pattern, **args, &block)
+      node = NodeGenerator.gen(name, pattern, **args, &block)
       raise "Undefined Node Name '#{name}'" if node == nil
       @nodes << node
     end
 
-    def self.gen(name, *args, &block)
-      xpath, opt = *args
-      opt = [opt].flatten.compact
+    def self.gen(name, xpath, **opt, &block)
       children = Yasuri::NodeGenerator.new.gen_recursive(&block) if block_given?
 
       case name
       when /^text_(.+)$/
-        Yasuri::TextNode.new(xpath,   $1, children || [], *opt)
+        Yasuri::TextNode.new(xpath,   $1, children || [], **opt)
       when /^struct_(.+)$/
-        Yasuri::StructNode.new(xpath, $1, children || [], *opt)
+        Yasuri::StructNode.new(xpath, $1, children || [], **opt)
       when /^links_(.+)$/
-        Yasuri::LinksNode.new(xpath,  $1, children || [], *opt)
+        Yasuri::LinksNode.new(xpath,  $1, children || [], **opt)
       when /^pages_(.+)$/
-        Yasuri::PaginateNode.new(xpath, $1, children || [], *opt)
+        Yasuri::PaginateNode.new(xpath, $1, children || [], **opt)
       else
         nil
       end

data/lib/yasuri/yasuri_text_node.rb

@@ -7,9 +7,12 @@ module Yasuri
   class TextNode
     include Node
 
-    def initialize(xpath, name, children = [], truncate: nil, proc:nil)
+    def initialize(xpath, name, children = [], **opt)
       super(xpath, name, children)
 
+      truncate = opt[:truncate]
+      proc = opt[:proc]
+
       truncate = Regexp.new(truncate) if not truncate.nil? # regexp or nil
       @truncate = truncate
       @truncate = Regexp.new(@truncate.to_s) if not @truncate.nil?

data/spec/spec_helper.rb

@@ -12,11 +12,6 @@ shared_context 'httpserver' do
   }
 end
 
-
-# ENV['CODECLIMATE_REPO_TOKEN'] = "0dc78d33107a7f11f257c0218ac1a37e0073005bb9734f2fd61d0f7e803fc151"
-# require "codeclimate-test-reporter"
-# CodeClimate::TestReporter.start
-
 require 'simplecov'
 require 'coveralls'
 Coveralls.wear!

data/spec/yasuri_links_node_spec.rb

@@ -59,10 +59,18 @@ describe 'Yasuri' do
       ]
       expect(actual).to match expected
     end
-    it 'can be defined by DSL, return single LinkNode title' do
-      generated = Yasuri.links_title '/html/body/a'
-      original  = Yasuri::LinksNode.new('/html/body/a', "title")
-      compare_generated_vs_original(generated, original, @index_page)
+    it 'can be defined by DSL, return no contains if no child node' do
+      root_node = Yasuri.links_title '/html/body/a'
+      actual = root_node.inject(@agent, @index_page)
+      expected = [{}, {}, {}] # Empty if no child node under links node.
+      expect(actual).to match expected
+    end
+
+    it 'can be defined return no contains if no child node' do
+      root_node = Yasuri::LinksNode.new('/html/body/a', "title")
+      actual = root_node.inject(@agent, @index_page)
+      expected = [{}, {}, {}] # Empty if no child node under links node.
+      expect(actual).to match expected
     end
     it 'can be defined by DSL, return nested contents under link' do
       generated = Yasuri.links_title '/html/body/a' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yasuri
 version: !ruby/object:Gem::Version
-  version: 2.0.13
+  version: 3.0.0
 platform: ruby
 authors:
 - TAC
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-12-03 00:00:00.000000000 Z
+date: 2021-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -144,6 +144,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".coveralls.yml"
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
 - ".ruby-version"
@@ -190,7 +191,7 @@ homepage: https://github.com/tac0x2a/yasuri
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -205,9 +206,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Yasuri is easy scraping library.
 test_files: