relaton-nist 1.12.0 → 1.12.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f66b74deb926d9f67db5770896b1080b16610c3996edb4a404740bd3ce558abe
-  data.tar.gz: 6b74fb0c0bb1bf46282496fbf9e91f1a7ca0022eb4466f3be69ed1ca3da09b1c
+  metadata.gz: ef6eeb64c2dba6079789c3192b6c335f3726af48bd43b580bc5c05cf8c8b12f9
+  data.tar.gz: c58fa9cf63309bd404ad04797b92f1dd3f2cc0635cb061ee1211cfc9bf8e841c
 SHA512:
-  metadata.gz: 97ca67f282f4131fab6f6d9da60e8f1ab350d8e5e762d843066f4236b8d5a53980d261c29559f9c233c2cab5cee44bbc185ab7a6b3feedd559df5d631a94b61c
-  data.tar.gz: 6c2a40d739b0b2b9b2ed9587c50ac737b5a3ccb8a7c27c5b1548cab40f3409c08ea62358bb2b90d590b04ac45350e3ba671c0dac7a479399ce38d06ad9519904
+  metadata.gz: b59ef8bf5ce4d0b637cb0072cb6d18c4ddbfa07170a95095df0ed95395039c19cc2f59b9a28d852dd59f357e204b3ec50c8825fb30f5049106edc0705696b6da
+  data.tar.gz: 22e2b8ede68f9cdd45bd921d06ba4f36c824bbc8115f3a40960d8b9f8c6f03efa8ff20d310771f8b4db30a388794654fd9e58313f6e10f4677b0945f4b67e8f8

data/.gitignore

@@ -7,7 +7,6 @@
 /spec/reports/
 /tmp/
 .vscode/
-/data/
 .rubocop-https---raw-githubusercontent-com-riboseinc-oss-guides-master-ci-rubocop-yml
 
 # rspec failure tracking

data/lib/relaton_nist/data_fetcher.rb

@@ -214,10 +214,11 @@ module RelatonNist
     def fetch_series(doc)
       series_path = File.expand_path("series.yaml", __dir__)
       series = YAML.load_file series_path
-      prf, srs, = pub_id(doc).split
+      prf, srs, num = pub_id(doc).split
       sname = series[srs] || srs
       title = RelatonBib::TypedTitleString.new(content: "#{prf} #{sname}")
-      [RelatonBib::Series.new(title: title, number: "#{prf} #{srs}")]
+      abbr = RelatonBib::LocalizedString.new srs
+      [RelatonBib::Series.new(title: title, abbreviation: abbr, number: num)]
     end
 
     #
@@ -274,7 +275,7 @@ module RelatonNist
       puts "Started at: #{t1}"
 
       docs = Nokogiri::XML OpenURI.open_uri URL
-      FileUtils.mkdir @output unless Dir.exist? @output
+      FileUtils.mkdir_p @output
       FileUtils.rm Dir[File.join(@output, "*.#{@ext}")]
       docs.xpath("/body/query/doi_record/report-paper/report-paper_metadata")
         .each { |doc| parse_doc doc }

data/lib/relaton_nist/hit_collection.rb

@@ -151,7 +151,7 @@ module RelatonNist
       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 unless Dir.exist? DATAFILEDIR
+        FileUtils.mkdir_p DATAFILEDIR
         IO.copy_stream(uri_open.call("#{PUBS_EXPORT}.zip"), DATAFILE)
       end
     end

data/lib/relaton_nist/nist_bibliography.rb

@@ -14,7 +14,8 @@ module RelatonNist
       # @param text [String]
       # @return [RelatonNist::HitCollection]
       def search(text, year = nil, opts = {})
-        HitCollection.search text, year, opts
+        ref = text.sub(/^NIST\sIR/, "NISTIR")
+        HitCollection.search ref, year, opts
       rescue OpenURI::HTTPError, SocketError, OpenSSL::SSL::SSLError => e
         raise RelatonBib::RequestError, e.message
       end
@@ -160,7 +161,7 @@ module RelatonNist
         #   (\.(?<rev1>r-\d+))?
         # }x.match(code)
         matches = {
-          serie: match(/(SP|FIPS|(NIST)?IR|ITL\sBulletin|White\sPaper)(?=\.|\s)/, code),
+          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),
@@ -198,25 +199,25 @@ module RelatonNist
       # @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)?
+          ^(?:(?: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)?
+          (?:\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 &&
+        (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/, ""))
+          long_to_short(matches[:add1], matches[:add2]) == add) || item.hit[:title]&.include?(text.sub(/^NIST\s/, ""))
       end
 
       # @param short [String]

data/lib/relaton_nist/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-nist
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.12.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-25 00:00:00.000000000 Z
+date: 2022-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: equivalent-xml