relaton-nist 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dac2975c8efc8f3fb1fe8720fb852daba9bd66fb0e7bfc5fd87e24b69ed08ff1
-  data.tar.gz: 84503272191f86d904c947bbe6143c4363bc5fe03d0bb4f40b56162ef45f6c7d
+  metadata.gz: a7a5a66a0bf3122bb2ecc3146f30ee12ca9a746ed7c96747fef6949925392769
+  data.tar.gz: e56387b519fe1efd6c1874c2a42d4e4555080c73f982049bc8b2366c82540422
 SHA512:
-  metadata.gz: b82763b595daf55b2d09643804f5caf2351e11f8de4f1e61b0c8f98273770da35aaa4161209ad21a137e04dbfc35fa6cc8ff14f9f15ad2e7c450e2e8bcb7e9a2
-  data.tar.gz: 23f6829e141eb6b2f3f90f23de5b6f8b731b8659060ca7459599727ff5652368f8f8970a1234b0c551ffd40321b1a99e4a9e212b84669c803e4483f0eba079ad
+  metadata.gz: da82fcc539ca6c7ade8214e01966f81018e57dd89496669fbee744cb133d2b0db6d2da369cee4ca05ac4161189c1f114897dd332368c9a634b72a5641e5cce52
+  data.tar.gz: 882fdf875645a91716aab1b275eb18d257d245d71f5bdea7615d78495b3cfa9696a4f0a5b96bf11e0770de52eec1849b21d02118c104dd86d4397df871fd2365

data/lib/relaton_nist/hit_collection.rb

@@ -17,10 +17,10 @@ module RelatonNist
     # @param year [String]
     # @param opts [Hash]
     # @option opts [String] :stage
-    def initialize(ref_nbr, year = nil, opts = {})
+    def initialize(ref_nbr, year = nil, opts = {}) # rubocop:disable Metrics/AbcSize
       super ref_nbr, year
 
-      /(?<docid>(SP|FIPS)\s[0-9-]+)/ =~ text
+      /(?<docid>(SP|FIPS)\s[0-9-]+\w?)/ =~ text
       @array = docid ? from_json(docid, **opts) : from_csrc(**opts)
 
       @array.sort! do |a, b|
@@ -45,28 +45,28 @@ module RelatonNist
         from = d.strftime "%m/%d/%Y"
         to   = d.next_year.prev_day.strftime "%m/%d/%Y"
       end
-      url  = "#{DOMAIN}/publications/search?keywords-lg=#{text}"
+      url = "#{DOMAIN}/publications/search?keywords-lg=#{text}"
       url += "&dateFrom-lg=#{from}" if from
       url += "&dateTo-lg=#{to}" if to
-      url += if /PD/ =~ opts[:stage]
+      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 = 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]
+        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
+            code: code, serie: serie, title: title, url: doc_url,
+            status: status, release_date: release_date
           }, self
         )
       end
@@ -91,17 +91,18 @@ module RelatonNist
     # @param docid [String]
     # @param stage [String]
     # @return [Array<Hach>]
-    def select_data(docid, **opts)
+    def select_data(docid, **opts) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength,Metrics/PerceivedComplexity
       d = Date.strptime year, "%Y" if year
+      didrx = Regexp.new(docid)
       data.select do |doc|
         next unless match_year?(doc, d)
 
-        if /PD/ =~ opts[:stage]
+        if /PD/.match? opts[:stage]
           next unless %w[draft-public draft-prelim].include? doc["status"]
         else
           next unless doc["status"] == "final"
         end
-        doc["docidentifier"] =~ Regexp.new(docid)
+        doc["docidentifier"] =~ didrx
       end
     end
 
@@ -129,7 +130,9 @@ module RelatonNist
     #
     # @prarm ctime [Time, NilClass]
     def fetch_data(ctime)
-      resp = OpenURI.open_uri("https://csrc.nist.gov/CSRC/media/feeds/metanorma/pubs-export.meta")
+      resp = OpenURI.open_uri(
+        "https://csrc.nist.gov/CSRC/media/feeds/metanorma/pubs-export.meta"
+      )
       if !ctime || ctime < resp.last_modified
         @data = nil
         zip = OpenURI.open_uri "https://csrc.nist.gov/CSRC/media/feeds/metanorma/pubs-export.zip"

data/lib/relaton_nist/nist_bibliography.rb

@@ -121,7 +121,7 @@ module RelatonNist
       end
 
       def nistbib_search_filter(code, year, opts)
-        idregex = %r{[0-9-]{3,}}
+        idregex = %r{[0-9-]{3,}\w?}
         docid = code.match(idregex).to_s
         serie = code.match(%r{(FISP|SP|NISTIR)(?=\s)})
         warn "[relaton-nist] (\"#{code}\") fetching..."

data/lib/relaton_nist/version.rb

@@ -1,3 +1,3 @@
 module RelatonNist
-  VERSION = "1.3.0".freeze
+  VERSION = "1.3.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-nist
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-08-20 00:00:00.000000000 Z
+date: 2020-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debase
@@ -220,7 +220,7 @@ homepage: https://github.com/metanorma/relaton-nist
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -236,7 +236,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: 'RelatonNist: retrive NIST standards.'
 test_files: []