relaton-nist 1.12.3 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef6eeb64c2dba6079789c3192b6c335f3726af48bd43b580bc5c05cf8c8b12f9
-  data.tar.gz: c58fa9cf63309bd404ad04797b92f1dd3f2cc0635cb061ee1211cfc9bf8e841c
+  metadata.gz: c997f338c657a003a0bff7e75b650f59b86d4a72026a0b12734357bc48c10cdc
+  data.tar.gz: 5d76af2d37037bb027f9875180bbcc967ca133260eb4a5494112fe81cccf5e04
 SHA512:
-  metadata.gz: b59ef8bf5ce4d0b637cb0072cb6d18c4ddbfa07170a95095df0ed95395039c19cc2f59b9a28d852dd59f357e204b3ec50c8825fb30f5049106edc0705696b6da
-  data.tar.gz: 22e2b8ede68f9cdd45bd921d06ba4f36c824bbc8115f3a40960d8b9f8c6f03efa8ff20d310771f8b4db30a388794654fd9e58313f6e10f4677b0945f4b67e8f8
+  metadata.gz: 5971a572c9a7a5aefb4087f96787255687195c3e0cc75a49f740b57af1bb05fa48f56c2bd721cbb4b5aa7e5178cb93048c97a8782d152b4b040dd3158129ba14
+  data.tar.gz: f266510c36ce07666a74b9881e439df01067f6baee05e03c267ce3754bef5dcf24b7391082a4fdc1d8122121f17b1fc30e3ba8377dadd86692ff80cd8efa962d

data/README.adoc

@@ -1,4 +1,4 @@
-= RelatonNist: retrieve NIST Standards for bibliographic use using the BibliographicItem model
+= Relaton for NIST: bibliographic retrieval of NIST publications
 
 image:https://img.shields.io/gem/v/relaton-nist.svg["Gem Version", link="https://rubygems.org/gems/relaton-nist"]
 image:https://github.com/relaton/relaton-nist/workflows/macos/badge.svg["Build Status (macOS)", link="https://github.com/relaton/relaton-nist/actions?workflow=macos"]
@@ -8,10 +8,41 @@ image:https://codeclimate.com/github/relaton/relaton-nist/badges/gpa.svg["Code C
 image:https://img.shields.io/github/issues-pr-raw/relaton/relaton-nist.svg["Pull Requests", link="https://github.com/relaton/relaton-nist/pulls"]
 image:https://img.shields.io/github/commits-since/relaton/relaton-nist/latest.svg["Commits since latest",link="https://github.com/relaton/relaton-nist/releases"]
 
+== Purpose
 
