relaton-iev 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5fe2ce99811a0a55a1f458810612cdddc6c496eea33e43a42bc582edaceccde7
-  data.tar.gz: a1a335641f829d1bc444061806a6982aaa10599aab57fac64223f7af0f328b3d
+  metadata.gz: e2cd82b551994504c5482121426073e8091bf352a511f131e70e77d75d06d74f
+  data.tar.gz: c11b0d0a748373256d9c559dc512f7fb0e5addacbea8cd8dc48df8a2e463f811
 SHA512:
-  metadata.gz: beb4a621afedd7459552fdcde28dddb87278fd95a9ad9dbc6390410fa7b434abd2823f9ba32f6e0fdbca6eaa3a7119ac77f225ffe7ba5af4ffbad7ad667dea5a
-  data.tar.gz: f06e7ec49dfb4b2e3bf61a0ae272f632bb7dbdcfdb275275c43b5657f0bb51d11c24cf7db7318b1c9752b00e2f0404956aac7e86ba2cf889f6f5fe96d36a416d
+  metadata.gz: 5ee22fcdc81379b42e6315975181f5ad5223db695ba2c91460ebd3d1157dc9ba338a8fca0884fecbdff586f9d87e8dffd397705ef6061d4681d8e544bd9023ee
+  data.tar.gz: 12a072393a803fa23c50875b643aa56c5342063d1dd2925661d5352fc0a093bf9c87ed63baec3c517c4a788bcb7465c68dbdb25cb7b23f15a1b5ab76682436a7

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.5".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

@@ -32,6 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "vcr"
   spec.add_development_dependency "webmock"
 
+  spec.add_dependency "htmlentities", "~> 4.3.4"
   spec.add_dependency "nokogiri", "~> 1.13.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.5
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-05-11 00:00:00.000000000 Z
+date: 2023-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry-byebug
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: htmlentities
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.3.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.3.4
 - !ruby/object:Gem::Dependency
   name: nokogiri
   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: []