relaton-w3c 1.8.0 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3670a87ed6de24ca454f4bc657db1251977eaff97bea51b497f40e9b80a587ac
-  data.tar.gz: e150c6539b7da99f67ba37d1f51eb7130f8de7d9e0bcc7dc3ca62494bbb8d458
+  metadata.gz: 58a4044db1d46717f23268b36efff858fbfdccd7e8c3f2b47d98246831512d42
+  data.tar.gz: bf87dbf1f5da70e68dc771f115363c531188b103a23bbf05872c68a8c47131a4
 SHA512:
-  metadata.gz: 38f4ee438f65bbe08d497baacfd30e46bf8582488eef93fc454cd60dd3b3cae87b5d0d1c71e5fd5ac8f480e9d2f237b05274f23a7597d1dea03bcc521c70b55b
-  data.tar.gz: 4df511801c85d5c9da2074a85336ab7b9faaf1c3cd9600733370a11853154e035394af3d0b4a5f0faebb4255ad431c115ea6d432e8bdf16e2e8c4fd0ae6a9520
+  metadata.gz: 6b2fae6c6cf119defdf15284f68eac82ccf50766a162889a2f09ca4c3f9e7ffa1705b9f71a2b4b0da20939948f59e424f5a18489bb5ec19d18cfdf742f150aa7
+  data.tar.gz: c3ecafb387e50c47a93eeb3fde746420ee801667afe24a2277d0b4812d42a922a67e5374c919d1dff091bd0f02669f156609b0dcb383390f44d9fe6d245023d1

data/.github/workflows/rake.yml

@@ -16,19 +16,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '2.7', '2.6', '2.5', '2.4' ]
+        ruby: [ '3.0', '2.7', '2.6', '2.5' ]
         os: [ ubuntu-latest, windows-latest, macos-latest ]
         experimental: [ false ]
-        include:
-          - ruby: '3.0'
-            os: 'ubuntu-latest'
-            experimental: true
-          - ruby: '3.0'
-            os: 'windows-latest'
-            experimental: true
-          - ruby: '3.0'
-            os: 'macos-latest'
-            experimental: true
     steps:
       - uses: actions/checkout@v2
         with:

data/.rubocop.yml

@@ -5,6 +5,6 @@
 inherit_from:
   - https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
 AllCops:
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.5
 Rails:
   Enabled: false

data/grammars/biblio.rng

@@ -787,6 +787,7 @@
       <value>adapted</value>
       <value>vote-started</value>
       <value>vote-ended</value>
+      <value>announced</value>
     </choice>
   </define>
   <define name="bdate">

data/lib/relaton_w3c/hash_converter.rb

@@ -4,7 +4,7 @@ module RelatonW3c
       # @param item_hash [Hash]
       # @return [RelatonW3c::W3cBibliographicItem]
       def bib_item(item_hash)
-        W3cBibliographicItem.new **item_hash
+        W3cBibliographicItem.new(**item_hash)
       end
     end
   end

data/lib/relaton_w3c/hit_collection.rb

@@ -22,8 +22,8 @@ module RelatonW3c
     # @param ref [String] reference to search
     def initialize(ref)
       %r{
-        ^(W3C\s)?
-        (?<type>(CR|NOTE|PER|PR|REC|RET|WD|Candidate\sRecommendation|
+        ^(?:W3C\s)?
+        (?<type>(?:CR|NOTE|PER|PR|REC|RET|WD|Candidate\sRecommendation|
           Group\sNote|Proposed\sEdited\sRecommendation|Proposed\sRecommendation|
           Recommendation|Retired|Working\sDraft))? # type
         \s?
@@ -41,7 +41,7 @@ module RelatonW3c
     # @param title_date [String]
     # @param type [String]
     # @return [Array<Hash>]
-    def from_yaml(title_date, type)
+    def from_yaml(title_date, type) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity
       /(?<title>.+)\s(?<date>\d{4}-\d{2}-\d{2})$/ =~ title_date
       title ||= title_date
       result = data.select do |hit|
@@ -50,7 +50,7 @@ module RelatonW3c
           type_date_filter(hit, type, date)
       end
       if result.empty?
-        result = data.select { |h| h["link"].split("/").last.match? /#{title}/ }
+        result = data.select { |h| h["link"].split("/").last.match?(/#{title}/) }
       end
       result.map { |h| Hit.new(h, self) }
     end
@@ -109,7 +109,7 @@ module RelatonW3c
     # @param type [String]
     # @return [String]
     def short_type(type)
-      tp = TYPES.select { |k,v| v == type }.keys
+      tp = TYPES.select { |_, v| v == type }.keys
       tp.first || type
     end
 
@@ -137,7 +137,7 @@ module RelatonW3c
     # fetch data form server and save it to file.
     #
     def fetch_data
-      resp = Net::HTTP.get_response URI.parse(DOMAIN + "/TR/")
+      resp = Net::HTTP.get_response URI.parse("#{DOMAIN}/TR/")
       # return if there aren't any changes since last fetching
       return unless resp.code == "200"
 
@@ -153,7 +153,7 @@ module RelatonW3c
     # @param h_el [Nokogiri::XML::Element]
     # @param link [Nokogiri::XML::Element]
     # @param pubdetails [Nokogiri::XML::Element]
-    def fetch_hit(h_el, link, pubdetails)
+    def fetch_hit(h_el, link, pubdetails) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
       datepub = pubdetails.at("text()").text.match(/\d{4}-\d{2}-\d{2}/).to_s
       editor = h_el.xpath("ul[@class='editorlist']/li").map { |e| e.text.strip }
       keyword = h_el.xpath("ul[@class='taglist']/li").map { |e| e.text.strip }

data/lib/relaton_w3c/processor.rb

@@ -29,7 +29,7 @@ module RelatonW3c
     # @return [RelatonIsoBib::CcBibliographicItem]
     def hash_to_bib(hash)
       item_hash = ::RelatonW3c::HashConverter.hash_to_bib(hash)
-      ::RelatonW3c::W3cBibliographicItem.new **item_hash
+      ::RelatonW3c::W3cBibliographicItem.new(**item_hash)
     end
 
     # Returns hash of XML grammar

data/lib/relaton_w3c/scrapper.rb

@@ -29,7 +29,7 @@ module RelatonW3c
           doctype: fetch_doctype(hit, doc),
           contributor: fetch_contributor(hit, doc),
           relation: fetch_relation(doc),
-          keyword: hit["keyword"]
+          keyword: hit["keyword"],
         )
       end
 
@@ -53,7 +53,7 @@ module RelatonW3c
             titles << { content: title.gsub(/\n/, " "), type: "main" }
           end
           subtitle = doc.at(
-            "//h2[@id='subtitle']|//p[contains(@class, 'subline')]"
+            "//h2[@id='subtitle']|//p[contains(@class, 'subline')]",
           )&.text
           titles << { content: subtitle, tipe: "subtitle" } if subtitle
         end
@@ -62,7 +62,7 @@ module RelatonW3c
         end
         titles.map do |t|
           title = RelatonBib::FormattedString.new(
-            content: t[:content], language: "en", script: "Latn"
+            content: t[:content], language: "en", script: "Latn",
           )
           RelatonBib::TypedTitleString.new(type: t[:type], title: title)
         end
@@ -88,7 +88,7 @@ module RelatonW3c
       # @param hit [Hash]
       # @param doc [Nokogiri::HTML::Document, NilClass]
       # @return [Array<RelatonBib::BibliographicDate>]
-      def fetch_date(hit, doc)
+      def fetch_date(hit, doc) # rubocop:disable Metrics/CyclomaticComplexity
         on = hit["datepub"] || doc&.at("//h2/time[@datetime]")&.attr(:datetime)
         on ||= fetch_date1(doc) || fetch_date2(doc)
         [RelatonBib::BibliographicDate.new(type: "published", on: on)] if on
@@ -143,7 +143,7 @@ module RelatonW3c
             end
             mem
           end
-          contribs.map { |c| contrib_info **c }
+          contribs.map { |c| contrib_info(**c) }
         else
           hit["editor"].map do |ed|
             contrib_info name: ed, role: [{ type: "editor" }]
@@ -162,7 +162,7 @@ module RelatonW3c
       # @param element [Nokogiri::XML::Element]
       # @param type [String]
       # @return [Hash]
-      def parse_contrib(element, type)
+      def parse_contrib(element, type) # rubocop:disable Metrics/MethodLength
         p = element.at("a")
         return unless p
 
@@ -187,7 +187,7 @@ module RelatonW3c
         name = RelatonBib::FullName.new completename: completename
         af = []
         if args[:org]
-          org = RelatonBib::Organization.new **args[:org]
+          org = RelatonBib::Organization.new(**args[:org])
           af << RelatonBib::Affiliation.new(organization: org)
         end
         en = RelatonBib::Person.new name: name, url: args[:url], affiliation: af

data/lib/relaton_w3c/version.rb

@@ -1,3 +1,3 @@
 module RelatonW3c
-  VERSION = "1.8.0".freeze
+  VERSION = "1.9.0".freeze
 end

data/lib/relaton_w3c/w3c_bibliographic_item.rb

@@ -10,7 +10,7 @@ module RelatonW3c
       if args[:doctype] && !TYPES.include?(args[:doctype])
         warn "[relaton-w3c] invalid document type: #{args[:doctype]}"
       end
-      super **args
+      super
     end
   end
 end

data/lib/relaton_w3c/xml_parser.rb

@@ -18,7 +18,7 @@ module RelatonW3c
       # @param item_hash [Hash]
       # @return [RelatonBib::BibliographicItem]
       def bib_item(item_hash)
-        W3cBibliographicItem.new **item_hash
+        W3cBibliographicItem.new(**item_hash)
       end
     end
   end

data/relaton_w3c.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
                        "using the IsoBibliographicItem model"
   spec.homepage      = "https://github.com/relaton/relaton-wc3"
   spec.license       = "BSD-2-Clause"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
   # spec.metadata["allowed_push_host"] = "TODO: Set to 'http://mygemserver.com'"
 
@@ -31,13 +31,11 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  # spec.add_development_dependency "debase"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
-  # spec.add_development_dependency "ruby-debug-ide"
   spec.add_development_dependency "ruby-jing"
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "vcr"
   spec.add_development_dependency "webmock"
 
-  spec.add_dependency "relaton-bib", ">= 1.8.0"
+  spec.add_dependency "relaton-bib", ">= 1.9.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-w3c
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.9.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-05-17 00:00:00.000000000 Z
+date: 2021-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.9.0
 description: 'RelatonIso: retrieve W3C Standards for bibliographic using the IsoBibliographicItem
   model'
 email:
@@ -140,7 +140,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="