-RelatonNist is a Ruby gem that implements the https://github.com/metanorma/metanorma-model-iso#iso-bibliographic-item[IsoBibliographicItem model].
+`relaton-nist` provides bibliographic information of NIST publications using the
+https://github.com/metanorma/metanorma-model-nist#nist-bibliographic-item-model[NistBibliographicItem model].
+
+Relaton for NIST has been developed in cooperation with the NIST Cybersecurity
+Resource Center (CSRC) and the Computer Security Division (ITL/CSD).
+
+== Data sources
+
+Relaton for NIST retrieves bibliographic information from two sources:
+
+* bibliographic feed from the NIST Cybersecurity Resource Center (CSRC) of
+all CSRC publications (in Relaton JSON)
+* bibliographic dataset from the NIST Library through the Information Services
+Office (ISO) that contains information about all NIST Technical Publications
+(https://github.com/usnistgov/NIST-Tech-Pubs[GitHub])
+
+Bibliographic information offered through CSRC are provided with enhanced
+metadata that is not available at the NIST Library dataset, including:
+
+* public drafts (the NIST Library dataset only contains final publications)
+* revision information: revision number, iteration
+* document stage information: retired, withdrawn, etc.
+* bibliographic dates, including issued date, updated date, published date,
+  obsolete date, commenting period
+* document relationships: supersession and replacements
+* contacts: enhanced name parts and affiliation information
+
+Relaton for NIST therefore uses the following order of priority for the data
+sources:
+
+. bibliographic feed from NIST CSRC
+. NIST Library dataset
 
-You can use it to retrieve metadata of NIST Standards from https://csrc.nist.gov, and access such metadata through the `IsoBibliographicItem` object.
 
 == Installation
 

data/grammars/biblio.rng

@@ -225,9 +225,9 @@
         <zeroOrMore>
           <ref name="forename"/>
         </zeroOrMore>
-        <zeroOrMore>
-          <ref name="initial"/>
-        </zeroOrMore>
+        <optional>
+          <ref name="formatted-initials"/>
+        </optional>
         <ref name="surname"/>
         <zeroOrMore>
           <ref name="addition"/>
@@ -247,8 +247,8 @@
       <ref name="LocalizedString"/>
     </element>
   </define>
-  <define name="initial">
-    <element name="initial">
+  <define name="formatted-initials">
+    <element name="formatted-initials">
       <ref name="LocalizedString"/>
     </element>
   </define>
@@ -264,6 +264,9 @@
   </define>
   <define name="forename">
     <element name="forename">
+      <optional>
+        <attribute name="initial"/>
+      </optional>
       <ref name="LocalizedString"/>
     </element>
   </define>

data/grammars/isodoc.rng

@@ -69,6 +69,17 @@
         </zeroOrMore>
       </element>
     </define>
+    <define name="AdmonitionType">
+      <choice>
+        <value>warning</value>
+        <value>note</value>
+        <value>tip</value>
+        <value>important</value>
+        <value>caution</value>
+        <value>statement</value>
+        <value>editorial</value>
+      </choice>
+    </define>
     <define name="index">
       <element name="index">
         <optional>
@@ -1274,7 +1285,12 @@
   </define>
   <define name="span">
     <element name="span">
-      <attribute name="class"/>
+      <optional>
+        <attribute name="class"/>
+      </optional>
+      <optional>
+        <attribute name="style"/>
+      </optional>
       <oneOrMore>
         <ref name="TextElement"/>
       </oneOrMore>
@@ -2493,6 +2509,16 @@
           <text/>
         </element>
       </optional>
+      <optional>
+        <element name="amendment">
+          <text/>
+        </element>
+      </optional>
+      <optional>
+        <element name="corrigendum">
+          <text/>
+        </element>
+      </optional>
       <optional>
         <element name="language">
           <text/>

data/lib/relaton_nist/data_fetcher.rb

@@ -137,26 +137,10 @@ module RelatonNist
 
     # @param doc [Nokogiri::XML::Element]
     # @return [Array<Hash>]
-    def fetch_contributor(doc) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
+    def fetch_contributor(doc)
       contribs = doc.xpath("contributors/person_name").map do |p|
-        forename = []
-        initial = []
-        p.at("given_name")&.text&.split&.each do |fn|
-          if /^(?<init>\w)\.?$/ =~ fn
-            initial << RelatonBib::LocalizedString.new(init, doc["language"], "Latn")
-          else
-            forename << RelatonBib::LocalizedString.new(fn, doc["language"], "Latn")
-          end
-        end
-        sname = p.at("surname").text
-        surname = RelatonBib::LocalizedString.new sname, doc["language"], "Latn"
-        ident = p.xpath("ORCID").map do |id|
-          RelatonBib::PersonIdentifier.new "orcid", id.text
-        end
-        fullname = RelatonBib::FullName.new(
-          surname: surname, forename: forename, initial: initial, identifier: ident,
-        )
-        person = RelatonBib::Person.new name: fullname, affiliation: affiliation(doc)
+        person = RelatonBib::Person.new(name: fullname(p, doc),
+                                        affiliation: affiliation(doc))
         { entity: person, role: [{ type: p["contributor_role"] }] }
       end
       contribs + doc.xpath("publisher").map do |p|
@@ -164,6 +148,73 @@ module RelatonNist
       end
     end
 
+    #
+    # Create full name object from person name element.
+    #
+    # @param [Nokogiri::XML::Element] person name element
+    # @param [Nokogiri::XML::Element] doc document element
+    #
+    # @return [RelatonBib::FullName] full name object
+    #
+    def fullname(person, doc)
+      forename, initials = forename_initial(person, doc)
+      surname = localized_string person.at("surname").text, doc
+      ident = person.xpath("ORCID").map do |id|
+        RelatonBib::PersonIdentifier.new "orcid", id.text
+      end
+      RelatonBib::FullName.new(surname: surname, forename: forename,
+                               initials: initials, identifier: ident)
+    end
+
+    #
+    # Create forename and initials objects from person name element.
+    #
+    # @param [Nokogiri::XML::Element] person person name element
+    # @param [Nokogiri::XML::Element] doc document element
+    #
+    # @return [Array<Array<RelatonBib::LocalizedString>>] forename and initials
+    #
+    def forename_initial(person, doc) # rubocop:disable Metrics/MethodLength
+      fnames = []
+      fname = person.at("given_name")&.text
+      if fname
+        if /^(?<inits>(?:\w[.\s]+|[A-Z]{1,2}$)+)$/ =~ fname
+          ints = inits.split(/[.\s]*/)
+          fnames << forename(doc, fname, ints.shift)
+          ints.each { |i| fnames << forename(doc, nil, i) }
+        else fnames << forename(doc, fname)
+        end
+      end
+      [fnames, localized_string(inits, doc)]
+    end
+
+    #
+    # Create forename object
+    #
+    # @param [Nokogiri::XML::Element] doc document element
+    # @param [String, nil] cnt forename content
+    # @param [String, nil] init initial content
+    #
+    # @return [RelatonBib::Forename] forename object
+    #
+    def forename(doc, cnt, init = nil)
+      RelatonBib::Forename.new(
+        content: cnt, language: doc["language"], script: "Latn", initial: init,
+      )
+    end
+
+    #
+    # Create localized string
+    #
+    # @param [String] content content of string
+    # @param [Nokogiri::XML::Elemrnt] doc XML element
+    #
+    # @return [RelatonBib::LocalizedString] localized string
+    #
+    def localized_string(content, doc)
+      RelatonBib::LocalizedString.new content, doc["language"], "Latn"
+    end
+
     #
     # Create publisher organization
     #

data/lib/relaton_nist/hit.rb

@@ -5,16 +5,23 @@ module RelatonNist
   class Hit < RelatonBib::Hit
     attr_writer :fetch
 
+    #
     # Parse page.
-    # @return [RelatonNist::NistBliographicItem]
+    #
+    # @return [RelatonNist::NistBliographicItem] bibliographic item
+    #
     def fetch
       @fetch ||= Scrapper.parse_page @hit
     end
 
-    # @return [Iteger]
+    #
+    # Calculate sorting weigth of hit by series, code, title, addendum, and status
+    #
+    # @return [Iteger] sorting weigth
+    #
     def sort_value # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity
       @sort_value ||= begin
-        sort_phrase = [hit[:serie], hit[:code], hit[:title]].join " "
+        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)

