relaton-iev 1.1.6 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0619c9879a41243d0c4f23f6b227065d3314052c4dc3c7c245ca04681d53f69
-  data.tar.gz: 9494af2352544f18308a3d8d7a16fa524b64f9a580d44f902f5d9735f471ce4e
+  metadata.gz: 1e9f323966cad4b2cdc8da16a892c108a1d307030b6a7583981870b1a1735c63
+  data.tar.gz: 29211d1e8918f150858de30974974aec4f5c377b9c272f3535da4e9eb77bf23c
 SHA512:
-  metadata.gz: 901939408553d30e4bca8fac9e719b2413f4edbcc0433dcc5701044d09dacb5e47f781b8147a91ee5b003bb702913eb15521f777722d9ebddd1436daba15e1ab
-  data.tar.gz: 83cd32add7eb3ded410f2d5e3caed88e18b04fe8a42f02b7e624fd508a46ec17ba3f9071932a9adc563e222148271a193f1caa8d772e739d71f6da47706dc25f
+  metadata.gz: c071c36db1d6d3440e0773ba7be15df669722942f7cc90f048386b4b7a401e5313e3c6416c0ddf1ab727e1aff2492c9f50999dedff72aea1275c2af0d39c87ec
+  data.tar.gz: a16118b4a890cccbd6806608416a570fb0ffd6811e1f10826d98710c56932d94b9f4064cdfe952b026bc9f0c414597a1eaa9cfdce3a9a06e72abaaf6ff6ebcd0

data/.github/workflows/rake.yml

@@ -10,4 +10,4 @@ on:
 
 jobs:
   rake:
-    uses: relaton/support/.github/workflows/rake.yml@master
+    uses: relaton/support/.github/workflows/rake.yml@main

data/.github/workflows/release.yml

@@ -7,15 +7,17 @@ on:
     inputs:
       next_version:
         description: |
-          Next release version. Possible values: x.y.z, major, minor, patch or pre|rc|etc
+          Next release version. Possible values: x.y.z, major, minor, patch (or pre|rc|etc).
+          Also, you can pass 'skip' to skip 'git tag' and do 'gem push' for the current version
         required: true
         default: 'skip'
-  push:
-    tags: [ v* ]
+  repository_dispatch:
+    types: [ do-release ]
+
 
 jobs:
   release:
-    uses: relaton/support/.github/workflows/release.yml@master
+    uses: relaton/support/.github/workflows/release.yml@main
     with:
       next_version: ${{ github.event.inputs.next_version }}
     secrets:

data/lib/relaton_iev/version.rb

@@ -1,3 +1,3 @@
 module RelatonIev
-  VERSION = "1.1.6".freeze
+  VERSION = "1.2.0".freeze
 end

data/lib/relaton_iev.rb

@@ -21,9 +21,8 @@ module RelatonIev
     def links_iev2iec60050part(xmldoc)
       parts = Set.new
       xmldoc.xpath(IEVPATH).each do |x|
-        m = x&.at(".//locality[@type = 'clause']/referenceFrom")&.text
+        m = x.at(".//locality[@type = 'clause']/referenceFrom")&.text
           &.sub(/^(\d+).*$/, "\\1") or next
-
         parts << m
         x["citeas"] = @c.decode(x["citeas"]).sub(/60050/, "60050-#{m}")
         x["bibitemid"] = "IEC60050-#{m}"
@@ -40,18 +39,31 @@ module RelatonIev
     # @param bibdb [Relaton::Db, NilClass]
     # @return [Nokogiri::XML::Element]
     def refs_iev2iec60050part(xml, parts, bibdb = nil)
+      bibdb or return ""
       new_iev = ""
       parts.sort.each do |p|
-        hit = bibdb&.fetch("IEC 60050-#{p}", nil, keep_year: true) or next
+        hit = get_iev_part(bibdb, p) or next
         new_iev += refs_iev2iec60050part1(xml, p, hit)
-        xml.xpath(IEVPATH.gsub(/60050/, "60050-#{p}")).each do |x|
-          x["citeas"] = @c.decode(x["citeas"])
-            .sub(/:2011$/, ":#{hit.date[0].on(:year)}")
-        end
+        update_iev_refs(xml, p, hit)
       end
       new_iev
     end
 
+    def get_iev_part(bibdb, part)
+      unless hit = bibdb.fetch("IEC 60050-#{part}", nil, keep_year: true)
+        @err << "The IEV document 60050-#{part} that has been cited " \
+                "does not exist"
+      end
+      hit
+    end
+
+    def update_iev_refs(xml, part, hit)
+      xml.xpath(IEVPATH.gsub(/60050/, "60050-#{part}")).each do |x|
+        x["citeas"] = @c.decode(x["citeas"])
+          .sub(/:2011$/, ":#{hit.date[0].on(:year)}")
+      end
+    end
+
     def refs_iev2iec60050part1(xmldoc, part, hit)
       date = hit.date[0].on(:year)
       return "" if already_contains_ref(xmldoc, part, date)
@@ -68,12 +80,14 @@ module RelatonIev
 
     # @param xmldoc [Nokogiri::XML::Document]
     # @param bibdb [Relaton::Db, NilClass]
-    # @return [Nokogiri::XML::Element]
+    # @return [Nokogiri::XML::Element], [String]
     def iev_cleanup(xmldoc, bibdb = nil)
       @c = HTMLEntities.new
-      iev = xmldoc.at("//bibitem[docidentifier = 'IEC 60050:2011']") || return
+      @err = []
+      iev = xmldoc.at("//bibitem[docidentifier = 'IEC 60050:2011']") or
+        return [nil, @err]
       parts = links_iev2iec60050part(xmldoc)
-      iev.replace(refs_iev2iec60050part(xmldoc, parts, bibdb))
+      [iev.replace(refs_iev2iec60050part(xmldoc, parts, bibdb)), @err]
     end
   end
 end

data/relaton_iev.gemspec

@@ -33,6 +33,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "webmock"
 
   spec.add_dependency "htmlentities", "~> 4.3.4"
-  spec.add_dependency "nokogiri", ">= 1.14.0"
-  spec.add_dependency "relaton", ">= 1.6"
+  spec.add_dependency "nokogiri", ">= 1.13.0"
+  spec.add_dependency "relaton", ">= 1.15"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-iev
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.2.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-04-10 00:00:00.000000000 Z
+date: 2024-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry-byebug
@@ -128,28 +128,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.14.0
+        version: 1.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.14.0
+        version: 1.13.0
 - !ruby/object:Gem::Dependency
   name: relaton
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.15'
 description: 'RelatonIev: manipulates IEV references to IEC 60050.'
 email:
 - open.source@ribose.com
@@ -191,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: 'RelatonIev: manipulates IEV references to IEC 60050.'