relaton-iev 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 171452dde039161de3d84192e3618fe2d7df53772c9250fe40a00e11d10263fe
-  data.tar.gz: 4d927ecb1b1afcf5302685c1119c2b1807e489a9955b893ff983ac0ca5db24be
+  metadata.gz: 3918718353f35253438dab58b258c15d1cc91169370cab27b81dc8ff03d07cad
+  data.tar.gz: b82d15e9a3bc1dc10e03cd6c9d4c16632f666fe91770fc23f54d7ce25c7df78f
 SHA512:
-  metadata.gz: 9b8474c5c852ead8e7979c0a5f8d46d6cf0270e1f96e422141e1cd655fc0a0def44f1ba67a306cf66f7030da2e49e54dbd6bb15215f186093ff44d0fcffdb9e0
-  data.tar.gz: 570ad6aeb737744761fe7e68b8b300d48fea9f176bbf4d3397ce530e73e2b4f74219f9911691307d3357619b97bce57cc66957f5d9ca274fd333d3d4be882cee
+  metadata.gz: 524597c4b1b0293b302e2c9575f80f593e930ccca13d5b1af07b0b8ac7965c908c19025812ff0b16db28514af9b1006720154db6cc6d7a7029b22c5b84336847
+  data.tar.gz: 143558a313ad249766a8e7ccb6395555cfda59320106fde08c707c2e518e21bed5461886d82db05ab1ca8facda39676d191aeaff5ac0933811ca7fac1de89ca2

data/.github/workflows/rake.yml

@@ -16,19 +16,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '2.7', '2.6', '2.5', '2.4' ]
+        ruby: [ '2.7', '2.6', '2.5', '3.0' ]
         os: [ ubuntu-latest, windows-latest, macos-latest ]
         experimental: [ false ]
-        include:
-          - ruby: '3.0'
-            os: 'ubuntu-latest'
-            experimental: true
-          - ruby: '3.0'
-            os: 'windows-latest'
-            experimental: true
-          - ruby: '3.0'
-            os: 'macos-latest'
-            experimental: true
     steps:
       - uses: actions/checkout@v2
         with:

data/.rubocop.yml

@@ -9,4 +9,4 @@ inherit_from:
 AllCops:
   DisplayCopNames: false
   StyleGuideCopsOnly: false
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.5

data/lib/relaton_iev/version.rb

@@ -1,3 +1,3 @@
 module RelatonIev
-  VERSION = "1.1.2".freeze
+  VERSION = "1.1.3".freeze
 end

data/lib/relaton_iev.rb

@@ -8,19 +8,20 @@ module RelatonIev
     # 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>
+    # <locality type="clause"><referenceFrom>101-01-01</referenceFrom>
+    # </locality></eref>
     #
     # @param xmldoc [Nokogiri::XML::Documet]
     # @return [Set<String>]
-    def linksIev2iec60050part(xmldoc)
+    def links_iev2iec60050part(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]}"
+      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
@@ -33,20 +34,19 @@ module RelatonIev
     # @param iev [Nokogiri::XML::Element]
     # @param bibdb [Relaton::Db, NilClass]
     # @return [Nokogiri::XML::Element]
-    def refsIev2iec60050part(xmldoc, parts, iev, bibdb = nil)
+    def refs_iev2iec60050part(xmldoc, parts, 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)
+        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$/, ":#{date}")
+          x["citeas"] = x["citeas"].sub(/:2011$/, ":#{hit.date[0].on(:year)}")
         end
       end
-      iev.replace(new_iev)
+      new_iev
     end
 
-    def refsIev2iec60050part1(xmldoc, part, hit)
+    def refs_iev2iec60050part1(xmldoc, part, hit)
       date = hit.date[0].on(:year)
       return "" if already_contains_ref(xmldoc, part, date)
 
@@ -65,8 +65,8 @@ module RelatonIev
     # @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)
+      parts = links_iev2iec60050part(xmldoc)
+      iev.replace(refs_iev2iec60050part(xmldoc, parts, bibdb))
     end
   end
 end

data/relaton_iev.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   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 "pry-byebug"
@@ -32,6 +32,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "vcr"
   spec.add_development_dependency "webmock"
 
-  spec.add_dependency "nokogiri", "~> 1.11.0"
+  spec.add_dependency "nokogiri", "~> 1.12.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.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-07 00:00:00.000000000 Z
+date: 2021-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry-byebug
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: 1.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: 1.12.0
 - !ruby/object:Gem::Dependency
   name: relaton
   requirement: !ruby/object:Gem::Requirement
@@ -169,7 +169,7 @@ 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:
   - - ">="