data/lib/relaton_nist/hit_collection.rb

@@ -7,7 +7,7 @@ require "addressable/uri"
 require "open-uri"
 
 module RelatonNist
-  # Page of hit collection.
+  # Hit collection.
   class HitCollection < RelatonBib::HitCollection
     DOMAIN = "https://csrc.nist.gov"
     PUBS_EXPORT = URI.join(DOMAIN, "/CSRC/media/feeds/metanorma/pubs-export")
@@ -15,18 +15,135 @@ module RelatonNist
     DATAFILE = File.expand_path "pubs-export.zip", DATAFILEDIR
     GHNISTDATA = "https://raw.githubusercontent.com/relaton/relaton-data-nist/main/data/"
 
+    #
+    # Create hits collection instance and search hits
+    #
+    # @param [Hash] opts options
+    # @option opts [String] :stage stage of document
+    #
+    # @return [RelatonNist::HitCollection] hits collection
+    #
     def self.search(text, year = nil, opts = {})
       new(text, year).search(opts)
     end
 
+    #
+    # Search nits in JSON file or GitHub repo
+    #
+    # @param [Hash] opts options
+    # @option opts [String] :stage stage of document
+    #
+    # @return [RelatonNist::HitCollection] hits collection
+    #
     def search(opts)
       @array = from_json(**opts)
       @array = from_ga unless @array.any?
       sort_hits!
     end
 
