relaton-iev 1.1.4 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5fe2ce99811a0a55a1f458810612cdddc6c496eea33e43a42bc582edaceccde7
-  data.tar.gz: a1a335641f829d1bc444061806a6982aaa10599aab57fac64223f7af0f328b3d
+  metadata.gz: e0619c9879a41243d0c4f23f6b227065d3314052c4dc3c7c245ca04681d53f69
+  data.tar.gz: 9494af2352544f18308a3d8d7a16fa524b64f9a580d44f902f5d9735f471ce4e
 SHA512:
-  metadata.gz: beb4a621afedd7459552fdcde28dddb87278fd95a9ad9dbc6390410fa7b434abd2823f9ba32f6e0fdbca6eaa3a7119ac77f225ffe7ba5af4ffbad7ad667dea5a
-  data.tar.gz: f06e7ec49dfb4b2e3bf61a0ae272f632bb7dbdcfdb275275c43b5657f0bb51d11c24cf7db7318b1c9752b00e2f0404956aac7e86ba2cf889f6f5fe96d36a416d
+  metadata.gz: 901939408553d30e4bca8fac9e719b2413f4edbcc0433dcc5701044d09dacb5e47f781b8147a91ee5b003bb702913eb15521f777722d9ebddd1436daba15e1ab
+  data.tar.gz: 83cd32add7eb3ded410f2d5e3caed88e18b04fe8a42f02b7e624fd508a46ec17ba3f9071932a9adc563e222148271a193f1caa8d772e739d71f6da47706dc25f

data/.github/workflows/rake.yml

@@ -10,27 +10,4 @@ on:
 
 jobs:
   rake:
-    name: Test on Ruby ${{ matrix.ruby }} ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    continue-on-error: ${{ matrix.experimental }}
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [ '2.7', '2.6', '2.5', '3.0' ]
-        os: [ ubuntu-latest, windows-latest, macos-latest ]
-        experimental: [ false ]
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          submodules: true
-
-      # https://github.com/ruby-debug/debase/issues/89#issuecomment-686827382
-      - if: matrix.os == 'macos-latest' && matrix.ruby == '2.5'
-        run: echo BUNDLE_BUILD__DEBASE="--with-cflags=\"-Wno-error=implicit-function-declaration\"" >> $GITHUB_ENV
-
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          bundler-cache: true
-
-      - run: bundle exec rake
+    uses: relaton/support/.github/workflows/rake.yml@master

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/Gemfile

@@ -2,3 +2,4 @@ source "https://rubygems.org"
 
 # Specify your gem's dependencies in relaton_iev.gemspec
 gemspec
+gem "debug"

data/lib/relaton_iev/version.rb

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

data/lib/relaton_iev.rb

@@ -1,10 +1,15 @@
 require "relaton"
 require "relaton_iev/version"
+require "htmlentities"
 
 module RelatonIev
   class Error < StandardError; end
 
   class << self
+    IEVPATH = <<~IEV.strip.freeze
+      //*[@citeas = 'IEC 60050:2011' or @citeas = 'IEC 60050:2011' or @citeas = 'IEC&#xa0;60050:2011' or @citeas = 'IEC&#xA0;60050:2011']
+    IEV
+
     # converts generic IEV citation to citation of IEC 60050-n
     # assumes IEV citations are of form
     # <eref type="inline" bibitemid="a" citeas="IEC 60050">
@@ -15,12 +20,12 @@ module RelatonIev
     # @return [Set<String>]
     def links_iev2iec60050part(xmldoc)
       parts = Set.new
-      xmldoc.xpath("//*[@citeas = 'IEC 60050:2011']").each do |x|
+      xmldoc.xpath(IEVPATH).each do |x|
         m = x&.at(".//locality[@type = 'clause']/referenceFrom")&.text
           &.sub(/^(\d+).*$/, "\\1") or next
 
         parts << m
-        x["citeas"] = x["citeas"].sub(/60050/, "60050-#{m}")
+        x["citeas"] = @c.decode(x["citeas"]).sub(/60050/, "60050-#{m}")
         x["bibitemid"] = "IEC60050-#{m}"
       end
       parts
@@ -29,18 +34,19 @@ module RelatonIev
     # replace generic IEV reference with references to all extracted
     # IEV parts
     #
-    # @param xmodoc [Nokogiri::XML::Document]
+    # @param xml [Nokogiri::XML::Document]
     # @param parts [Set<String>]
     # @param iev [Nokogiri::XML::Element]
     # @param bibdb [Relaton::Db, NilClass]
     # @return [Nokogiri::XML::Element]
-    def refs_iev2iec60050part(xmldoc, parts, bibdb = nil)
+    def refs_iev2iec60050part(xml, parts, bibdb = nil)
       new_iev = ""
       parts.sort.each do |p|
         hit = bibdb&.fetch("IEC 60050-#{p}", nil, keep_year: true) or next
-        new_iev += refs_iev2iec60050part1(xmldoc, p, hit)
-        xmldoc.xpath("//*[@citeas = 'IEC 60050-#{p}:2011']").each do |x|
-          x["citeas"] = x["citeas"].sub(/:2011$/, ":#{hit.date[0].on(:year)}")
+        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
       end
       new_iev
@@ -55,8 +61,8 @@ module RelatonIev
     end
 
     def already_contains_ref(xmldoc, part, date)
-      xmldoc.at("//bibliography//bibitem[not(ancestor::bibitem)]/"\
-                "docidentifier[@type = 'IEC']"\
+      xmldoc.at("//bibliography//bibitem[not(ancestor::bibitem)]/" \
+                "docidentifier[@type = 'IEC']" \
                 "[text() = 'IEC 60050-#{part}:#{date}']")
     end
 
@@ -64,6 +70,7 @@ module RelatonIev
     # @param bibdb [Relaton::Db, NilClass]
     # @return [Nokogiri::XML::Element]
     def iev_cleanup(xmldoc, bibdb = nil)
+      @c = HTMLEntities.new
       iev = xmldoc.at("//bibitem[docidentifier = 'IEC 60050:2011']") || return
       parts = links_iev2iec60050part(xmldoc)
       iev.replace(refs_iev2iec60050part(xmldoc, parts, bibdb))

data/relaton_iev.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
 
   # spec.add_development_dependency "debase"
   spec.add_development_dependency "pry-byebug"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   # spec.add_development_dependency "ruby-debug-ide"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
@@ -32,6 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "vcr"
   spec.add_development_dependency "webmock"
 
-  spec.add_dependency "nokogiri", "~> 1.13.0"
+  spec.add_dependency "htmlentities", "~> 4.3.4"
+  spec.add_dependency "nokogiri", ">= 1.14.0"
   spec.add_dependency "relaton", ">= 1.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-iev
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.6
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-05-11 00:00:00.000000000 Z
+date: 2023-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry-byebug
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -109,19 +109,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: htmlentities
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.13.0
+        version: 4.3.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.13.0
+        version: 4.3.4
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.14.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.14.0
 - !ruby/object:Gem::Dependency
   name: relaton
   requirement: !ruby/object:Gem::Requirement
@@ -144,6 +158,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/workflows/rake.yml"
+- ".github/workflows/release.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -161,7 +176,7 @@ homepage: https://github.com/metanorma/relaton-iev
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -176,8 +191,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.9
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: 'RelatonIev: manipulates IEV references to IEC 60050.'
 test_files: []