relaton-nist 1.7.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ff4cb4caf1123510595e7804b6b44a6765d6e8db953e73e97afe038baad2d94
-  data.tar.gz: 0b7592d2538165dc71ab73a3c7aa709f8b64f78d61d560eded5a700faeac48dd
+  metadata.gz: 86fbfc1190f5174be69a4e51bb6b791328c1d432143e8eb6d2aab6f644ae5100
+  data.tar.gz: 2aa468017a4bcf5ab9369e2f4fca85543fd641ac5ba2b35399e60e96769c996d
 SHA512:
-  metadata.gz: 0a379a5571e757ae64f6c17c87b21fb9bb4e33145ce4078b78eb25eea8863fc0ff3aeebc5885e35892d312afc2415fd5b72bd9e90583aa000272bd8d211ab4e2
-  data.tar.gz: 57e44c8738be6f399fa263516d5ed7ad4fce62b1559d8d88bb59950bdc908af866c5e5ab7c3783d9237ed1a7df2fe69496d82c55845b0296bb53bb922d4e65bd
+  metadata.gz: 9bb703e914559d9e8359ef6442f089d76fb3dc84fedb273e046893989b7e035825d7990235e1b9c95f14f1c916e0ffff24d9cc1e6b177ae027bcc403480ac2be
+  data.tar.gz: b1b0857eff72431fb9ae953af25dfedd49a1fa459b05fdd85c2285e642182ceb3a58d407bdcd8986153fad5f9f162e6115bd0c9d804d2956ed65de700d830158

data/lib/relaton_nist/nist_bibliography.rb

@@ -29,15 +29,15 @@ module RelatonNist
       #
       # @return [String] Relaton XML serialisation of reference
       def get(code, year = nil, opts = {})
-        return fetch_ref_err(code, year, []) if code =~ /\sEP$/
+        return fetch_ref_err(code, year, []) if code.match? /\sEP$/
 
         /^(?<code2>[^\(]+)(\((?<date2>\w+\s(\d{2},\s)?\d{4})\))?\s?\(?((?<=\()(?<stage>[^\)]+))?/ =~ code
         if code2
           code = code2.strip
           if date2
-            if /\w+\s\d{4}/ =~ date2
+            if /\w+\s\d{4}/.match? date2
               opts[:issued_date] = Date.strptime date2, "%B %Y"
-            elsif /\w+\s\d{2},\s\d{4}/ =~ date2
+            elsif /\w+\s\d{2},\s\d{4}/.match? date2
               opts[:updated_date] = Date.strptime date2, "%B %d, %Y"
             end
           end
@@ -125,13 +125,22 @@ module RelatonNist
       end
 
       def nistbib_search_filter(code, year, opts)
-        idregex = %r{[0-9-]{3,}\w?}
-        docid = code.match(idregex).to_s
-        serie = code.match(%r{(FISP|SP|NISTIR)(?=\s)})
+        %r{
+          ^((?:NIST)\s)?
+          (?<serie1>(SP|FIPS|NISTIR|ITL\sBulletin|White\sPaper))\s
+          (?<code1>[0-9-]{3,}\w?)
+          (\/(?<upd1>Add))?
+        }x =~ code
         warn "[relaton-nist] (\"#{code}\") fetching..."
         result = search(code, year, opts)
         result.select do |i|
-          i.hit[:code]&.match(idregex).to_s == docid && (!serie || i.hit[:serie] == serie.to_s)
+          %r{
+            ^((?:NIST)\s)?
+            ((?<serie2>(SP|FIPS|NISTIR|ITL\sBulletin|White\sPaper))\s)?
+            (?<code2>[0-9-]{3,}\w?)
+            (\s(?<upd2>Add)endum)?
+          }x =~ i.hit[:code]
+          [serie2, i.hit[:serie]].include?(serie1) && code1 == code2 && upd1 == upd2
         end
       end
 

data/lib/relaton_nist/scrapper.rb

@@ -110,9 +110,10 @@ module RelatonNist
                        "//div[contains(@class, 'publications-detail')]/h3"
                      )&.text&.strip&.sub(/(?<=\w)\([^\)]+\)$/) do |m|
                        " " + m.upcase
-                     end&.squeeze(" ")&.gsub /&#13;|\n|\r/, ""
+                     end&.squeeze(" ")&.gsub(/&#13;|\n|\r/, "")
                    end
         item_ref ||= "?"
+        item_ref.sub! /\sAddendum$/, "-Add"
         [RelatonBib::DocumentIdentifier.new(id: item_ref, type: "NIST")]
       end
 

data/lib/relaton_nist/version.rb

@@ -1,3 +1,3 @@
 module RelatonNist
-  VERSION = "1.7.0".freeze
+  VERSION = "1.7.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-nist
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-27 00:00:00.000000000 Z
+date: 2020-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debase