+    #
+    # Filter hits by reference's parts
+    #
+    # @return [Array<RelatonNist::Hit>] hits
+    #
+    def search_filter # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity
+      @array.select do |item|
+        %r{
+          ^(?:(?:NIST|NBS)\s?)?
+          (?:(?<series>(?:SP|FIPS|IR|ITL\sBulletin|White\sPaper))\s)?
+          (?<code>[0-9-]{3,}[A-Z]?)
+          (?<prt1>pt\d+)?
+          (?<vol1>v\d+)?
+          (?<ver1>ver[\d.]+)?
+          (?<rev1>r\d+)?
+          (?:\s(?<prt2>Part\s\d+))?
+          (?:\s(?<vol2>Vol\.\s\d+))?
+          (?:\s(?<ver2>(?:Ver\.|Version)\s[\d.]+))?
+          (?:\s(?<rev2>Rev\.\s\d+))?
+          (?:\s(?<add>Add)endum)?
+        }x =~ item.hit[:code]
+        (refparts[:code] && [series, item.hit[:series]].include?(refparts[:series]) && refparts[:code] == code &&
+          long_to_short(refparts[:prt1], refparts[:prt2]) == long_to_short(prt1, prt2) &&
+          long_to_short(refparts[:vol1], refparts[:vol2]) == long_to_short(vol1, vol2) &&
+          long_to_short(refparts[:ver1], refparts[:ver2]) == long_to_short(ver1, ver2) &&
+          long_to_short(refparts[:rev1], refparts[:rev2]) == long_to_short(rev1, rev2) &&
+          long_to_short(refparts[:add1], refparts[:add2]) == add) || item.hit[:title]&.include?(text.sub(/^NIST\s/, ""))
+      end
+    end
+
     private
 
+    #
+    # Parse reference parts
+    #
+    # @return [Hash] reference parts
+    #
+    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),
+        prt1: match(/(?<=(\.))?pt(?(1)-)[A-Z\d]+/, text),
+        vol1: match(/(?<=(\.))?v(?(1)-)\d+/, text),
+        ver1: match(/(?<=(\.))?ver(?(1)[-\d]|[.\d])+/, text)&.gsub(/-/, "."),
+        rev1: match(/(?<=[^a-z])(?<=(\.))?r(?(1)-)\d+/, text),
+        add1: match(/(?<=(\.))?add(?(1)-)\d+/, text),
+        prt2: match(/(?<=\s)Part\s[A-Z\d]+/, text),
+        vol2: match(/(?<=\s)Vol\.\s\d+/, text),
+        ver2: match(/(?<=\s)Ver\.\s\d+/, text),
+        rev2: match(/(?<=\s)Rev\.\s\d+/, text),
+        add2: match(/(?<=\/)Add/, text),
+      }
+    end
+
+    #
+    # Match regex to reference
+    #
+    # @param [Regexp] regex regex
+    # @param [String] code reference
+    #
+    # @return [String, nil] matched string
+    #
+    def match(regex, code)
+      regex.match(code)&.to_s
+    end
+
+    #
+    # Generate reference from parts
+    #
+    # @return [String] reference
+    #
+    def full_ref # rubocop:disable Metrics/AbcSize
+      @full_ref ||= begin
+        ref = "#{refparts[:perfix]}#{refparts[:series]} #{refparts[:code]}"
+        ref += long_to_short(refparts[:prt1], refparts[:prt2]).to_s
+        ref += long_to_short(refparts[:vol1], refparts[:vol2]).to_s
+        ref
+      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 short [String]
+    # @param long [String]
+    #
+    # @return [String, nil]
+    #
+    def long_to_short(short, long)
+      return short.sub(/-/, "") if short
+      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
+    #
+    # @return [self] sorted hits collection
+    #
     def sort_hits!
       @array.sort! do |a, b|
         if a.sort_value == b.sort_value
@@ -38,8 +155,16 @@ module RelatonNist
       self
     end
 
-    def from_ga # rubocop:disable Metrics/AbcSize
-      fn = text.gsub(%r{[/\s:.]}, "_").upcase
+    #
+    # Get hit from GitHub repo
+    #
+    # @return [Array<RelatonNist::Hit>] hits
+    #
+    # @raise [OpenURI::HTTPError] if GitHub repo is not available
+    #
+    def from_ga # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+      ref = full_ref
+      fn = ref.gsub(%r{[/\s:.]}, "_").upcase
       yaml = OpenURI.open_uri "#{GHNISTDATA}#{fn}.yaml"
       hash = YAML.safe_load yaml
       bib = RelatonNist::NistBibliographicItem.from_hash hash
@@ -52,63 +177,35 @@ module RelatonNist
       raise e
     end
 
