relaton-jis 1.14.0 → 1.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30edf630d85d2e1abafa0c0c03c7b5b22be3b5eebe8c18a7b9df955d8588e22b
-  data.tar.gz: 79ce45cba39f96353038c95c608c38b893ddbad335a671ade2361384ab8e3a3c
+  metadata.gz: a6a4ecb8042069c8babc406d37ee36702fa28bb6efe4d4bdbc60c48ed7fc6599
+  data.tar.gz: 45ee95535b80261e3ad03f76a8025b86b9a4854509f2aab94056b6e438e38b6e
 SHA512:
-  metadata.gz: b0a58bb07a4b7b6f00b8b18014e3b6500ec5403f0c26cca6fac3286aa97ff0736a604d4d1e7a61c3e4379f5625409720c1119229a9c0dc4642173da46498b170
-  data.tar.gz: 6ba60be774e61bbfbcff9d10fe4dc031e4e07026c52fb64bbd56b9e6ccb59a2999f46c7c29475afcc8801effcc7fccf5f7076d64cb27744612abb291d1ad8219
+  metadata.gz: c60b2041b0c812cafb40f3f96ab6d253a21f4e7381422551a702cba2ab9b84a2f2f03f1f05aaad6bcd187eaa95d097bf947fc142dcee142d6c2c73f4011fabe4
+  data.tar.gz: 52bfca55bb5bf3e49cb2f26d83d6a8068efb2a112676bfd9450248cbd7aa6e9834f1b96ff5da976c84013adbd846189d89b90bcb5f85ec543776497c60bf6a4d

data/grammars/relaton-jis.rng

@@ -6,9 +6,6 @@
         <attribute name="schema-version"/>
       </optional>
       <ref name="doctype"/>
-      <optional>
-        <ref name="docsubtype"/>
-      </optional>
       <ref name="editorialgroup"/>
       <zeroOrMore>
         <ref name="ics"/>
@@ -18,93 +15,12 @@
         <ref name="stagename"/>
       </optional>
     </define>
-    <define name="bdate">
-      <element name="date">
-        <attribute name="type">
-          <choice>
-            <ref name="BibliographicDateType"/>
-            <text/>
-          </choice>
-        </attribute>
-        <choice>
-          <group>
-            <element name="from">
-              <ref name="ISO8601Date"/>
-            </element>
-            <optional>
-              <element name="to">
-                <ref name="ISO8601Date"/>
-              </element>
-            </optional>
-          </group>
-          <element name="on">
-            <choice>
-              <ref name="ISO8601Date"/>
-              <value>--</value>
-              <value>–</value>
-            </choice>
-          </element>
-        </choice>
-      </element>
-    </define>
-    <define name="organization">
-      <element name="organization">
-        <oneOrMore>
-          <ref name="orgname"/>
-        </oneOrMore>
-        <optional>
-          <ref name="abbreviation"/>
-        </optional>
-        <optional>
-          <ref name="uri"/>
-        </optional>
-        <zeroOrMore>
-          <ref name="org-identifier"/>
-        </zeroOrMore>
-        <zeroOrMore>
-          <ref name="contact"/>
-        </zeroOrMore>
-        <optional>
-          <ref name="technical-committee"/>
-        </optional>
-        <optional>
-          <ref name="subcommittee"/>
-        </optional>
-        <optional>
-          <ref name="workgroup"/>
-        </optional>
-        <optional>
-          <ref name="secretariat"/>
-        </optional>
-      </element>
-    </define>
     <define name="DocumentType">
       <choice>
-        <value>british-standard</value>
-        <value>draft-for-development</value>
-        <value>published-document</value>
-        <value>privately-subscribed-standard</value>
-        <value>publicly-available-specification</value>
-        <value>flex-standard</value>
-        <value>international-standard</value>
-        <value>technical-specification</value>
+        <value>japanese-industrial-standard</value>
         <value>technical-report</value>
-        <value>guide</value>
-        <value>international-workshop-agreement</value>
-        <value>industry-technical-agreement</value>
-        <value>standard</value>
-        <value>european-workshop-agreement</value>
-        <value>fast-track-standard</value>
-        <value>expert-commentary</value>
-      </choice>
-    </define>
-    <define name="DocumentSubtype">
-      <choice>
-        <value>specification</value>
-        <value>method-of-test</value>
-        <value>method-of-specifying</value>
-        <value>vocabulary</value>
-        <value>code-of-practice</value>
+        <value>technical-specification</value>
+        <value>amendment</value>
       </choice>
     </define>
     <define name="structuredidentifier">
@@ -126,11 +42,6 @@
       </element>
     </define>
   </include>
-  <define name="updates_document_type">
-    <element name="updates-document-type">
-      <ref name="DocumentType"/>
-    </element>
-  </define>
   <define name="ISOProjectGroup">
     <zeroOrMore>
       <ref name="agency"/>
@@ -148,21 +59,11 @@
       <ref name="secretariat"/>
     </optional>
   </define>
-  <define name="approvalgroup">
-    <element name="approvalgroup">
-      <ref name="ISOProjectGroup"/>
-    </element>
-  </define>
   <define name="agency">
     <element name="agency">
       <text/>
     </element>
   </define>
-  <define name="horizontal">
-    <element name="horizontal">
-      <data type="boolean"/>
-    </element>
-  </define>
   <define name="documentnumber">
     <element name="project-number">
       <optional>
@@ -221,11 +122,4 @@
       <text/>
     </element>
   </define>
-  <define name="coverimages">
-    <element name="coverimages">
-      <oneOrMore>
-        <ref name="image"/>
-      </oneOrMore>
-    </element>
-  </define>
 </grammar>

