relaton-iso 1.7.4 → 1.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 285f112d9488263e9befd0b7cf1edc555be821457c5704a96b4619c3d0140bce
-  data.tar.gz: 71425bbdfcea77012c480e000787c55084380816adb627d51f61d3335b6e64a0
+  metadata.gz: f0c5bc4d61a17fbf55ecc1d68d689198c181c5d68924b1d4cf73f4d7e166ff14
+  data.tar.gz: 1621f2d080eea7e977811a1616e80137317de4339fd9820e69f7245d996b3619
 SHA512:
-  metadata.gz: 488b4d385f6a18c9e5cf8199e71b8d5a9a10e1068959f98c789ffaf95d634b12c68baaad64d7145236b379f2f103e44ee2958c8091d0312d97d67d5f378fac0b
-  data.tar.gz: 8a1ba31f5b5b809edc081eade7b9c142d4a33b74768f5eca38c92312e48745dcc6022df491a06c3fe7ee93a544022c113ee733a403940f297d3ed63b400a9405
+  metadata.gz: 4842a83c61845dc60985b5c916902d21b423be5c6eeeaf27f0d31e6db7badb63accfb48f67e64287cc77685ab23a373a17015cd15df132d7cd18f711ea30cdc6
+  data.tar.gz: 3729fbb3e1bdfe2406c1c80e6ad839f9f06b17f9270e5e7c19117ae943e5e750300073c2d701458c472e65a8bd4e56ec086a79b83873ec5c7ac8161cf7f18ca2

data/README.adoc

@@ -59,6 +59,18 @@ item.docidentifier
 => "urn:iso:std:iso-ts:ts:19115:-3:stage-90.92:ed-1:en,fr"
 ----
 
+=== Search for ISO/IEC Directives
+
+The ISO/IEC Derectives are stored in a static cache in a relaton gem. It needs to use the relaton gem to fetch the ISO/IEC Directives. Folloving reaferences are allowed to fetch:
+
+- ISO/IEC DIR 1 - Procedures for the technical work
+- ISO/IEC DIR 1 IEC SUP - Procedures for the technical work – Procedures specific to IEC
+- ISO/IEC DIR 1 ISO SUP - Consolidated ISO Supplement -- Procedures specific to ISO
+- ISO/IEC DIR 2 IEC - Principles and rules for the structure and drafting of ISO and IEC documents
+- ISO/IEC DIR 2 ISO - Principles and rules for the structure and drafting of ISO and IEC documents
+- ISO/IEC DIR IEC SUP - Procedures specific to IEC
+- ISO/IEC DIR JTC 1 SUP - Procedures specific to JTC 1
+
 === XML serialization
 
 Possible options:

data/lib/relaton_iso/hit.rb

@@ -3,6 +3,9 @@
 module RelatonIso
   # Hit.
   class Hit < RelatonBib::Hit
+    # @return [RelatonIsoBib::IsoBibliographicItem]
+    attr_accessor :fetch
+
     # Parse page.
     # @param lang [String, NilClass]
     # @return [RelatonIso::IsoBibliographicItem]

data/lib/relaton_iso/hit_collection.rb

@@ -10,25 +10,7 @@ module RelatonIso
     # @param text [String] reference to search
     def initialize(text)
       super
-      %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"]
-      search << "docNumber=#{num}"
-      search << "docPartNo=#{part}" if part
-      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?
-
-      json = JSON.parse resp.body
-      @array = json["standards"].map { |h| Hit.new h, self }.sort! do |a, b|
-        if a.sort_weight == b.sort_weight
-          (parse_date(b.hit) - parse_date(a.hit)).to_i
-        else
-          a.sort_weight - b.sort_weight
-        end
-      end
+      @array = text.match?(/^ISO\sTC\s184\/SC\s?4/) ? fetch_github : fetch_iso
     end
 
     # @param lang [String, NilClass]
@@ -54,6 +36,52 @@ module RelatonIso
 
     private
 
+    #
+    # Fetch document from GitHub repository
+    #
+    # @return [Array<RelatonIso::Hit]
+    #
+    def fetch_github
+      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)
+      return [] unless resp.code == "200"
+
+      hash = YAML.safe_load resp.body
+      bib_hash = RelatonIsoBib::HashConverter.hash_to_bib hash
+      bib = RelatonIsoBib::IsoBibliographicItem.new **bib_hash
+      hit = Hit.new({ "docRef" => text }, self)
+      hit.fetch = bib
+      [hit]
+    end
+
+    #
+    # Fetch hits from iso.org
+    #
+    # @return [Array<RelatonIso::Hit>]
+    #
+    def fetch_iso
+      %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"]
+      search << "docNumber=#{num}"
+      search << "docPartNo=#{part}" if part
+      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?
+
+      json = JSON.parse resp.body
+      json["standards"].map { |h| Hit.new h, self }.sort! do |a, b|
+        if a.sort_weight == b.sort_weight
+          (parse_date(b.hit) - parse_date(a.hit)).to_i
+        else
+          a.sort_weight - b.sort_weight
+        end
+      end
+    end
+
     # @param hit [Hash]
     # @return [Date]
     def parse_date(hit)

data/lib/relaton_iso/iso_bibliography.rb

@@ -26,32 +26,13 @@ module RelatonIso
       #   return actual reference with year
       # @return [String] Relaton XML serialisation of reference
       def get(ref, year = nil, opts = {})
-        opts[:ref] = ref.gsub(/\u2013/, "-")
-
-        %r{
-          ^(?<code1>[^\s]+\s[^\/]+) # match code
-          /?
-          (?<corr>(Amd|DAmd|(CD|WD|AWI|NP)\sAmd|Cor|CD\sCor|FDAmd|PRF\sAmd)\s\d+ # correction name
-          :?(\d{4})?(/Cor\s\d+:\d{4})?) # match correction year
-        }x =~ opts[:ref]
-        code = code1 || opts[:ref]
-
-        if year.nil?
-          /^(?<code1>[^\s]+(\s\w+)?\s[\d-]+)(:(?<year1>\d{4}))?(?<code2>\s\w+)?/ =~ code
-          /:(?<year2>\d{4})/ =~ corr
-          unless code1.nil?
-            code = code1 + code2.to_s
-            year = year2 || year1
-          end
-        end
-        %r{\s(?<num>\d+)(-(?<part>[\d-]+))?} =~ code
-        opts[:part] = part
-        opts[:num] = num
-        opts[:corr] = corr
-        opts[:all_parts] ||= !part && opts[:all_parts].nil? && code2.nil?
-        if %r[^ISO/IEC DIR].match? code
-          return RelatonIec::IecBibliography.get(code, year, opts)
-        end
+        code = ref.gsub(/\u2013/, "-")
+        %r{\s(?<num>\d+)(-(?<part>[\d-]+))?(:(?<year1>\d{4}))?} =~ code
+        year ||= year1
+        opts[:all_parts] ||= !part && opts[:all_parts].nil? # && code2.nil?
+        # if %r[^ISO/IEC DIR].match? code
+        #   return RelatonIec::IecBibliography.get(code, year, opts)
+        # end
 
         ret = isobib_get1(code, year, opts)
         return nil if ret.nil?
@@ -95,7 +76,7 @@ module RelatonIso
       # @param opts [Hash]
       # @return [Array<RelatonIso::Hit>]
       def isobib_search_filter(code, opts)
-        warn "[relaton-iso] (\"#{opts[:ref]}\") fetching..."
+        warn "[relaton-iso] (\"#{code}\") fetching..."
         result = search(code)
         res = search_code result, code, opts
         return res unless res.empty?
@@ -140,17 +121,24 @@ module RelatonIso
       # @param opts [Hash]
       # @return [RelatonIso::HitCollection]
       def search_code(result, code, opts) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity
-        ref_regex = %r{^#{code}(?!-)}
-        corr_regex = %r{^#{code}[\w-]*(:\d{4})?/#{opts[:corr]}}
-        no_corr_regex = %r{^#{code}[\w-]*(:\d{4})?/}
+        code1, part1, corr1, coryear1 = ref_components code
         result.select do |i|
-          (opts[:all_parts] || i.hit["docRef"] =~ ref_regex) && (
-              opts[:corr] && corr_regex =~ i.hit["docRef"] ||
-              !opts[:corr] && no_corr_regex !~ i.hit["docRef"]
-            )
+          code2, part2, corr2, coryear2 = ref_components i.hit["docRef"]
+          code1 == code2 && (!part1 || part1 == part2) &&
+            corr1 == corr2 && (!coryear1 || coryear1 == coryear2)
         end
       end
 
+      def ref_components(ref)
+        %r{
+          ^(?<code>ISO(?:\s|\/)[^-\/:]+)
+          (?:-(?<part>[^:\/]+))?
+          (?::\d{4})?
+          (?:\/(?<corr>\w+(?:\s\w+)?\s\d+)(?:(?<coryear>\d{4}))?)?
+        }x =~ ref
+        [code, part, corr, coryear]
+      end
+
       # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
 
       # Sort through the results from RelatonIso, fetching them three at a time,
@@ -188,7 +176,7 @@ module RelatonIso
         result = isobib_search_filter(code, opts) || return
         ret = isobib_results_filter(result, year, opts)
         if ret[:ret]
-          warn "[relaton-iso] (\"#{opts[:ref]}\") found #{ret[:ret].docidentifier.first.id}"
+          warn "[relaton-iso] (\"#{code}\") found #{ret[:ret].docidentifier.first.id}"
           ret[:ret]
         else
           fetch_ref_err(code, year, ret[:years])

data/lib/relaton_iso/version.rb

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

data/relaton_iso.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   # spec.add_development_dependency "debase"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "pry-byebug"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   # spec.add_development_dependency "ruby-debug-ide"
   spec.add_development_dependency "simplecov"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-iso
 version: !ruby/object:Gem::Version
-  version: 1.7.4
+  version: 1.7.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-19 00:00:00.000000000 Z
+date: 2021-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement