relaton-iso 1.12.1 → 1.12.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4479e38048aa0dfae8bcc85f1e9de03b5fe0561048b658ec47b3df8ca64794eb
-  data.tar.gz: c297ddc7b15d8186b85fbb7d4d3f84863d7df6e20ad243f0740364262fe43807
+  metadata.gz: c89e5819f5ee242c8ff64f7d961a18f38af1b8652b8645fc41562b95fd8bd55d
+  data.tar.gz: 777ef30bd94bf5a782edc673d58377dc9c52a1a85a203d684d844a0784bafc64
 SHA512:
-  metadata.gz: 6fd11d9fe01bd36052cf2762df6e8f728d361fbe23410dcb0229e95436a9f7909e51e51a8be0abc9f7bd269ffd10d642cb0aa7792dba76c0c174b606e319bf58
-  data.tar.gz: 060edbed6bb5b11033911db2200a4e19e98585c4133a1b4a09eaa79b582f2cf23b39f424b84d3110429ff1800247cec4f2b6522a82bbbdc45cb093e63a339bda
+  metadata.gz: 83a023461e1f6c98748a23bae33e9aaa8c745e397ac7adbc741060b6e370a94ca5a6055193e0c1abe6a259a4eff3693a2d1b8de27331152695329a83821b9ef2
+  data.tar.gz: e58c71d35a9b23fd34a62c24b273eb104b7a577b6cf37315af3d46ef5dd1d1deb6a41c5f95fe543838f9a6dd9f2ebd30d3501ffd773647a8f98cf6ab2684056f

data/lib/relaton_iso/hit_collection.rb

@@ -11,15 +11,15 @@ module RelatonIso
     # @param text [String] reference to search
     def initialize(text)
       super
-      @array = text.match?(/^ISO\s(?:TC\s184\/SC\s?4|IEC\sDIR\s(?:\d|IEC|JTC))/) ? fetch_github : fetch_iso
+      @array = text.match?(/^ISO[\s\/](?:TC\s184\/SC\s?4|IEC\sDIR\s(?:\d|IEC|JTC))/) ? fetch_github : fetch_iso
     end
 
     # @param lang [String, NilClass]
-    # @return [RelatonIsoBib::IsoBibliographicItem]
+    # @return [RelatonIsoBib::IsoBibliographicItem, nil]
     def to_all_parts(lang = nil) # rubocop:disable Metrics/CyclomaticComplexity
       # parts = @array.reject { |h| h.hit["docPart"]&.empty? }
       hit = @array.min_by { |h| h.pubid.part }
-      return @array.first.fetch lang unless hit
+      return @array.first&.fetch lang unless hit
 
       bibitem = hit.fetch(lang)
       all_parts_item = bibitem.to_all_parts

data/lib/relaton_iso/iso_bibliography.rb

@@ -38,19 +38,19 @@ module RelatonIso
         query_pubid = Pubid::Iso::Identifier.parse(code)
         query_pubid.year = year if year
 
-        hits = isobib_search_filter(query_pubid, opts)
+        resp = isobib_search_filter(query_pubid, opts)
 
         # return only first one if not all_parts
-        ret = if !opts[:all_parts] || hits.size == 1
-                hits.any? && hits.first.fetch(opts[:lang])
+        ret = if !opts[:all_parts] || resp[:hits].size == 1
+                resp[:hits].any? && resp[:hits].first.fetch(opts[:lang])
               else
-                hits.to_all_parts(opts[:lang])
+                resp[:hits].to_all_parts(opts[:lang])
               end
 
         if ret
           warn "[relaton-iso] (\"#{query_pubid}\") found #{ret.docidentifier.first.id}"
         else
-          return fetch_ref_err(query_pubid, query_pubid.year)
+          return fetch_ref_err(query_pubid)
         end
 
         if (query_pubid.year && opts[:keep_year].nil?) || opts[:keep_year] || opts[:all_parts]
@@ -86,6 +86,7 @@ module RelatonIso
       # @return [RelatonIso::HitCollection]
       def filter_hits_by_year(hit_collection, year) # rubocop:disable Metrics/MethodLength,Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
         missed_years = []
+        return { hits: hit_collection, missed_years: missed_years } if year.nil?
 
         # filter by year
         hits = hit_collection.select do |hit|
@@ -103,27 +104,22 @@ module RelatonIso
           end
         end
 
-        if hits.empty? && !missed_years.empty?
-          warn "[relaton-iso] (There was no match for #{year}, though there "\
-               "were matches found for #{missed_years.join(', ')}.)"
-        end
-        hits
+        { hits: hits, missed_years: missed_years }
       end
 
       private
 
-      def fetch_ref_err(query_pubid, year) # rubocop:disable Metrics/MethodLength
-        id = year ? "#{query_pubid}:#{year}" : query_pubid
-        warn "[relaton-iso] WARNING: no match found online for #{id}. "\
+      def fetch_ref_err(query_pubid) # rubocop:disable Metrics/MethodLength
+        warn "[relaton-iso] WARNING: no match found online for #{query_pubid}. " \
              "The code must be exactly like it is on the standards website."
         if /\d-\d/.match? query_pubid.to_s
