relaton-nist 1.14.7 → 1.14.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af449d7420c8250ae7df9a33a292ac5278150c9159c05252650707746284feaa
-  data.tar.gz: f01fceceb91e3e91e0cb6b532fa2b63fdecfb88d18ddc9879f98b10733637232
+  metadata.gz: d70d5c4814d320a0e7de37ffa6c87f70303132fc93a667e1ea7397cda9e3b2cd
+  data.tar.gz: 4ac72228dfae2aeff749b90765235c374385647e16746d6efafc43ce3a86a0d6
 SHA512:
-  metadata.gz: 158958c46a83455aa5a14ec3f9c1f84a6bd70870fb2f1e85dc37d2200d8a3b3a0a4bf824f924ac775f54d1204656f0f40c078f6b71a737efd33d46f93fc681c3
-  data.tar.gz: c999b71e25e1aef1f5d3a066db3f0720149c23a2cca13a75fa453201a06aabc7cf21a4b313b21f8e98dbeece8803c8f65ba0a3d79e0d8c942244d07fe656341d
+  metadata.gz: 2128557619cae8f53fd3d80839303597d77e85065a58618a49302dd8593982ba374a7b73ab87fbe6c27661af923857f2382688990ff64acf27d2dd4607a8e0b5
+  data.tar.gz: 8a909befb6b35b64b9f48cbcbcbef0a9ef42f336709a9a628844bf29ac94266ba466067ea3636c57e92e8c5e789b9b65cbc7317941697e288ae65a7a619da55f

data/.github/workflows/release.yml

@@ -7,7 +7,8 @@ on:
     inputs:
       next_version:
         description: |
-          Next release version. Possible values: x.y.z, major, minor, patch or pre|rc|etc
+          Next release version. Possible values: x.y.z, major, minor, patch (or pre|rc|etc).
+          Also, you can pass 'skip' to skip 'git tag' and do 'gem push' for the current version
         required: true
         default: 'skip'
   repository_dispatch:

data/lib/relaton_nist/hit_collection.rb

@@ -56,13 +56,13 @@ module RelatonNist
     def search_filter # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity,Metrics/MethodLength
       @array.select do |item|
         parts = doi_parts(item.hit[:json]) || code_parts(item.hit[:code])
-        (refparts[:code] && [parts[:series], item.hit[:series]].include?(refparts[:series]) &&
+        refparts[:code] && [parts[:series], item.hit[:series]].include?(refparts[:series]) &&
           refparts[:code].casecmp(parts[:code].upcase).zero? &&
-          (refparts[:prt] == parts[:prt]) &&
+          refparts[:prt] == parts[:prt] &&
           (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])
+          refparts[:draft] == parts[:draft] && refparts[:add] == parts[:add]
       end
     end
 
@@ -71,8 +71,8 @@ module RelatonNist
     def code_parts(code) # rubocop:disable Metrics/MethodLength
       {
         # prefix: match(/^(?:NIST|NBS)\s?/, code),
-        series: match(/(?<val>(?:SP|FIPS|IR|ITL\sBulletin|White\sPaper))\s/, code),
-        code: match(/(?<val>[0-9-]{3,}[A-Z]?)/, code),
+        series: match(/(?<val>(?:SP|FIPS|CSWP|IR|ITL\sBulletin|White\sPaper))\s/, code),
+        code: match(/(?<val>[0-9-]+(?:(?!(?:ver|r|v|pt)\d|-add\d?)[A-Za-z-])*)/, code),
         prt: match(/(?:pt|\sPart\s)(?<val>\d+)/, code),
         vol: match(/(?:v|\sVol\.\s)(?<val>\d+)/, code),
         ver: match(/(?:ver|\sVer\.\s|Version\s)(?<val>[\d.]+)/, code),
@@ -81,7 +81,7 @@ module RelatonNist
         # (?:\s(?<vol2>Vol\.\s\d+))?
         # (?:\s(?<ver2>(?:Ver\.|Version)\s[\d.]+))?
         # (?:\s(?<rev2>Rev\.\s\d+))?
-        add: match(/\sAdd(?:endum)?(?<val>\d*)/, code),
+        add: match(/(?:-add|\sAdd)(?:endum)?(?<val>\d*)/, code),
         draft: !match(/\((?:Retired\s)?Draft\)/, code).nil?,
       }
     end