data/lib/relaton_jis/bibliography.rb

@@ -16,6 +16,9 @@ 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?
+      return if disp["disp_screen"].nil?
+
       result = agent.get "#{SOURCE}#{disp['disp_screen']}/index"
       HitCollection.new code, year, result: result.xpath("//div[@class='blockGenaral']")
     end
@@ -25,16 +28,24 @@ module RelatonJis
     #
     # @param [String] ref JIS document reference
     # @param [String] year JIS document year
-    # @param [Hash] _opts options
+    # @param [Hash] opts options
+    # @option opts [String] :all_parts return all parts of document
     #
     # @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..."
-      result = search(ref, year).find
-      if result[:bib]
-        warn "[relaton-jis] (\"#{ref}\") found #{result[:bib].docidentifier[0].id}"
-        return result[:bib]
+      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}"
+        return result
       end
       hint result, ref, year
     end
@@ -42,16 +53,16 @@ module RelatonJis
     #
     # Log hint message
     #
-    # @param [Hash] result search result
+    # @param [Array] result search result
     # @param [String] ref reference to search
     # @param [String, nil] year year to search
     #
     def hint(result, ref, year)
       warn "[relaton-jis] (\"#{ref}\") not found. The identifier must be " \
            "exactly as shown on the webdesk.jsa.or.jp website."
-      if result[:missed_years]
-        warn "[relaton-jis] (\"#{ref}\") TIP: No match for edition year #{year}, " \
-             "but matches exist for #{result[:missed_years].uniq.join(', ')}."
+      if result.any?
+        warn "[relaton-jis] (\"#{ref}\") TIP: No match for edition " \
+             "year #{year}, but matches exist for #{result.uniq.join(', ')}."
       end
     end
   end

data/lib/relaton_jis/hit.rb

@@ -19,11 +19,13 @@ module RelatonJis
     #
     # @param [Hash] ref_parts parts of reference
     # @param [String, nil] year year
+    # @param [Boolean] all_parts check all parts of reference
     #
     # @return [Boolean] true if hit matches reference
     #
-    def match?(ref_parts, year = nil) # 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])) &&
         (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])) &&

data/lib/relaton_jis/hit_collection.rb

@@ -15,17 +15,56 @@ module RelatonJis
     #
     # Find hit in collection
     #
-    # @return [Hash] hash with bib ot array of missed years
+    # @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 { bib: 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 hit.eq?(ref_parts)
+      end
+      missed_years
+    end
+
+    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
 
-        missed_years << hit.id_parts[:year] if y && hit.match?(ref_parts)
+        parent.relation << create_relation(hit)
       end
-      { missed_years: missed_years }
+      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
+
+        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
 
     #
@@ -46,13 +85,14 @@ module RelatonJis
     #
     def parse_ref(ref)
       %r{
-        ^(?<code>\w+\s\w\s?\d+)
+        ^(?<code>\w+\s\w\s?\w+)
+        (?:-(?<part>\w+))?
         (?::(?<year>\d{4}))?
         (?:/(?<expl>EXPL(?:ANATION)?)(?:\s(?<expl_num>\d+))?)?
         (?:/(?<amd>AMDENDMENT)(?:\s(?<amd_num>\d+)(?::(?<amd_year>\d{4}))?)?)?
       }x =~ ref
-      { code: code, year: year, expl: expl, expl_num: expl_num, amd: amd,
-        amd_num: amd_num, amd_year: amd_year }
+      { code: code, part: part, year: year, expl: expl, expl_num: expl_num,
+        amd: amd, amd_num: amd_num, amd_year: amd_year }
     end
   end
 end

data/lib/relaton_jis/scraper.rb

@@ -52,15 +52,18 @@ module RelatonJis
     end
 
     def fetch_docid
-      id = @doc.at("./h2/text()[1]").text.strip
-      [RelatonBib::DocumentIdentifier.new(id: id, type: "JIS", primary: true)]
+      [RelatonBib::DocumentIdentifier.new(id: document_id, type: "JIS", primary: true)]
     end
 
     def fetch_docnumber
-      match = @doc.at("./h2/text()[1]").text.strip.match(/^\w+\s(\w)\s?(\d+)/)
+      match = document_id.match(/^\w+\s(\w)\s?(\d+)/)
       "#{match[1]}#{match[2]}"
     end
 
+    def document_id
+      @document_id ||= @doc.at("./h2/text()[1]").text.strip
+    end
+
     def fetch_date
       DATETYPES.each_with_object([]) do |(key, type), a|
         node = @doc.at("./div/div/div/p/text()[contains(.,'#{key}')]")
@@ -100,7 +103,12 @@ module RelatonJis
     end
 
     def fetch_doctype
-      "standard"
+      case document_id
+      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"
+      end
     end
 
     def fetch_ics

data/lib/relaton_jis/version.rb

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

data/relaton_jis.gemspec

@@ -35,6 +35,7 @@ Gem::Specification.new do |spec|
 
   # Uncomment to register a new dependency of your gem
   spec.add_dependency "mechanize", "~> 2.8.0"
+  spec.add_dependency "relaton-bib", "~> 1.14.9"
   spec.add_dependency "relaton-iso-bib", "~> 1.14.0"
 
   # For more information and examples about making a new gem, check out our

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-jis
 version: !ruby/object:Gem::Version
-  version: 1.14.0
+  version: 1.14.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-03-21 00:00:00.000000000 Z
+date: 2023-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.8.0
+- !ruby/object:Gem::Dependency
+  name: relaton-bib
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.14.9
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.14.9
 - !ruby/object:Gem::Dependency
   name: relaton-iso-bib
   requirement: !ruby/object:Gem::Requirement
@@ -89,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