relaton-nist 1.14.6 → 1.14.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff158dab9df4bfc2254789771db9ca74bc422b9d6ac78351da0ccbca1d858815
-  data.tar.gz: e7ef8d2cb1ff797095f7c6646194610ffe7bab67f97d909c9d54d75d9f0552c3
+  metadata.gz: af449d7420c8250ae7df9a33a292ac5278150c9159c05252650707746284feaa
+  data.tar.gz: f01fceceb91e3e91e0cb6b532fa2b63fdecfb88d18ddc9879f98b10733637232
 SHA512:
-  metadata.gz: ef6f0be37367d7e71ac0783be8252219a9a49e7affe27bfcef78c21929d64c10b2f4cba081a4515d75e64bfccffed21dd72848d2653594363f9e4fa753c7c002
-  data.tar.gz: f9b24bb62b115b11f291a9514420426a758d3207062e4bd75fc09169f32338d3891ca802441df405ce9b4ab159f39aea2762c458e811c30e87523e9835a94dbc
+  metadata.gz: 158958c46a83455aa5a14ec3f9c1f84a6bd70870fb2f1e85dc37d2200d8a3b3a0a4bf824f924ac775f54d1204656f0f40c078f6b71a737efd33d46f93fc681c3
+  data.tar.gz: c999b71e25e1aef1f5d3a066db3f0720149c23a2cca13a75fa453201a06aabc7cf21a4b313b21f8e98dbeece8803c8f65ba0a3d79e0d8c942244d07fe656341d

data/README.adoc

@@ -43,6 +43,14 @@ sources:
 . bibliographic feed from NIST CSRC
 . NIST Library dataset
 
+The NIST CSRC provides:
+
+* NIST SP 800-*
+* NIST SP 500-*
+* NIST SP 1800-*
+* NIST FIPS {31, 39, 41, 46, 46-$$*$$, 48, 65, 73, 74, 81, 83, 87, 102, 112, 113, 139, 140-$$*$$, 141, 171, 180, 180-$$*$$, 181, 186, 186-$$*$$, 188, 190, 191, 196, 197, 198, 198-1, 199, 200, 201, 201-*, 202}
+
+The NIST Library dataset provides documents listed in the https://github.com/relaton/relaton-data-nist/blob/main/index-v1.yaml[index].
 
 == Installation
 

data/lib/relaton_nist/data_fetcher.rb

@@ -36,9 +36,16 @@ module RelatonNist
       ]
     end
 
+    #
+    # Parse document's ID from XML
+    #
+    # @param [Nokogiri::XML::Element] doc XML element
+    #
+    # @return [String] document's ID
+    #
     def pub_id(doc)
       # anchor(doc).gsub(".", " ")
-      fetch_doi(doc).split("/")[1..].join("/").gsub(".", " ")
+      fetch_doi(doc).split("/")[1..].join("/").gsub(".", " ").sub(/^nist\sir/, "NIST IR")
     end
 
     def fetch_doi(doc) # rubocop:disable Metrics/CyclomaticComplexity
@@ -269,8 +276,6 @@ module RelatonNist
     # @return [Array<RelatonBib::Series>] series
     #
     def fetch_series(doc)
-      series_path = File.expand_path("series.yaml", __dir__)
-      series = YAML.load_file series_path
       prf, srs, num = pub_id(doc).split
       sname = series[srs] || srs
       title = RelatonBib::TypedTitleString.new(content: "#{prf} #{sname}")
@@ -278,6 +283,10 @@ module RelatonNist
       [RelatonBib::Series.new(title: title, abbreviation: abbr, number: num)]
     end
 
+    def series
+      @series ||= YAML.load_file File.expand_path("series.yaml", __dir__)
+    end
+
     #
     # Save document
     #

data/lib/relaton_nist/hit.rb

@@ -19,24 +19,24 @@ module RelatonNist
     #
     # @return [Iteger] sorting weigth
     #
-    def sort_value # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity
-      @sort_value ||= begin
-        sort_phrase = [hit[:series], hit[:code], hit[:title]].join " "
-        corr = hit_collection&.text&.split&.map do |w|
-          if w =~ /\w+/ &&
-              sort_phrase =~ Regexp.new(Regexp.escape(w), Regexp::IGNORECASE)
-            1
-          else 0
-          end
-        end&.sum.to_i
-        corr + case hit[:status]
-               when "final" then 4
-               when "withdrawn" then 3
-               when "draft" then 2
-               when "draft (obsolete)" then 1
-               else 0
-               end
-      end
-    end
+    # def sort_value # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity
+    #   @sort_value ||= begin
+    #     sort_phrase = [hit[:series], hit[:code]].join " "
+    #     corr = hit_collection&.text&.split&.map do |w|
+    #       if w =~ /\w+/ &&
+    #           sort_phrase =~ Regexp.new(Regexp.escape(w), Regexp::IGNORECASE)
+    #         1
+    #       else 0
+    #       end
+    #     end&.sum.to_i
+    #     corr + case hit[:status]
+    #            when "final" then 4
+    #            when "withdrawn" then 3
+    #            when "draft" then 2
+    #            when "draft (obsolete)" then 1
+    #            else 0
+    #            end
+    #   end
+    # end
   end
 end

data/lib/relaton_nist/hit_collection.rb

@@ -59,9 +59,9 @@ module RelatonNist
         (refparts[:code] && [parts[:series], item.hit[:series]].include?(refparts[:series]) &&
           refparts[:code].casecmp(parts[:code].upcase).zero? &&
           (refparts[:prt] == parts[:prt]) &&
-          (refparts[:vol] == parts[:vol]) &&
-          (refparts[:ver] == parts[:ver]) &&
-          (refparts[:rev] == parts[:rev]) &&
+          (refparts[:vol].nil? || refparts[:vol] == parts[:vol]) &&
+          (refparts[:ver].nil? || refparts[:ver] == parts[:ver]) &&
+          (refparts[:rev].nil? || refparts[:rev] == parts[:rev]) &&
           refparts[:draft] == parts[:draft] && refparts[:add] == parts[:add])
       end
     end
@@ -164,11 +164,10 @@ module RelatonNist
     #
     def sort_hits!
       @array.sort! do |a, b|
-        if a.sort_value == b.sort_value
-          (b.hit[:release_date] - a.hit[:release_date]).to_i
-        else
-          b.sort_value - a.sort_value
-        end
+        code = a.hit[:code] <=> b.hit[:code]
+        next code unless code.zero?
+
+        b.hit[:release_date] <=> a.hit[:release_date]
       end
       self
     end
@@ -191,7 +190,8 @@ module RelatonNist
       hash = YAML.safe_load yaml
       hash["fetched"] = Date.today.to_s
       bib = RelatonNist::NistBibliographicItem.from_hash hash
-      hit = Hit.new({ code: text }, self)
+      id = bib.docidentifier.find(&:primary).id
+      hit = Hit.new({ code: id }, self)
       hit.fetch = bib
       [hit]
     rescue OpenURI::HTTPError => e

data/lib/relaton_nist/nist_bibliography.rb

@@ -12,7 +12,7 @@ module RelatonNist
   class NistBibliography
     class << self
       #
-      # Search NIST docuemnts by reference
+      # Search NIST documents by reference
       #
       # @param text [String] reference
       #

data/lib/relaton_nist/series.yaml

@@ -22,7 +22,7 @@ MONO: Monographs
 MP: Miscellaneous Publications
 NCSTAR: National Construction Safety Team Act Reports
 NSRDS: National Standard Reference Data Series
-IR: NISTIRs (Interagency/Internal Reports)
+IR: IR (Interagency/Internal Reports)
 OWMWP: Office of Weights and Measures White Papers
 PC: Photographic Circulars
 RPT: NBS Reports

data/lib/relaton_nist/version.rb

@@ -1,3 +1,3 @@
 module RelatonNist
-  VERSION = "1.14.6".freeze
+  VERSION = "1.14.7".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-nist
 version: !ruby/object:Gem::Version
-  version: 1.14.6
+  version: 1.14.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-06-06 00:00:00.000000000 Z
+date: 2023-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: relaton-bib