-    # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
-
-    # @param stage [String]
-    # @return [Array<RelatonNist::Hit>]
-    # def from_csrc(**opts)
-    #   from, to = nil
-    #   if year
-    #     d    = Date.strptime year, "%Y"
-    #     from = d.strftime "%m/%d/%Y"
-    #     to   = d.next_year.prev_day.strftime "%m/%d/%Y"
-    #   end
-    #   url = "#{DOMAIN}/publications/search?keywords-lg=#{text}"\
-    #         "&sortBy-lg=relevence"
-    #   url += "&dateFrom-lg=#{from}" if from
-    #   url += "&dateTo-lg=#{to}" if to
-    #   url += if /PD/.match? opts[:stage]
-    #            "&status-lg=Draft,Retired Draft,Withdrawn"
-    #          else
-    #            "&status-lg=Final,Withdrawn"
-    #          end
-
-    #   doc = Nokogiri::HTML OpenURI.open_uri(::Addressable::URI.parse(url).normalize)
-    #   doc.css("table.publications-table > tbody > tr").map do |h|
-    #     link  = h.at("td/div/strong/a")
-    #     serie = h.at("td[1]").text.strip
-    #     code  = h.at("td[2]").text.strip
-    #     title = link.text
-    #     doc_url = DOMAIN + link[:href]
-    #     status = h.at("td[4]").text.strip.downcase
-    #     release_date = Date.strptime h.at("td[5]").text.strip, "%m/%d/%Y"
-    #     Hit.new(
-    #       {
-    #         code: code, serie: serie, title: title, url: doc_url,
-    #         status: status, release_date: release_date
-    #       }, self
-    #     )
-    #   end
-    # end
-    # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
-
+    #
     # Fetches data form json
-    # @param stage [String]
-    # @return [Array<RelatonNist::Hit>]
+    #
+    # @param opts [Hash] options
+    # @option opts [String] :stage stage of document
+    #
+    # @return [Array<RelatonNist::Hit>] hits
+    #
     def from_json(**opts)
       select_data(**opts).map do |h|
-        /(?<serie>(?<=-)\w+$)/ =~ h["series"]
+        /(?<series>(?<=-)\w+$)/ =~ h["series"]
         title = [h["title-main"], h["title-sub"]].compact.join " - "
         release_date = RelatonBib.parse_date h["published-date"], false
