relaton-iec 1.11.0 → 1.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29cf9f52b83e9d40f821dbc17e7d9046a5b75daa74785eb42f86c34beb901326
-  data.tar.gz: 826a7c557607895c288cc7fd1c533eff3e50305e7f5f53d4084ba5bdfbe94f0d
+  metadata.gz: 26f4ed095f846982958565c16856f12c681fb06f6b4dcdf6d9d51da5e122fda3
+  data.tar.gz: 9d6d6de7f5ecc68aa0133460e80070e79cf4d58e167ac546dbeb2eb3e18ba537
 SHA512:
-  metadata.gz: a1cd3fc598455e728ebcecff28c24292da8d88540c9c482f1b0f1bcbc481ee31b82c3db4b0510cbb431c524ac8d6a20ecf85e7dbcc40afa1816836e2fa64f949
-  data.tar.gz: ff4f56193ef6924948725a81bfc11319f059a4f3e73f8e1838c0a4ee43c7fe31ed204b085edf358c4d42f0643305a1417dbd7a124e2e033ac6586032af7b4b8b
+  metadata.gz: f9110c1ee9b89a7a31048cb3f57814f16ba0835135849db067e6f4970a63f5f9a3af18507d6a5b040fa4e4a239873264b34e85673abb0b034afc45ca78bbe9fe
+  data.tar.gz: c2384461bcfd0715d241e0e5cd91f1631158293a57e488acea984f1fbdb3033997fcface2580d04c07212bd1d6e548edfe332da369b21e41a132673848648d5e

data/Gemfile

@@ -1,6 +1,3 @@
-Encoding.default_external = Encoding::UTF_8
-Encoding.default_internal = Encoding::UTF_8
-
 source "https://rubygems.org"
 
 git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }

data/lib/relaton_iec/hit_collection.rb

@@ -31,7 +31,7 @@ module RelatonIec
       all_parts_item = bibitem.to_all_parts
       parts.reject { |h| h.hit[:code] == hit.hit[:code] }.each do |hi|
         isobib = RelatonIec::IecBibliographicItem.new(
-          formattedref: RelatonBib::FormattedRef.new(content: hi.hit[:code])
+          formattedref: RelatonBib::FormattedRef.new(content: hi.hit[:code]),
         )
         all_parts_item.relation << RelatonBib::DocumentRelation.new(type: "partOf", bibitem: isobib)
       end

data/lib/relaton_iec/iec_bibliography.rb

@@ -21,7 +21,7 @@ module RelatonIec
       # @param part [String, nil] search for packaged stndard if not nil
       # @return [RelatonIec::HitCollection]
       def search(text, year = nil, part = nil)
-        HitCollection.new text.sub(/(^\w+)\//, '\1 '), year&.strip, part
+        HitCollection.new text&.sub(/(^\w+)\//, '\1 '), year&.strip, part
       rescue SocketError, OpenURI::HTTPError, OpenSSL::SSL::SSLError
         raise RelatonBib::RequestError, "Could not access http://www.iec.ch"
       end
@@ -32,8 +32,8 @@ module RelatonIec
       #   reference is required
       # @return [String] Relaton XML serialisation of reference
       def get(code, year = nil, opts = {}) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity
-        opts[:all_parts] ||= code.match? /\s\(all parts\)/
-        ref = code.sub /\s\(all parts\)/, ""
+        opts[:all_parts] ||= code.match?(/\s\(all parts\)/)
+        ref = code.sub(/\s\(all parts\)/, "")
         if year.nil?
           /^(?<code1>[^:]+):(?<year1>[^:]+)/ =~ ref
           unless code1.nil?
@@ -91,10 +91,10 @@ module RelatonIec
       # @return [RelatonIec::HitCollection]
       def search_filter(ref, year) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
         %r{
-          ^(?<code>\S+[^\d]*\s\d+((?:-\w+)+)?)
-          (:(?<year1>\d{4}))?
-          (?<bundle>\+[^\s\/]+)?
-          (\/(?<corr>AMD\s\d+))?
+          ^(?<code>\S+[^\d]*\s\d+(?:-\w+)*)
+          (?::(?<year1>\d{4}))?
+          (?<bundle>\+[^\s/]+)?
+          (?:/(?<corr>AMD\s\d+))?
         }x =~ ref.upcase
         year ||= year1
         corr&.sub! " ", ""
@@ -106,13 +106,12 @@ module RelatonIec
         end
         result = search code if result.empty?
         code = result.text.dup
-        code&.sub! /((?:-\w+)+)/, ""
+        code&.sub!(/((?:-\w+)+)/, "")
         result.select do |i|
           %r{
-            ^(?<code2>\S+[^\d]*\s\d+)((?:-\w+)+)?
-            (:\d{4})?
-            (?<bundle2>\+[^\s\/]+)?
-            (\/(?<corr2>AMD\d+))?
+            ^(?<code2>\S+[^\d]*\s\d+)(?:-\w+)*(?::\d{4})?
+            (?<bundle2>\+[^\s/]+)?
+            (?:/(?<corr2>AMD\d+))?
           }x =~ i.hit[:code]
           code == code2 && bundle == bundle2 && corr == corr2
         end

data/lib/relaton_iec/version.rb

@@ -1,3 +1,3 @@
 module RelatonIec
-  VERSION = "1.11.0".freeze
+  VERSION = "1.11.1".freeze
 end

data/relaton_iec.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   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-jing"
   spec.add_development_dependency "simplecov"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-iec
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.11.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-10 00:00:00.000000000 Z
+date: 2022-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
@@ -44,14 +44,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