relaton-iev 1.1.0 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0de88901d509f5420300ab1e23c96b5f573d444e516aae83c26d4495f12e5986
-  data.tar.gz: 82bd64527c49ca8a93e62542b3135db2f6f0abe17527517ffe1e7b0cebfcb173
+  metadata.gz: 5fe2ce99811a0a55a1f458810612cdddc6c496eea33e43a42bc582edaceccde7
+  data.tar.gz: a1a335641f829d1bc444061806a6982aaa10599aab57fac64223f7af0f328b3d
 SHA512:
-  metadata.gz: b962c9dcd052b7131a494ecc29b2943401e52057193ec07c5d6aee2a99570725265b17afc75654a4c390ac6db94de7b4e140ac64b586bd79b4bd85e3479c647c
-  data.tar.gz: 42808e1692e8cc54928d932988a9b85dad3ac10eab458016453b8d50bf0fee33d69813d86e3a9eb9f2adc7eda6b9cdb2917e446488d122c90996c3cdbd3b6f46
+  metadata.gz: beb4a621afedd7459552fdcde28dddb87278fd95a9ad9dbc6390410fa7b434abd2823f9ba32f6e0fdbca6eaa3a7119ac77f225ffe7ba5af4ffbad7ad667dea5a
+  data.tar.gz: f06e7ec49dfb4b2e3bf61a0ae272f632bb7dbdcfdb275275c43b5657f0bb51d11c24cf7db7318b1c9752b00e2f0404956aac7e86ba2cf889f6f5fe96d36a416d

data/.github/workflows/rake.yml

@@ -0,0 +1,36 @@
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
+name: rake
+
+on:
+  push:
+    branches: [ master, main ]
+    tags: [ v* ]
+  pull_request:
+
+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

data/.gitignore

@@ -11,3 +11,4 @@
 # rspec failure tracking
 .rspec_status
 .rubocop-https---raw-githubusercontent-com-riboseinc-oss-guides-master-ci-rubocop-yml
+Gemfile.lock

data/.rubocop.yml

@@ -1,10 +1,12 @@
 # This project follows the Ribose OSS style guide.
 # https://github.com/riboseinc/oss-guides
 # All project-specific additions and overrides should be specified in this file.
-
 inherit_from:
   - https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
+
+# local repo-specific modifications
+
 AllCops:
-  TargetRubyVersion: 2.3
-Rails:
-  Enabled: true
+  DisplayCopNames: false
+  StyleGuideCopsOnly: false
+  TargetRubyVersion: 2.5

data/README.adoc

@@ -1,9 +1,7 @@
 = RelatonIev Refactor IEV reference
 
 image:https://img.shields.io/gem/v/relaton-iev.svg["Gem Version", link="https://rubygems.org/gems/relaton-iev"]
-image:https://github.com/relaton/relaton-iev/workflows/macos/badge.svg["Build Status (macOS)", link="https://github.com/relaton/relaton-iev/actions?workflow=macos"]
-image:https://github.com/relaton/relaton-iev/workflows/windows/badge.svg["Build Status (Windows)", link="https://github.com/relaton/relaton-iev/actions?workflow=windows"]
-image:https://github.com/relaton/relaton-iev/workflows/ubuntu/badge.svg["Build Status (Ubuntu)", link="https://github.com/relaton/relaton-iev/actions?workflow=ubuntu"]
+image:https://github.com/relaton/relaton-iev/workflows/rake/badge.svg["Build Status", link="https://github.com/relaton/relaton-iev/actions?workflow=rake"]
 image:https://codeclimate.com/github/relaton/relaton-iev/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/relaton/relaton-iev"]
 image:https://img.shields.io/github/issues-pr-raw/relaton/relaton-iev.svg["Pull Requests", link="https://github.com/relaton/relaton-iev/pulls"]
 image:https://img.shields.io/github/commits-since/relaton/relaton-iev/latest.svg["Commits since latest",link="https://github.com/relaton/relaton-iev/releases"]

data/Rakefile

@@ -3,4 +3,4 @@ require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/bin/rspec

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-  
+
 # This file was generated by Bundler.
 #
 # The application 'rspec' is installed as part of a gem, and
@@ -15,4 +15,3 @@ require "rubygems"
 require "bundler/setup"
 
 load Gem.bin_path("rspec-core", "rspec")
-

data/lib/relaton_iev/version.rb

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

data/lib/relaton_iev.rb

@@ -5,67 +5,68 @@ module RelatonIev
   class Error < StandardError; end
 
   class << self
