relaton-iso 1.12.2 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f7c1d269d268e8bb7f9bc7b19b6e5466c9fb88f8a9db41f3944207535ca2edd
-  data.tar.gz: 4a6545be437af6c6326fed4e231c387a0a5cc7c04168fa1098c9fffc78701b29
+  metadata.gz: ae80444c7eea0c2fc3650351cbec8bb812ddfb10ec57d8060e8fb15d05b47cee
+  data.tar.gz: c9d2ac614b3feb6841bcad5c631dac08d4d723befdb2a0361df58899162dfd09
 SHA512:
-  metadata.gz: 3be88b28acc84c9877db94ef46e38488ea63b15ca2c19cd694c69d17f0e1b5c0b003a95929673d2e8a70cb69e91faef575506dab409d0c4b5e61f4dd046eb858
-  data.tar.gz: 209c65c8d600a34566999600cc0fbb0b06564603821c00045a09e0e00ecd2f6abf79c59774142e4dc1474dcb08b2604aeb5f1874a25b9f29e0d0dd9b420fbd4b
+  metadata.gz: 88efa8cc67bf0b555756a09bf13593e1a5685c066589cfac81a12797edd1bfd8aac58188ad07f8128381c426f46755fc3ddeee037b19e584bf5a09915dad6d48
+  data.tar.gz: a84a89836305ad177253ae2b18d7c78d328a48ea66b6861f0fece81b31468fd20b6d3048ead7642862ad57f2145a638c8eae8930e54266ae1eeee7fc43319ec1

data/lib/relaton_iso/hit_collection.rb

@@ -15,11 +15,11 @@ module RelatonIso
     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
@@ -172,7 +176,7 @@ module RelatonIso
             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.2"
+  VERSION = "1.13.0"
 end

data/relaton_iso.gemspec

@@ -40,5 +40,5 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "algolia"
   spec.add_dependency "pubid-iso", "~> 0.1.8"
-  spec.add_dependency "relaton-iso-bib", "~> 1.12.0"
+  spec.add_dependency "relaton-iso-bib", "~> 1.13.0"
 end

metadata

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