@@ -92,14 +92,14 @@ module RelatonNist
       id = json["doi"].split("/").last
       {
         # prefix: match(/^(?:NIST|NBS)\./, id),
-        series: match(/(?:SP|FIPS|IR|ITL\sBulletin|White\sPaper)(?=\.)/, id),
-        code: match(/(?<=\.)\d{3,}(?:-\d+)*(?:[[:alpha:]](?!\d|raft|er|t?\d))?/, id),
+        series: match(/(?:SP|FIPS|CSWP|IR|ITL\sBulletin|White\sPaper)(?=\.)/, id),
+        code: match(/(?<=\.)\d+(?:-\d+)*(?:[[:alpha:]](?!\d|raft|er|t?\d))?/, id),
         prt: match(/pt?(?<val>\d+)/, id),
         vol: match(/v(?<val>\d+)(?!\.\d)/, id),
         ver: match(/v(?:er)?(?<val>[\d.]+)/, id),
         rev: match(/r(?<val>\d+)/, id),
         add: match(/-Add(?<val>\d*)/, id),
-        draft: !match(/-draft/, id).nil?,
+        draft: !match(/\.ipd/, id).nil?,
       }
     end
 
@@ -110,9 +110,9 @@ module RelatonNist
     #
     def refparts # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
       @refparts ||= {
-        perfix: match(/^(NIST|NBS)\s?/, text),
-        series: match(/(SP|FIPS|IR|ITL\sBulletin|White\sPaper)(?=\.|\s)/, text),
-        code: match(/(?<=\.|\s)[0-9-]{3,}[A-Z]?/, text),
+        perfix: match(/^(NIST|NBS)/, text),
+        series: match(/(SP|FIPS|CSWP|IR|ITL\sBulletin|White\sPaper)(?=\.|\s)/, text),
+        code: match(/(?<=\.|\s)[0-9-]+(?:(?!(ver|r|v|pt)\d|-add\d?)[A-Za-z-])*/, text),
         prt: match(/(?:(?<dl>\.)?pt(?(<dl>)-)|\sPart\s)(?<val>[A-Z\d]+)/, text),
         vol: match(/(?:(?<dl>\.)?v(?(<dl>)-)|\sVol\.\s)(?<val>\d+)/, text),
         ver: match(/(?:(?<dl>\.)?\s?ver|\sVer\.\s)(?<val>\d(?(<dl>)[-\d]|[.\d])*)/, text)&.gsub(/-/, "."),
@@ -149,10 +149,11 @@ module RelatonNist
     #
     def full_ref # rubocop:disable Metrics/AbcSize
       @full_ref ||= begin
-        ref = "#{refparts[:perfix]}#{refparts[:series]} #{refparts[:code]}"
-        ref += "pt#{refparts[:prt]}" if refparts[:prt] # long_to_short(refparts, "prt").to_s
-        ref += "ver#{refparts[:ver]}" if refparts[:ver] # long_to_short(refparts, "vol").to_s
+        ref = [refparts[:perfix], refparts[:series], refparts[:code]].compact.join " "
+        ref += "pt#{refparts[:prt]}" if refparts[:prt]
+        ref += "ver#{refparts[:ver]}" if refparts[:ver]
         ref += "v#{refparts[:vol]}" if refparts[:vol]
+        ref += "r#{refparts[:rev]}" if refparts[:rev]
         ref
       end
     end
@@ -183,17 +184,20 @@ module RelatonNist
       ref = full_ref
       # fn = ref.gsub(%r{[/\s:.]}, "_").upcase
       index = Relaton::Index.find_or_create :nist, url: "#{GHNISTDATA}index-v1.zip", file: INDEX_FILE
-      row = index.search { |r| r[:id] == ref }.min_by { |r| r[:id] }
-      return [] unless row
+      rows = index.search(ref).sort_by { |r| r[:id] }
+      # return [] unless row
 
-      yaml = OpenURI.open_uri "#{GHNISTDATA}#{row[:file]}"
-      hash = YAML.safe_load yaml
-      hash["fetched"] = Date.today.to_s
-      bib = RelatonNist::NistBibliographicItem.from_hash hash
-      id = bib.docidentifier.find(&:primary).id
-      hit = Hit.new({ code: id }, self)
-      hit.fetch = bib
-      [hit]
+      # yaml = OpenURI.open_uri "#{GHNISTDATA}#{row[:file]}"
+      # hash = YAML.safe_load yaml
+      # hash["fetched"] = Date.today.to_s
+      # bib = RelatonNist::NistBibliographicItem.from_hash hash
+      # id = bib.docidentifier.find(&:primary).id
+
+      rows.map do |row|
+        Hit.new({ code: row[:id], path: row[:file] }, self)
+      end
+      # hit.fetch = bib
+      # [hit]
     rescue OpenURI::HTTPError => e
       return [] if e.io.status[0] == "404"
 
@@ -221,7 +225,7 @@ module RelatonNist
       return json["docidentifier"] unless parts
 
       id = parts[:code]
-      id = "#{parts[:series]} #{id}" if parts[:series]
+      id = "NIST #{parts[:series]} #{id}" if parts[:series]
       id += " Part #{parts[:prt]}" if parts[:prt]
       id += " Vol. #{parts[:vol]}" if parts[:vol]
       id += " Ver. #{parts[:ver]}" if parts[:ver]
@@ -263,8 +267,9 @@ module RelatonNist
     def match_year?(doc, date)
       return true unless year
 
-      idate = RelatonBib.parse_date doc["issued-date"], false
-      idate.between? date, date.next_year.prev_day
+      d = doc["issued-date"] || doc["published-date"]
+      pidate = RelatonBib.parse_date d, false
+      pidate.between? date, date.next_year.prev_day
     end
   end
 end

data/lib/relaton_nist/nist_bibliography.rb

@@ -47,9 +47,9 @@ module RelatonNist
           if date2
             case date2
             when /\w+\s\d{4}/
-              opts[:issued_date] = Date.strptime date2, "%B %Y"
+              opts[:date] = Date.strptime date2, "%B %Y"
             when /\w+\s\d{2},\s\d{4}/
-              opts[:updated_date] = Date.strptime date2, "%B %d, %Y"
+              opts[:date] = Date.strptime date2, "%B %d, %Y"
             end
           end
           opts[:stage] = stage if stage
@@ -117,16 +117,9 @@ module RelatonNist
                     end
         result.each_slice(3) do |s| # ISO website only allows 3 connections
           fetch_pages(s, 3).each_with_index do |r, _i|
-            if opts[:issued_date]
-              ids = r.date.select do |d|
-                d.type == "issued" && d.on(:date) == opts[:issued_date]
-              end
-              next if ids.empty?
-            elsif opts[:updated_date]
-              pds = r.date.select do |d|
-                d.type == "published" && d.on(:date) == opts[:updated_date]
-              end
-              next if pds.empty?
+            if opts[:date]
+              dates = r.date.select { |d| d.on(:date) == opts[:date] }
+              next if dates.empty?
             end
             next if iter && r.status.iteration != iteration
             return { ret: r } if !year

data/lib/relaton_nist/scrapper.rb

@@ -11,13 +11,24 @@ module RelatonNist
       # @param hit_data [Hash]
       # @return [Hash]
       def parse_page(hit_data)
+        hit_data[:path] ? fetch_gh(hit_data) : parse_json(hit_data)
+      end
+
+      def fetch_gh(hit_data)
+        yaml = OpenURI.open_uri "#{HitCollection::GHNISTDATA}#{hit_data[:path]}"
+        hash = YAML.safe_load yaml
+        hash["fetched"] = Date.today.to_s
+        NistBibliographicItem.from_hash hash
+      end
+
+      def parse_json(hit_data)
         item_data = from_json hit_data
         titles = fetch_titles(hit_data)
-        unless /^(SP|NISTIR|FIPS) /.match? item_data[:docid][0].id
-          item_data[:docid][0] = RelatonBib::DocumentIdentifier.new(
-            id: titles[0][:content].upcase, type: "NIST", primary: true,
-          )
-        end
+        # unless /^(SP|NISTIR|FIPS) /.match? item_data[:docid][0].id
+        #   item_data[:docid][0] = RelatonBib::DocumentIdentifier.new(
+        #     id: titles[0][:content].upcase, type: "NIST", primary: true,
+        #   )
+        # end
         item_data[:fetched] = Date.today.to_s
         item_data[:type] = "standard"
         item_data[:title] = titles

data/lib/relaton_nist/version.rb

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

metadata

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