-          warn "[relaton-iso] The provided document part may not exist, "\
+          warn "[relaton-iso] The provided document part may not exist, " \
                "or the document may no longer be published in parts."
         else
-          warn "[relaton-iso] If you wanted to cite all document parts for "\
-               "the reference, use \"#{query_pubid} (all parts)\".\nIf the document "\
-               "is not a standard, use its document type abbreviation "\
-               "(TS, TR, PAS, Guide)."
+          warn "[relaton-iso] If you wanted to cite all document parts for " \
+               "the reference, use \"#{query_pubid} (all parts)\"."
+          warn "[relaton-iso] If the document is not a standard, use its " \
+               "document type abbreviation (TS, TR, PAS, Guide)."
         end
         nil
       end
@@ -133,26 +129,34 @@ module RelatonIso
       # @param query_pubid [Pubid::Iso::Identifier] reference without correction
       # @param opts [Hash]
       # @return [Array<RelatonIso::Hit>]
-      def isobib_search_filter(query_pubid, opts) # rubocop:disable Metrics/MethodLength,Metrics/AbcSize
+      def isobib_search_filter(query_pubid, opts) # rubocop:disable Metrics/MethodLength,Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
+        missed_years = []
         query_pubid.part = nil if opts[:all_parts]
         warn "[relaton-iso] (\"#{query_pubid}\") fetching..."
         # fetch hits collection
         hit_collection = search(query_pubid.to_s(with_date: false))
         # filter only matching hits
-        res = filter_hits hit_collection, query_pubid,
-                          all_parts: opts[:all_parts]
-        return res unless res.empty?
+        res = filter_hits hit_collection, query_pubid, all_parts: opts[:all_parts]
+        return res unless res[:hits].empty?
 
+        missed_years += res[:missed_years]
         # lookup for documents with stages when no match without stage
         res = filter_hits hit_collection, query_pubid,
                           all_parts: opts[:all_parts], any_types_stages: true
-        return res unless res.empty?
+        return res unless res[:hits].empty?
 
+        missed_years += res[:missed_years]
         # TODO: do this at pubid-iso
         if query_pubid.publisher == "ISO" && query_pubid.copublisher.nil? # try ISO/IEC if ISO not found
           warn "[relaton-iso] Attempting ISO/IEC retrieval"
           query_pubid.copublisher = "IEC"
           res = filter_hits hit_collection, query_pubid, all_parts: opts[:all_parts]
+          missed_years += res[:missed_years]
+        end
+
+        if res[:hits].empty? && missed_years.any?
+          warn "[relaton-iso] (There was no match for #{query_pubid.year}, though there "\
+               "were matches found for #{missed_years.uniq.join(', ')}.)"
         end
         res
       end
@@ -168,11 +172,11 @@ module RelatonIso
           hit_pubid = i.pubid
           matches_base?(query_pubid, hit_pubid, any_types_stages: any_types_stages) &&
             matches_parts?(query_pubid, hit_pubid, all_parts: all_parts) &&
-            query_pubid.corrigendum == hit_pubid.corrigendum &&
-            query_pubid.amendment == hit_pubid.amendment
+            query_pubid.corrigendums == hit_pubid.corrigendums &&
+            query_pubid.amendments == hit_pubid.amendments
         end
 
-        query_pubid.year ? filter_hits_by_year(result, query_pubid.year) : result
+        filter_hits_by_year(result, query_pubid.year)
       end
     end
   end

data/lib/relaton_iso/version.rb

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

data/relaton_iso.gemspec

@@ -27,7 +27,6 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
   spec.add_development_dependency "byebug"
-  # spec.add_development_dependency "debase"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "pry-byebug"
   spec.add_development_dependency "rake", "~> 13.0"
@@ -35,13 +34,11 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rubocop"
   spec.add_development_dependency "rubocop-performance"
   spec.add_development_dependency "rubocop-rails"
-  # spec.add_development_dependency "ruby-debug-ide"
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "vcr"
   spec.add_development_dependency "webmock"
 
-  # spec.add_dependency "relaton-iec", "~> 1.8.0"
   spec.add_dependency "algolia"
+  spec.add_dependency "pubid-iso", "~> 0.1.8"
   spec.add_dependency "relaton-iso-bib", "~> 1.12.0"
-  spec.add_dependency "pubid-iso", "~> 0.1.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-iso
 version: !ruby/object:Gem::Version
-  version: 1.12.1
+  version: 1.12.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-05 00:00:00.000000000 Z
+date: 2022-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -179,33 +179,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: relaton-iso-bib
+  name: pubid-iso
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.12.0
+        version: 0.1.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.12.0
+        version: 0.1.8
 - !ruby/object:Gem::Dependency
-  name: pubid-iso
+  name: relaton-iso-bib
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.7
+        version: 1.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.7
+        version: 1.12.0
 description: 'RelatonIso: retrieve ISO Standards for bibliographic use using the IsoBibliographicItem
   model'
 email: