relaton-iso 1.13.1 → 1.13.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7957abd3baa9506418de82f57fd7bdb8e007bd3db0319a8a4c3ce60620afab2
-  data.tar.gz: a8757774fbcd0925f911e2e981972304bbdf19fb8f7da18827538edc2c2a1f31
+  metadata.gz: 36560c5f9f49d1ff9855a051c71b562bfddd82fc1c862cf08b35b1129ec69720
+  data.tar.gz: 4900a496e3b112b40dda6ab2acc4fe40db02084b01f42545de104a9c12dff922
 SHA512:
-  metadata.gz: fe1eb0dc20bb16c7209d0339719ea7ea105e3942e6435231318f5791ebc404dd6aaede200296fbcc4ef545b561a5f9b993a1dd84dc7c6ee9e7e75b0b994a0715
-  data.tar.gz: 04d922e293b122a75a5d07b0093c62e2a6fde2024c4ce92188d6dbae1a131aafcd7900f897e32309348f1cf7b9ed7be1eefe249f250836b266f1887c5bb26ecd
+  metadata.gz: 2bcea09926b89d5c6d3017376b75ee79916d9e5ace197592dc6d42cd77d715d4ad67896165c5a17a0b31e7d8ab45c9219f6713aea03f6c08d9dc622792bff074
+  data.tar.gz: 883976ba644b4ffae07292c4ad754fda13d195a3b34a6c03ffdc1382f44184bd0b0fd50ad270ae97ad69cf7d4d5c47e4f3d18098ed5bb6fcaa292deeb5c00e17

data/.github/workflows/release.yml

@@ -0,0 +1,22 @@
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
+name: release
+
+on:
+  workflow_dispatch:
+    inputs:
+      next_version:
+        description: |
+          Next release version. Possible values: x.y.z, major, minor, patch or pre|rc|etc
+        required: true
+        default: 'skip'
+  push:
+    tags: [ v* ]
+
+jobs:
+  release:
+    uses: relaton/support/.github/workflows/release.yml@master
+    with:
+      next_version: ${{ github.event.inputs.next_version }}
+    secrets:
+      rubygems-api-key: ${{ secrets.RELATON_CI_RUBYGEMS_API_KEY }}

data/lib/relaton_iso/iso_bibliography.rb

@@ -92,13 +92,13 @@ module RelatonIso
 
         # filter by year
         hits = hit_collection.select do |hit|
-          if hit.pubid.year == year
+          if hit.pubid.year.to_s == year.to_s
             true
           elsif hit.pubid.year.nil? && hit.hit[:year].to_s == year
             hit.pubid.year = year
             true
           else
-            missed_year = hit.pubid.year || hit.hit[:year].to_s
+            missed_year = (hit.pubid.year || hit.hit[:year]).to_s
             if missed_year && !missed_year.empty? && !missed_years.include?(missed_year)
               missed_years << missed_year
             end

data/lib/relaton_iso/scrapper.rb

@@ -60,8 +60,8 @@ module RelatonIso
         doc, url = get_page "#{hit.hit[:path].sub '/sites/isoorg', ''}.html"
 
         # Fetch edition.
-        edition = doc&.xpath("//strong[contains(text(), 'Edition')]/..")
-          &.children&.last&.text&.match(/\d+/)&.to_s
+        edition = doc.at("//div[div[.='Edition']]/text()[last()]")
+          &.text&.match(/\d+$/)&.to_s
         hit.pubid.edition = edition if edition
 
         titles, abstract, langs = fetch_titles_abstract(doc, lang)
@@ -239,21 +239,20 @@ module RelatonIso
       # @param doc [Nokogiri::HTML::Document]
       # @return [Hash]
       def fetch_workgroup(doc) # rubocop:disable Metrics/MethodLength,Metrics/AbcSize,Metrics/CyclomaticComplexity
-        wg_link = doc.css("div.entry-name.entry-block a")[0]
-        # wg_url = DOMAIN + wg_link['href']
+        wg = doc.at("//div[@class='clearfix']")
+        wg_link = wg.at "span/a"
         workgroup = wg_link.text.split "/"
         type = workgroup[1]&.match(/^[A-Z]+/)&.to_s || "TC"
         {
           name: "International Organization for Standardization",
           abbreviation: "ISO",
           url: "www.iso.org",
-          technical_committee: [{
-            name: doc.css("div.entry-title")[0].text,
-            identifier: wg_link.text,
-            type: type,
-            number: workgroup[1]&.match(/\d+/)&.to_s&.to_i,
-          }],
         }
+        tc_numb = workgroup[1]&.match(/\d+/)&.to_s&.to_i
+        tc_name = wg.at("span[@class='entry-title']").text
+        tc = RelatonBib::WorkGroup.new(name: tc_name, identifier: wg_link.text,
+                                       type: type, number: tc_numb)
+        RelatonIsoBib::EditorialGroup.new(technical_committee: [tc])
       end
 
       # rubocop:disable Metrics/MethodLength
@@ -266,7 +265,7 @@ module RelatonIso
         doc.xpath("//ul[@class='steps']/li", "//div[@class='sub-step']").reduce([]) do |a, r|
           r_type = r.at("h4", "h5").text
           date = []
-          type = case r_type
+          type = case r_type.strip
                  when "Previously", "Will be replaced by" then "obsoletes"
                  when "Corrigenda / Amendments", "Revised by", "Now confirmed"
                    on = doc.xpath('//span[@class="stage-date"][contains(., "-")]').last
@@ -374,8 +373,7 @@ module RelatonIso
       # @param doc [Nokogiri::HTML::Document]
       # @return [Array<Hash>]
       def fetch_ics(doc)
-        doc.xpath("//strong[contains(text(), "\
-                  "'ICS')]/../following-sibling::dd/div/a").map do |i|
+        doc.xpath("//dl[dt/strong[.='ICS']]/dd/span/a").map do |i|
           code = i.text.match(/[\d.]+/).to_s.split "."
           { field: code[0], group: code[1], subgroup: code[2] }
         end

data/lib/relaton_iso/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RelatonIso
-  VERSION = "1.13.1"
+  VERSION = "1.13.3"
 end

data/relaton_iso.gemspec

@@ -39,6 +39,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "webmock"
 
   spec.add_dependency "algolia"
-  spec.add_dependency "pubid-iso", "~> 0.1.8"
+  spec.add_dependency "pubid-iso", "0.1.10"
   spec.add_dependency "relaton-iso-bib", "~> 1.13.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-iso
 version: !ruby/object:Gem::Version
-  version: 1.13.1
+  version: 1.13.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-24 00:00:00.000000000 Z
+date: 2022-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -182,16 +182,16 @@ dependencies:
   name: pubid-iso
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.8
+        version: 0.1.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.8
+        version: 0.1.10
 - !ruby/object:Gem::Dependency
   name: relaton-iso-bib
   requirement: !ruby/object:Gem::Requirement
@@ -215,6 +215,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/workflows/rake.yml"
+- ".github/workflows/release.yml"
 - ".gitignore"
 - ".hound.yml"
 - ".rspec"