-        Hit.new({ code: h["docidentifier"], serie: serie.upcase, title: title,
+        Hit.new({ code: h["docidentifier"], series: series.upcase, title: title,
                   url: h["uri"], status: h["status"],
                   release_date: release_date, json: h }, self)
       end
     end
 
-    # @param stage [String]
-    # @return [Array<Hach>]
+    #
+    # Select data from json
+    #
+    # @param opts [Hash] options
+    # @option opts [String] :stage stage of document
+    #
+    # @return [Array<Hash>] selected data
+    #
     def select_data(**opts) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength,Metrics/PerceivedComplexity
+      ref = "#{refparts[:series]} #{refparts[:code]}"
       d = Date.strptime year, "%Y" if year
       statuses = %w[draft-public draft-prelim]
       data.select do |doc|
@@ -119,13 +216,18 @@ module RelatonNist
         else
           next unless doc["status"] == "final"
         end
-        doc["docidentifier"].include? text
+        doc["docidentifier"].include?(ref) || doc["docidentifier"].include?(full_ref)
       end
     end
 
-    # @param doc [Hash]
+    #
+    # Check if issued date is match to year
+    #
+    # @param doc [Hash] document's metadata
     # @param date [Date] first day of year
-    # @return [TrueClass, FalseClass]
+    #
+    # @return [Boolean]
+    #
     def match_year?(doc, date)
       return true unless year
 
@@ -133,8 +235,11 @@ module RelatonNist
       idate.between? date, date.next_year.prev_day
     end
 
+    #
     # Fetches json data form server
-    # @return [Hash]
+    #
+    # @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?
@@ -143,11 +248,12 @@ module RelatonNist
       unzip
     end
 
+    #
     # Fetch data form server and save it to file
     #
-    # @prarm ctime [Time, NilClass]
+    # @prarm ctime [Time, nil] file creation time
+    #
     def fetch_data(ctime)
-      # resp = OpenURI.open_uri("#{PUBS_EXPORT}.meta")
       if !ctime || ctime < OpenURI.open_uri("#{PUBS_EXPORT}.meta").last_modified
         @data = nil
         uri_open = URI.method(:open) || Kernel.method(:open)
@@ -156,9 +262,11 @@ module RelatonNist
       end
     end
 
+    #
     # upack zip file
     #
-    # @return [Hash]
+    # @return [Array<Hash>] json data
+    #
     def unzip
       return @data if @data
 

data/lib/relaton_nist/nist_bibliography.rb

@@ -11,8 +11,13 @@ require "relaton_nist/hash_converter"
 module RelatonNist
   class NistBibliography
     class << self
-      # @param text [String]
-      # @return [RelatonNist::HitCollection]
+      #
+      # Search NIST docuemnts by reference
+      #
+      # @param text [String] reference
+      #
+      # @return [RelatonNist::HitCollection] search result
+      #
       def search(text, year = nil, opts = {})
         ref = text.sub(/^NIST\sIR/, "NISTIR")
         HitCollection.search ref, year, opts
@@ -20,15 +25,18 @@ module RelatonNist
         raise RelatonBib::RequestError, e.message
       end
 
+      #
+      # Get NIST document by reference
+      #
       # @param code [String] the NIST standard Code to look up (e..g "8200")
       # @param year [String] the year the standard was published (optional)
       #
       # @param opts [Hash] options
-      # @option opts [TrueClass, FalseClass] :all_parts restricted to all parts
+      # @option opts [Boolean] :all_parts restricted to all parts
       #   if all-parts reference is required
-      # @option opts [TrueClass, FalseClass] :bibdata
       #
-      # @return [String] Relaton XML serialisation of reference
+      # @return [RelatonNist::NistBibliographicItem, nil] bibliographic item
+      #
       def get(code, year = nil, opts = {}) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
         return fetch_ref_err(code, year, []) if code.match?(/\sEP$/)
 
@@ -56,12 +64,24 @@ module RelatonNist
         end
 
         code += "-1" if opts[:all_parts]
-        nistbib_get1(code, year, opts)
+        nistbib_get(code, year, opts)
       end
 
       private
 
-      def nistbib_get1(code, year, opts)
+      #
+      # Get NIST document by reference
+      #
+      # @param [String] code reference
+      # @param [String] year year
+      # @param [Hash] opts options
+      # @option opts [Date] :issued_date issued date
+      # @option opts [Date] :updated_date updated date
+      # @option opts [String] :stage stage
+      #
+      # @return [RelatonNist::NistBibliographicItem, nil] bibliographic item
+      #
+      def nistbib_get(code, year, opts)
         result = nistbib_search_filter(code, year, opts) || (return nil)
         ret = nistbib_results_filter(result, year, opts)
         if ret[:ret]
@@ -72,6 +92,7 @@ module RelatonNist
         end
       end
 
+      #
       # Sort through the results from RelatonNist, fetching them three at a time,
       # and return the first result that matches the code,
       # matches the year (if provided), and which # has a title (amendments do not).
@@ -80,12 +101,13 @@ module RelatonNist
       # If no match, returns any years which caused mismatch, for error reporting
       #
       # @param opts [Hash] options
-      # @option opts [Time] :issued_date
-      # @option opts [Time] :issued_date
-      # @option opts [String] :stage
+      # @option opts [Date] :issued_date issued date
+      # @option opts [Date] :issued_date issued date
+      # @option opts [String] :stage stage
+      #
+      # @return [Hash] result
       #
-      # @return [Hash]
-      def nistbib_results_filter(result, year, opts)
+      def nistbib_results_filter(result, year, opts) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
         missed_years = []
         iter = /\w+(?=PD)|(?<=PD-)\w+/.match(opts[:stage])&.to_s
         iteration = case iter
@@ -119,9 +141,14 @@ module RelatonNist
         { years: missed_years }
       end
 
-      # @param hits [RelatonNist::HitCollection]
-      # @param threads [Integer]
-      # @return [Array<RelatonNist::NistBibliographicItem>]
+      #
+      # Fetch pages for all the hits in parallel
+      #
+      # @param hits [RelatonNist::HitCollection] hits
+      # @param threads [Integer] number of threads
+      #
+      # @return [Array<RelatonNist::NistBibliographicItem>] bibliographic items
+      #
       def fetch_pages(hits, threads)
         workers = RelatonBib::WorkersPool.new threads
         workers.worker { |w| { i: w[:i], hit: w[:hit].fetch } }
@@ -130,115 +157,42 @@ module RelatonNist
         workers.result.sort_by { |a| a[:i] }.map { |x| x[:hit] }
       end
 
-      # @param code [String]
-      # @param year [String, nil]
-      # @param opts [Hash]
-      # @return [RelatonNist::HitCollection]
-      def nistbib_search_filter(code, year, opts) # rubocop:disable Metrics/MethodLength
+      #
+      # Get search results and filter them by code and year
+      #
+      # @param code [String] reference
+      # @param year [String, nil] year
+      # @param opts [Hash] options
+      # @option opts [String] :stage stage
+      #
+      # @return [RelatonNist::HitCollection] hits collection
+      #
+      def nistbib_search_filter(code, year, opts)
         warn "[relaton-nist] (\"#{code}\") fetching..."
-        # match = %r{
-        #   ^((?:NIST)\s)?
-        #   (?<serie>(SP|FIPS|NISTIR|ITL\sBulletin|White\sPaper))\s
-        #   (?<code>[0-9-]{3,}[A-Z]?)
-        #   (?<prt1>pt\d+)?
-        #   (?<vol1>v\d+)?
-        #   (?<ver1>ver[\d\.]+)?
-        #   (?<rev1>r\d+)?
-        #   (\s(?<prt2>Part\s\d+))?
-        #   (\s(?<vol2>Vol\.\s\d+))?
-        #   (\s(?<ver2>(Ver\.|Version)\s[\d\.]+))?
-        #   (\s(?<rev2>Rev\.\s\d+))?
-        #   (\/(?<upd>Add))?
-        # }x.match(code)
-        # match ||= %r{
-        #   ^NIST\.
-        #   (?<serie>(SP|FIPS|IR|ITL\sBulletin|White\sPaper))\.
-        #   ((PD-\d+|PUB)\.)?
-        #   (?<code>[0-9-]{3,}[A-Z]?)
-        #   (\.(?<prt1>pt-\d+))?
-        #   (\.(?<vol1>v-\d+))?
-        #   (\.(?<ver1>ver-[\d\.]+))?
-        #   (\.(?<rev1>r-\d+))?
-        # }x.match(code)
-        matches = {
-          serie: match(/(SP|FIPS|(NIST)?\s?IR|ITL\sBulletin|White\sPaper)(?=\.|\s)/, code),
-          code: match(/(?<=\.|\s)[0-9-]{3,}[A-Z]?/, code),
-          prt1: match(/(?<=(\.))?pt(?(1)-)[A-Z\d]+/, code),
-          vol1: match(/(?<=(\.))?v(?(1)-)\d+/, code),
-          ver1: match(/(?<=(\.))?ver(?(1)[-\d]|[\.\d])+/, code)&.gsub(/-/, "."),
-          rev1: match(/(?<=[^a-z])(?<=(\.))?r(?(1)-)\d+/, code),
-          add1: match(/(?<=(\.))?add(?(1)-)\d+/, code),
-          prt2: match(/(?<=\s)Part\s[A-Z\d]+/, code),
-          vol2: match(/(?<=\s)Vol\.\s\d+/, code),
-          ver2: match(/(?<=\s)Ver\.\s\d+/, code),
-          rev2: match(/(?<=\s)Rev\.\s\d+/, code),
-          add2: match(/(?<=\/)Add/, code),
-        }
-        ref = matches[:code] ? "#{matches[:serie]} #{matches[:code]}" : code
-        result = search(ref, year, opts)
-        selected_result = result.select { |i| search_filter i, matches, code }
-        return selected_result if selected_result.any? || !matches[:code]
-
-        search full_ref(matches)
-      end
-
-      def full_ref(matches)
-        ref = "#{matches[:serie]} #{matches[:code]}"
-        ref += long_to_short(matches[:prt1], matches[:prt2]).to_s
-        ref += long_to_short(matches[:vol1], matches[:vol2]).to_s
-        ref
-      end
-
-      def match(regex, code)
-        regex.match(code)&.to_s
-      end
-
-      # @param item [RelatonNist::Hit]
-      # @param matches [Hash]
-      # @param text [String]
-      # @return [Boolean]
-      def search_filter(item, matches, text) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity
-        %r{
-          ^(?:(?:NIST)\s)?
-          (?:(?<serie>(?:SP|FIPS|NISTIR|ITL\sBulletin|White\sPaper))\s)?
-          (?<code>[0-9-]{3,}[A-Z]?)
-          (?<prt1>pt\d+)?
-          (?<vol1>v\d+)?
-          (?<ver1>ver[\d.]+)?
-          (?<rev1>r\d+)?
-          (?:\s(?<prt2>Part\s\d+))?
-          (?:\s(?<vol2>Vol\.\s\d+))?
-          (?:\s(?<ver2>(?:Ver\.|Version)\s[\d.]+))?
-          (?:\s(?<rev2>Rev\.\s\d+))?
-          (?:\s(?<add>Add)endum)?
-        }x =~ item.hit[:code]
-        (matches[:code] && [serie, item.hit[:serie]].include?(matches[:serie]) && matches[:code] == code &&
-          long_to_short(matches[:prt1], matches[:prt2]) == long_to_short(prt1, prt2) &&
-          long_to_short(matches[:vol1], matches[:vol2]) == long_to_short(vol1, vol2) &&
-          long_to_short(matches[:ver1], matches[:ver2]) == long_to_short(ver1, ver2) &&
-          long_to_short(matches[:rev1], matches[:rev2]) == long_to_short(rev1, rev2) &&
-          long_to_short(matches[:add1], matches[:add2]) == add) || item.hit[:title]&.include?(text.sub(/^NIST\s/, ""))
+        result = search(code, year, opts)
+        result.search_filter
       end
 
-      # @param short [String]
-      # @param long [String]
-      # @return [String, nil]
-      def long_to_short(short, long)
-        return short.sub(/-/, "") if short
-        return unless long
-
-        long.sub(/Part\s/, "pt").sub(/Vol\.\s/, "v").sub(/Rev\.\s/, "r").sub(/(Ver\.|Version)\s/, "ver")
-      end
-
-      def fetch_ref_err(code, year, missed_years)
+      #
+      # Outputs warning message if no match found
+      #
+      # @param [String] code reference
+      # @param [String, nil] year year
+      # @param [Array<String>] missed_years missed years
+      #
+      # @return [nil] nil
+      #
+      def fetch_ref_err(code, year, missed_years) # rubocop:disable Metrics/MethodLength
         id = year ? "#{code}:#{year}" : code
-        warn "[relaton-nist] WARNING: no match found online for #{id}. "\
-          "The code must be exactly like it is on the standards website."
-        warn "[relaton-nist] (There was no match for #{year}, though there were matches "\
-          "found for #{missed_years.join(', ')}.)" unless missed_years.empty?
-        if /\d-\d/ =~ code
-          warn "[relaton-nist] The provided document part may not exist, "\
-            "or the document may no longer be published in parts."
+        warn "[relaton-nist] WARNING: no match found online for #{id}. " \
+             "The code must be exactly like it is on the standards website."
+        unless missed_years.empty?
+          warn "[relaton-nist] (There was no match for #{year}, though there " \
+               "were matches found for #{missed_years.join(', ')}.)"
+        end
+        if /\d-\d/.match? code
+          warn "[relaton-nist] The provided document part may not exist, " \
+               "or the document may no longer be published in parts."
         end
         nil
       end

data/lib/relaton_nist/processor.rb

@@ -5,7 +5,7 @@ module RelatonNist
     def initialize # rubocop:disable Lint/MissingSuper
       @short = :relaton_nist
       @prefix = "NIST"
-      @defaultprefix = %r{^(NIST|NISTGCR|ITL Bulletin|JPCRD|NISTIR|CSRC|FIPS)(/[^\s])?\s}
+      @defaultprefix = %r{^(NIST|NBS|NISTGCR|ITL Bulletin|JPCRD|NISTIR|CSRC|FIPS)(/[^\s])?\s}
       @idtype = "NIST"
       @datasets = %w[nist-tech-pubs]
     end

data/lib/relaton_nist/version.rb

@@ -1,3 +1,3 @@
 module RelatonNist
-  VERSION = "1.12.3".freeze
+  VERSION = "1.13.0".freeze
 end

data/relaton_nist.gemspec

@@ -32,6 +32,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "vcr"
   spec.add_development_dependency "webmock"
 
-  spec.add_dependency "relaton-bib", "~> 1.12.0"
+  spec.add_dependency "relaton-bib", "~> 1.13.0"
   spec.add_dependency "rubyzip"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-nist
 version: !ruby/object:Gem::Version
-  version: 1.12.3
+  version: 1.13.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-15 00:00:00.000000000 Z
+date: 2022-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.12.0
+        version: 1.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.12.0
+        version: 1.13.0
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement