relaton-nist 1.14.1 → 1.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e57a7e2ff1d4d40e799e5abb368bc849f76484ab646bbab6f79067b74c7f277
-  data.tar.gz: 5fa57799445d309ddd383cb229eba3408365989d9343c312c724adce6bcd9fc1
+  metadata.gz: c0a3280e8b107aa791c82020a104a35132ceab0951eef11ff280119efe01ea47
+  data.tar.gz: be0d5aeab00d2aa721fa2d080763062d8d768f91d0aa042889bfc8d1eaba3865
 SHA512:
-  metadata.gz: 75391002c42e0b93fdd8afc9840c4bd0cf2df7431e366fcac43d6cbaf1049ec9363a766685b300eae470bc6262a2f0a60c79fc560c118037f2b2ce0dcf1ff872
-  data.tar.gz: 2c6690d2974a9c337188e066e418f697028bf7bb261908e4bf459384132f54900bb9b4c4259024a4b5b0a3a4d8734e0429787336eb4cb5bc72b7940e8af79e87
+  metadata.gz: d88f097b5d1c48563e985c1e3dc780a8fadfd298b9050cd8c384d7839f2b9941dbf334ef770ce8bde7a136bafc9e1b27a0a2d07e69375619a3a3df705ffc6a70
+  data.tar.gz: 6e2df5491193c9d5303279eb77e30d1773f1ce524f27cc7b1e53ca70e033d56c898d99683dbee6853a7f6e9f402521f0a6226ed92b3b5dccd77430419bfe0617

data/grammars/basicdoc.rng

@@ -522,7 +522,6 @@
       <value>tip</value>
       <value>important</value>
       <value>caution</value>
-      <value>statement</value>
     </choice>
   </define>
   <define name="figure">

data/grammars/biblio.rng

@@ -216,6 +216,9 @@
       <optional>
         <ref name="fullname"/>
       </optional>
+      <zeroOrMore>
+        <ref name="credential"/>
+      </zeroOrMore>
       <zeroOrMore>
         <ref name="affiliation"/>
       </zeroOrMore>
@@ -232,6 +235,11 @@
       <ref name="FullNameType"/>
     </element>
   </define>
+  <define name="credential">
+    <element name="credential">
+      <text/>
+    </element>
+  </define>
   <define name="FullNameType">
     <choice>
       <group>
@@ -305,7 +313,9 @@
       <zeroOrMore>
         <ref name="affiliationdescription"/>
       </zeroOrMore>
-      <ref name="organization"/>
+      <optional>
+        <ref name="organization"/>
+      </optional>
     </element>
   </define>
   <define name="affiliationname">
@@ -1316,7 +1326,7 @@
       <value>commentaryOf</value>
       <value>hasCommentary</value>
       <value>related</value>
-      <value>complements</value>
+      <value>hasComplement</value>
       <value>complementOf</value>
       <value>obsoletes</value>
       <value>obsoletedBy</value>

data/lib/relaton_nist/hit_collection.rb

@@ -9,10 +9,6 @@ require "open-uri"
 module RelatonNist
   # Hit collection.
   class HitCollection < RelatonBib::HitCollection
-    DOMAIN = "https://csrc.nist.gov"
-    PUBS_EXPORT = URI.join(DOMAIN, "/CSRC/media/feeds/metanorma/pubs-export")
-    DATAFILEDIR = File.expand_path ".relaton/nist", Dir.home
-    DATAFILE = File.expand_path "pubs-export.zip", DATAFILEDIR
     GHNISTDATA = "https://raw.githubusercontent.com/relaton/relaton-data-nist/main/data/"
 
     #
@@ -65,7 +61,8 @@ module RelatonNist
           (!refparts[:vol] || refparts[:vol] == parts[:vol]) &&
           (!refparts[:ver] || refparts[:ver] == parts[:ver]) &&
           (!refparts[:rev] || refparts[:rev] == parts[:rev]) &&
-          refparts[:draft] == parts[:draft] && refparts[:add] == parts[:add]) ||
+          refparts[:draft] == parts[:draft] && refparts[:add] == parts[:add] &&
+          refparts[:res] == parts[:res]) ||
           item.hit[:title]&.include?(text.sub(/^NIST\s/, ""))
       end
     end
@@ -87,6 +84,7 @@ module RelatonNist
         # (?:\s(?<rev2>Rev\.\s\d+))?
         add: match(/\sAdd(?:endum)?(?<val>\d*)/, code),
         draft: !match(/\((?:Retired\s)?Draft\)/, code).nil?,
+        res: match(/(?<=\s)RES/, text),
       }
     end
 
@@ -123,6 +121,7 @@ module RelatonNist
         rev: match(/(?:(?:(?<dl>\.)|[^a-z])r|\sRev\.\s)(?(<dl>)-)(?<val>\d+)/, text),
         add: match(/(?:(?<dl>\.)?add|\/Add)(?(<dl>)-)(?<val>\d*)/, text),
         draft: !(match(/\((?:Draft|PD)\)/, text).nil? && @opts[:stage].nil?),
+        res: match(/(?<=\s)RES/, text),
         # prt2: match(/(?<=\s)Part\s[A-Z\d]+/, text),
         # vol2: match(/(?<=\s)Vol\.\s\d+/, text),
         # ver2: match(/(?<=\s)Ver\.\s\d+/, text),
@@ -161,27 +160,6 @@ module RelatonNist
       end
     end
 
-    #
-    # Return short version of ID part with removed "-" or convert long version to short.
-    # Converts "pt-1" to "pt1" and "Part 1" to "pt1", "v-1" to "v1" and "Vol. 1" to "v1",
-    #   "ver-1" to "ver1" and "Ver. 1" to "ver1", "r-1" to "r1" and "Rev. 1" to "r1".
-    #
-    # @param parts [MatchData] parts of ID
-    # @param name [String] name of ID part
-    #
-    # @return [String, nil]
-    #
-    # def long_to_short(parts, name)
-    #   short = parts["#{name}1".to_sym]
-    #   return short.sub(/-/, "") if short
-
-    #   long_name = "#{name}2"
-    #   long = parts[long_name.to_sym]
-    #   return unless long
-
-    #   long.sub(/Part\s/, "pt").sub(/Vol\.\s/, "v").sub(/Rev\.\s/, "r").sub(/(Ver\.|Version)\s/, "ver")
-    # end
-
     #
     # Sort hits by sort_value and release date
     #
@@ -261,10 +239,10 @@ module RelatonNist
       ref = "#{refparts[:series]} #{refparts[:code]}"
       d = Date.strptime year, "%Y" if year
       statuses = %w[draft-public draft-prelim]
-      data.select do |doc|
+      PubsExport.instance.data.select do |doc|
         next unless match_year?(doc, d)
 
-        if /PD/.match? @opts[:stage]
+        if @opts[:stage]&.include?("PD")
           next unless statuses.include? doc["status"]
         else
           next unless doc["status"] == "final"
@@ -287,46 +265,5 @@ module RelatonNist
       idate = RelatonBib.parse_date doc["issued-date"], false
       idate.between? date, date.next_year.prev_day
     end
-
-    #
-    # Fetches json data form server
-    #
-    # @return [Array<Hash>] json data
-    #
-    def data
-      ctime = File.ctime DATAFILE if File.exist? DATAFILE
-      if !ctime || ctime.to_date < Date.today || File.size(DATAFILE).zero?
-        fetch_data(ctime)
-      end
-      unzip
-    end
-
-    #
-    # Fetch data form server and save it to file
-    #
-    # @prarm ctime [Time, nil] file creation time
-    #
-    def fetch_data(ctime)
-      if !ctime || ctime < OpenURI.open_uri("#{PUBS_EXPORT}.meta").last_modified
-        @data = nil
-        uri_open = URI.method(:open) || Kernel.method(:open)
-        FileUtils.mkdir_p DATAFILEDIR
-        IO.copy_stream(uri_open.call("#{PUBS_EXPORT}.zip"), DATAFILE)
-      end
-    end
-
-    #
-    # upack zip file
-    #
-    # @return [Array<Hash>] json data
-    #
-    def unzip
-      return @data if @data
-
-      Zip::File.open(DATAFILE) do |zf|
-        @data = JSON.parse zf.first.get_input_stream.read
-      end
-      @data
-    end
   end
 end

data/lib/relaton_nist/pubs_export.rb

@@ -0,0 +1,58 @@
+module RelatonNist
+  class PubsExport
+    include Singleton
+
+    DOMAIN = "https://csrc.nist.gov".freeze
+    PUBS_EXPORT = URI.join(DOMAIN, "/CSRC/media/feeds/metanorma/pubs-export")
+    DATAFILEDIR = File.expand_path ".relaton/nist", Dir.home
+    DATAFILE = File.expand_path "pubs-export.zip", DATAFILEDIR
+
+    def initialize
+      @mutex = Mutex.new
+    end
+
+    #
+    # Fetches json data form server
+    #
+    # @return [Array<Hash>] json data
+    #
+    def data
+      @mutex.synchronize do
+        @data ||= begin
+          ctime = File.ctime DATAFILE if File.exist? DATAFILE
+          if !ctime || ctime.to_date < Date.today || File.size(DATAFILE).zero?
+            fetch_data(ctime)
+          end
+          unzip
+        end
+      end
+    end
+
+    private
+
+    #
+    # Fetch data form server and save it to file
+    #
+    # @prarm ctime [Time, nil] file creation time
+    #
+    def fetch_data(ctime)
+      if !ctime || ctime < OpenURI.open_uri("#{PUBS_EXPORT}.meta").last_modified
+        @data = nil
+        uri_open = URI.method(:open) || Kernel.method(:open)
+        FileUtils.mkdir_p DATAFILEDIR
+        IO.copy_stream(uri_open.call("#{PUBS_EXPORT}.zip"), DATAFILE)
+      end
+    end
+
+    #
+    # upack zip file
+    #
+    # @return [Array<Hash>] json data
+    #
+    def unzip
+      Zip::File.open(DATAFILE) do |zf|
+        JSON.parse zf.first.get_input_stream.read
+      end
+    end
+  end
+end

data/lib/relaton_nist/version.rb

@@ -1,3 +1,3 @@
 module RelatonNist
-  VERSION = "1.14.1".freeze
+  VERSION = "1.14.2".freeze
 end

data/lib/relaton_nist.rb

@@ -1,6 +1,8 @@
+require "singleton"
 require "relaton_nist/version"
 require "relaton_nist/nist_bibliography"
 require "relaton_nist/data_fetcher"
+require "relaton_nist/pubs_export"
 
 # if defined? Relaton
 #   require_relative "relaton/processor"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-nist
 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-01-14 00:00:00.000000000 Z
+date: 2023-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
@@ -185,6 +185,7 @@ files:
 - lib/relaton_nist/nist_bibliographic_item.rb
 - lib/relaton_nist/nist_bibliography.rb
 - lib/relaton_nist/processor.rb
+- lib/relaton_nist/pubs_export.rb
 - lib/relaton_nist/scrapper.rb
 - lib/relaton_nist/series.yaml
 - lib/relaton_nist/version.rb