relaton-jis 1.14.1 → 1.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29e1df903781ffa5a3c9e55bacefef03762c52d6a7df32a7fa8d28e7addc3403
-  data.tar.gz: 480d6ddb9669c3fd8182cb5bd651c8ce695c5915e7bf82473abbe805dcbca155
+  metadata.gz: a6a4ecb8042069c8babc406d37ee36702fa28bb6efe4d4bdbc60c48ed7fc6599
+  data.tar.gz: 45ee95535b80261e3ad03f76a8025b86b9a4854509f2aab94056b6e438e38b6e
 SHA512:
-  metadata.gz: 6431d5d67f17fa216d966a4116fcd03b8b13fd6fcbf019c02fd1abf4caa928598f544f4fcce30cb2b0ba0b6aaa81b329c5443f1b215bfcfd81aa6dfe7670a1ee
-  data.tar.gz: 788e254613d82c07372c3ac3e13df715ee0f6f1ce71b0334ee8b1fdc577821eae6d2600976a1e91488076a69fcea8a696f123e929e6ffb390ef3e0fa845e62de
+  metadata.gz: c60b2041b0c812cafb40f3f96ab6d253a21f4e7381422551a702cba2ab9b84a2f2f03f1f05aaad6bcd187eaa95d097bf947fc142dcee142d6c2c73f4011fabe4
+  data.tar.gz: 52bfca55bb5bf3e49cb2f26d83d6a8068efb2a112676bfd9450248cbd7aa6e9834f1b96ff5da976c84013adbd846189d89b90bcb5f85ec543776497c60bf6a4d

data/lib/relaton_jis/bibliography.rb

@@ -16,7 +16,8 @@ module RelatonJis
       agent = Mechanize.new
       resp = agent.post "#{SOURCE}0010/searchByKeyword", search_type: "JIS", keyword: code
       disp = JSON.parse resp.body
-      raise RelatonBib::RequestError, "No results found for #{code}" if disp["disp_screen"].nil?
+      # raise RelatonBib::RequestError, "No results found for #{code}" if disp["disp_screen"].nil?
+      return if disp["disp_screen"].nil?
 
       result = agent.get "#{SOURCE}#{disp['disp_screen']}/index"
       HitCollection.new code, year, result: result.xpath("//div[@class='blockGenaral']")
@@ -32,11 +33,15 @@ module RelatonJis
     #
     # @return [RelatonJis::BibliographicItem, nil] JIS document
     #
-    def get(ref, year = nil, opts = {})
+    def get(ref, year = nil, opts = {}) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
       code = ref.sub(/\s\((all parts|規格群)\)/, "")
       opts[:all_parts] ||= !$1.nil?
       warn "[relaton-jis] (\"#{ref}\") fetching..."
       hits = search(code, year)
+      unless hits
+        hint [], ref, year
+        return
+      end
       result = opts[:all_parts] ? hits.find_all_parts : hits.find
       if result.is_a? RelatonJis::BibliographicItem
         warn "[relaton-jis] (\"#{ref}\") found #{result.docidentifier[0].id}"

data/lib/relaton_jis/hit.rb

@@ -23,10 +23,10 @@ module RelatonJis
     #
     # @return [Boolean] true if hit matches reference
     #
-    def match?(ref_parts, year = nil, all_parts: false) # rubocop:disable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
+    def eq?(ref_parts, year = nil, all_parts: false) # rubocop:disable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
       id_parts[:code].include?(ref_parts[:code]) &&
         (all_parts || (ref_parts[:part].nil? || ref_parts[:part] == id_parts[:part])) &&
-        (all_parts || year.nil? || year == id_parts[:year]) &&
+        (year.nil? || year == id_parts[:year]) &&
         ((ref_parts[:expl].nil? || !id_parts[:expl].nil?) &&
          (ref_parts[:expl_num].nil? || ref_parts[:expl_num] == id_parts[:expl_num])) &&
         ((ref_parts[:amd].nil? || !id_parts[:amd].nil?) &&

data/lib/relaton_jis/hit_collection.rb

@@ -18,30 +18,55 @@ module RelatonJis
     # @return [RelatonJis::BibliographicItem, Array<Strig>] hash with bib ot array of missed years
     #
     def find
+      ref_year = year || ref_parts[:year]
+      if ref_year
+        find_by_year ref_year
+      else
+        find_all_years
+      end
+    end
+
+    def find_by_year(ref_year)
       missed_years = []
-      y = year || ref_parts[:year]
       @array.each do |hit|
-        return hit.fetch if hit.match? ref_parts, y
+        return hit.fetch if hit.eq? ref_parts, ref_year
 
-        missed_years << hit.id_parts[:year] if y && hit.match?(ref_parts)
+        missed_years << hit.id_parts[:year] if hit.eq?(ref_parts)
       end
       missed_years
     end
 
-    def find_all_parts
-      hits = @array.select { |hit| hit.match? ref_parts, year, all_parts: true }
+    def find_all_years # rubocop:disable Metrics/AbcSize
+      hits = @array.select { |hit| hit.eq? ref_parts }
+      item = hits.max_by { |i| i.id_parts[:year].to_i }.fetch
+      item_id = item.docidentifier.first.id
+      parent = item.to_most_recent_reference
+      hits.each do |hit|
+        next if hit.hit[:id] == item_id
+
+        parent.relation << create_relation(hit)
+      end
+      parent
+    end
+
+    def find_all_parts # rubocop:disable Metrics/AbcSize
+      hits = @array.select { |hit| hit.eq? ref_parts, all_parts: true }
       item = hits.min_by { |i| i.id_parts[:part].to_i }.fetch.to_all_parts
       hits.each do |hit|
         next if hit.hit[:id] == item.docidentifier.first.id
 
-        docid = RelatonBib::DocumentIdentifier.new id: hit.hit[:id], type: "JIS", primary: true
-        fref = RelatonBib::FormattedRef.new content: hit.hit[:id]
-        bibitem = BibliographicItem.new docid: [docid], formattedref: fref
-        item.relation << RelatonBib::DocumentRelation.new(type: "instance", bibitem: bibitem)
+        item.relation << create_relation(hit)
       end
       item
     end
 
+    def create_relation(hit)
+      docid = RelatonBib::DocumentIdentifier.new id: hit.hit[:id], type: "JIS", primary: true
+      fref = RelatonBib::FormattedRef.new content: hit.hit[:id]
+      bibitem = BibliographicItem.new docid: [docid], formattedref: fref
+      RelatonBib::DocumentRelation.new(type: "instance", bibitem: bibitem)
+    end
+
     #
     # Return parts of reference
     #

data/lib/relaton_jis/scraper.rb

@@ -104,10 +104,10 @@ module RelatonJis
 
     def fetch_doctype
       case document_id
-      when /JIS\s[A-Z]\s[\w-]+:\d{4}\/AMD/ then "amendment"
+      when /JIS\s[A-Z]\s[\w-]+:\d{4}\/AMENDMENT/ then "amendment"
       when /JIS\s[A-Z]\s[\w-]+/ then "japanese-industrial-standard"
-      when /TR\s[\w-]+/ then "technical-report"
-      when /TS\s[\w-]+/ then "technical-specification"
+      when /TR[\s\/][\w-]+/ then "technical-report"
+      when /TS[\s\/][\w-]+/ then "technical-specification"
       end
     end
 

data/lib/relaton_jis/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RelatonJis
-  VERSION = "1.14.1"
+  VERSION = "1.14.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-jis
 version: !ruby/object:Gem::Version
-  version: 1.14.1
+  version: 1.14.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-04-04 00:00:00.000000000 Z
+date: 2023-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
@@ -103,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: 'RelatonJis: retrieve IETF Standards for bibliographic use using the BibliographicItem