-      # converts generic IEV citation to citation of IEC 60050-n
-      # assumes IEV citations are of form
-      # <eref type="inline" bibitemid="a" citeas="IEC 60050">
-      # <locality type="clause"><referenceFrom>101-01-01</referenceFrom></locality></eref>
-      #
-      # @param xmldoc [Nokogiri::XML::Documet]
-      # @return [Set<String>]
-      def linksIev2iec60050part(xmldoc)
-        parts = Set.new
-        xmldoc.xpath("//eref[@citeas = 'IEC 60050:2011'] | "\
-                     "//origin[@citeas = 'IEC 60050:2011']").each do |x|
-          cl = x&.at(".//locality[@type = 'clause']/referenceFrom")&.text || next
-          m = /^(\d+)/.match cl || next
-          parts << m[0]
-          x["citeas"] = x["citeas"].sub(/60050/, "60050-#{m[0]}")
-          x["bibitemid"] = "IEC60050-#{m[0]}"
-        end
-        parts
+    # converts generic IEV citation to citation of IEC 60050-n
+    # assumes IEV citations are of form
+    # <eref type="inline" bibitemid="a" citeas="IEC 60050">
+    # <locality type="clause"><referenceFrom>101-01-01</referenceFrom>
+    # </locality></eref>
+    #
+    # @param xmldoc [Nokogiri::XML::Documet]
+    # @return [Set<String>]
+    def links_iev2iec60050part(xmldoc)
+      parts = Set.new
+      xmldoc.xpath("//*[@citeas = 'IEC 60050:2011']").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["bibitemid"] = "IEC60050-#{m}"
       end
+      parts
+    end
 
-      # replace generic IEV reference with references to all extracted
-      # IEV parts
-      #
-      # @param xmodoc [Nokogiri::XML::Document]
-      # @param parts [Set<String>]
-      # @param iev [Nokogiri::XML::Element]
-      # @param bibdb [Relaton::Db, NilClass]
-      # @return [Nokogiri::XML::Element]
-      def refsIev2iec60050part(xmldoc, parts, iev, bibdb = nil)
-        new_iev = ""
-        parts.sort.each do |p|
-          hit = bibdb&.fetch("IEC 60050-#{p}", nil, keep_year: true) || next
-          date = hit.date[0].on(:year)
-          new_iev += refsIev2iec60050part1(xmldoc, p, hit)
-          xmldoc.xpath("//*[@citeas = 'IEC 60050-#{p}:2011']").each do |x|
-            x["citeas"] = x["citeas"].sub(/:2011$/, ":#{date}")
-          end
+    # replace generic IEV reference with references to all extracted
+    # IEV parts
+    #
+    # @param xmodoc [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)
+      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)}")
         end
-        iev.replace(new_iev)
       end
+      new_iev
+    end
 
-      def refsIev2iec60050part1(xmldoc, p, hit)
-        date = hit.date[0].on(:year)
-        return "" if already_contains_ref(xmldoc, p, date)
-        id = xmldoc.at("//bibitem[@id = 'IEC60050-#{p}']") ? "-1" : ""
-        hit.to_xml.sub(/ id="[^"]+"/, %{ id="IEC60050-#{p}#{id}"})
-      end
+    def refs_iev2iec60050part1(xmldoc, part, hit)
+      date = hit.date[0].on(:year)
+      return "" if already_contains_ref(xmldoc, part, date)
 
-      def already_contains_ref(xmldoc, p, date)
-        xmldoc.at("//bibliography//bibitem[not(ancestor::bibitem)]/"\
-                  "docidentifier[@type = 'IEC']"\
-                  "[text() = 'IEC 60050-#{p}:#{date}']")
-      end
+      id = xmldoc.at("//bibitem[@id = 'IEC60050-#{part}']") ? "-1" : ""
+      hit.to_xml.sub(/ id="[^"]+"/, %{ id="IEC60050-#{part}#{id}"})
+    end
 
-      # @param xmldoc [Nokogiri::XML::Document]
-      # @param bibdb [Relaton::Db, NilClass]
-      # @return [Nokogiri::XML::Element]
-      def iev_cleanup(xmldoc, bibdb = nil)
-        iev = xmldoc.at("//bibitem[docidentifier = 'IEC 60050:2011']") || return
-        parts = linksIev2iec60050part(xmldoc)
-        refsIev2iec60050part(xmldoc, parts, iev, bibdb)
-      end
+    def already_contains_ref(xmldoc, part, date)
+      xmldoc.at("//bibliography//bibitem[not(ancestor::bibitem)]/"\
+                "docidentifier[@type = 'IEC']"\
+                "[text() = 'IEC 60050-#{part}:#{date}']")
+    end
+
+    # @param xmldoc [Nokogiri::XML::Document]
+    # @param bibdb [Relaton::Db, NilClass]
+    # @return [Nokogiri::XML::Element]
+    def iev_cleanup(xmldoc, bibdb = nil)
+      iev = xmldoc.at("//bibitem[docidentifier = 'IEC 60050:2011']") || return
+      parts = links_iev2iec60050part(xmldoc)
+      iev.replace(refs_iev2iec60050part(xmldoc, parts, bibdb))
+    end
   end
 end

data/relaton_iev.gemspec

@@ -14,22 +14,24 @@ Gem::Specification.new do |spec|
   spec.license       = "MIT"
 
   spec.files         = Dir.chdir(File.expand_path(__dir__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+    `git ls-files -z`.split("\x0")
+      .reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
-  spec.add_development_dependency "debase"
+  # spec.add_development_dependency "debase"
   spec.add_development_dependency "pry-byebug"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "ruby-debug-ide"
+  # spec.add_development_dependency "ruby-debug-ide"
+  spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "vcr"
   spec.add_development_dependency "webmock"
-  spec.add_development_dependency "equivalent-xml", "~> 0.6"
 
+  spec.add_dependency "nokogiri", "~> 1.13.0"
   spec.add_dependency "relaton", ">= 1.6"
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: relaton-iev
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-14 00:00:00.000000000 Z
+date: 2022-05-11 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: debase
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -67,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: ruby-debug-ide
+  name: equivalent-xml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -123,19 +109,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: equivalent-xml
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
-  type: :development
+        version: 1.13.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: 1.13.0
 - !ruby/object:Gem::Dependency
   name: relaton
   requirement: !ruby/object:Gem::Requirement
@@ -157,9 +143,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/macos.yml"
-- ".github/workflows/ubuntu.yml"
-- ".github/workflows/windows.yml"
+- ".github/workflows/rake.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -185,14 +169,14 @@ 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:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.3.9
 signing_key:
 specification_version: 4
 summary: 'RelatonIev: manipulates IEV references to IEC 60050.'

data/.github/workflows/macos.yml

@@ -1,31 +0,0 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
-name: macos
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-
-jobs:
-  test-macos:
-    name: Test on Ruby ${{ matrix.ruby }} macOS
-    runs-on: macos-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [ '2.6', '2.5', '2.4' ]
-    steps:
-      - uses: actions/checkout@master
-      - name: Use Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          architecture: 'x64'
-      - name: Update gems
-        run: |
-          sudo gem install bundler --force
-          bundle install --jobs 4 --retry 3
-      - name: Run specs
-        run: |
-          bundle exec rake

data/.github/workflows/ubuntu.yml

@@ -1,43 +0,0 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
-name: ubuntu
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-
-jobs:
-  test-linux:
-    name: Test on Ruby ${{ matrix.ruby }} Ubuntu
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [ '2.6', '2.5', '2.4' ]
-    steps:
-      - uses: actions/checkout@master
-      - name: Use Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          architecture: 'x64'
-      - name: Update gems
-        run: |
-          gem install bundler
-          bundle install --jobs 4 --retry 3
-      - name: Run specs
-        run: |
-          bundle exec rake
-      - name: Trigger dependent repositories
-        if: github.ref == 'refs/heads/master' && matrix.ruby == '2.6'
-        env:
-          GH_USERNAME: ${{ secrets.PAT_USERNAME }}
-          GH_ACCESS_TOKEN: ${{ secrets.PAT_TOKEN }}
-        run: |
-          curl -LO --retry 3 https://raw.githubusercontent.com/metanorma/metanorma-build-scripts/master/trigger-gh-actions.sh
-          [[ -f ".github/workflows/dependent_repos.env" ]] && source .github/workflows/dependent_repos.env
-          for repo in $DEPENDENT_REPOS
-          do
-            sh trigger-gh-actions.sh $ORGANISATION $repo $GH_USERNAME $GH_ACCESS_TOKEN $GITHUB_REPOSITORY "{ \"ref\": \"${GITHUB_REF}\" }"
-          done

data/.github/workflows/windows.yml

@@ -1,33 +0,0 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
-name: windows
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-
-jobs:
-  test-windows:
-    name: Test on Ruby ${{ matrix.ruby }} Windows
-    runs-on: windows-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [ '2.6', '2.5', '2.4' ]
-    steps:
-      - uses: actions/checkout@master
-      - name: Use Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          architecture: 'x64'
-      - name: Update gems
-        shell: pwsh
-        run: |
-          gem install bundler
-          bundle config --local path vendor/bundle
-          bundle install --jobs 4 --retry 3
-      - name: Run specs
-        run: |
-          bundle exec rake