relaton-iso 1.7.5 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0c5bc4d61a17fbf55ecc1d68d689198c181c5d68924b1d4cf73f4d7e166ff14
-  data.tar.gz: 1621f2d080eea7e977811a1616e80137317de4339fd9820e69f7245d996b3619
+  metadata.gz: 61646e164a8a384cb744e3e50dafdea336f74cbf7418b59d1b5a30e8aabeea62
+  data.tar.gz: f3c861c4fd11e792f9bd7d7edd0e83d95a5972c6e1590825ce0562360cc5f0d6
 SHA512:
-  metadata.gz: 4842a83c61845dc60985b5c916902d21b423be5c6eeeaf27f0d31e6db7badb63accfb48f67e64287cc77685ab23a373a17015cd15df132d7cd18f711ea30cdc6
-  data.tar.gz: 3729fbb3e1bdfe2406c1c80e6ad839f9f06b17f9270e5e7c19117ae943e5e750300073c2d701458c472e65a8bd4e56ec086a79b83873ec5c7ac8161cf7f18ca2
+  metadata.gz: 073cf929ab4f17e00651c03443b4bc0d21526994ebd5532a5914f841066f4ec6522d58344ddabf09e69f409243c59c6c721db2a3c1c38c9784b6211cd48d9982
+  data.tar.gz: 2e710926a48e59aba377f89cea8589f4dbb0abe0ddd53a906d9463faf7adf70681f8ef8d8b68f30d8398c9db4b9859a898b243ec53f5f2010dd7bd5a8e99b086

data/lib/relaton_iso/hit_collection.rb

@@ -41,7 +41,7 @@ module RelatonIso
     #
     # @return [Array<RelatonIso::Hit]
     #
-    def fetch_github
+    def fetch_github # rubocop:disable Metrics/AbcSize
       ref = text.gsub(/[\s\/]/, "_").upcase
       url = "https://raw.githubusercontent.com/relaton/relaton-data-iso/main/data/#{ref}.yaml"
       resp = Net::HTTP.get_response URI(url)
@@ -60,8 +60,8 @@ module RelatonIso
     #
     # @return [Array<RelatonIso::Hit>]
     #
-    def fetch_iso
-      %r{\s(?<num>\d+)(-(?<part>[\d-]+))?} =~ text
+    def fetch_iso # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
+      %r{\s(?<num>\d+)(?:-(?<part>[\d-]+))?} =~ text
       http = Net::HTTP.new "www.iso.org", 443
       http.use_ssl = true
       search = ["status=ENT_ACTIVE,ENT_PROGRESS,ENT_INACTIVE,ENT_DELETED"]
@@ -70,7 +70,7 @@ module RelatonIso
       q = search.join "&"
       resp = http.get("/cms/render/live/en/sites/isoorg.advancedSearch.do?#{q}",
                       "Accept" => "application/json, text/plain, */*")
-      return if resp.body.empty?
+      return [] if resp.body.empty?
 
       json = JSON.parse resp.body
       json["standards"].map { |h| Hit.new h, self }.sort! do |a, b|

data/lib/relaton_iso/iso_bibliography.rb

@@ -3,7 +3,7 @@
 # require 'relaton_iso/iso_bibliographic_item'
 require "relaton_iso/scrapper"
 require "relaton_iso/hit_collection"
-require "relaton_iec"
+# require "relaton_iec"
 
 module RelatonIso
   # Class methods for search ISO standards.
@@ -120,7 +120,7 @@ module RelatonIso
       # @param code [String]
       # @param opts [Hash]
       # @return [RelatonIso::HitCollection]
-      def search_code(result, code, opts) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity
+      def search_code(result, code, _opts) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity
         code1, part1, corr1, coryear1 = ref_components code
         result.select do |i|
           code2, part2, corr2, coryear2 = ref_components i.hit["docRef"]
@@ -131,12 +131,12 @@ module RelatonIso
 
       def ref_components(ref)
         %r{
-          ^(?<code>ISO(?:\s|\/)[^-\/:]+)
-          (?:-(?<part>[^:\/]+))?
+          ^(?<code>ISO(?:\s|/)[^-/:()]+)
+          (?:-(?<part>[^:/]+))?
           (?::\d{4})?
-          (?:\/(?<corr>\w+(?:\s\w+)?\s\d+)(?:(?<coryear>\d{4}))?)?
+          (?:/(?<corr>\w+(?:\s\w+)?\s\d+)(?:(?<coryear>\d{4}))?)?
         }x =~ ref
-        [code, part, corr, coryear]
+        [code&.strip, part, corr, coryear]
       end
 
       # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity

data/lib/relaton_iso/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RelatonIso
-  VERSION = "1.7.5"
+  VERSION = "1.8.0"
 end

data/relaton_iso.gemspec

@@ -37,6 +37,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "vcr"
   spec.add_development_dependency "webmock"
 
-  spec.add_dependency "relaton-iec", "~> 1.7.0"
-  spec.add_dependency "relaton-iso-bib", "~> 1.7.0"
+  # spec.add_dependency "relaton-iec", "~> 1.8.0"
+  spec.add_dependency "relaton-iso-bib", "~> 1.8.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-iso
 version: !ruby/object:Gem::Version
-  version: 1.7.5
+  version: 1.8.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-05-05 00:00:00.000000000 Z
+date: 2021-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -122,34 +122,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: relaton-iec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.7.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: relaton-iso-bib
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.8.0
 description: 'RelatonIso: retrieve ISO Standards for bibliographic use using the IsoBibliographicItem
   model'
 email: