relaton-nist 1.14.4 → 1.14.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6d5fa6a33aea5f2dd4cf62aa71a4da7ab9b41847ac35f35053810cccf2d334a
-  data.tar.gz: f38d1704600169333dfbcc8e24f29bbdc93f92f47ded7754f04a4492bd3dd1a1
+  metadata.gz: 2b442dc75e9c4b20221b94bd56200f5391f479709cb44bda543827bdeca67cf7
+  data.tar.gz: 553d1a834486c36d3febec1046480f5e803d98865c34f119c5698b253f3186fd
 SHA512:
-  metadata.gz: c807912db5bef3e57fc3a70ae862a6f9adca7b884d9174f56457ac28443a6bef6c572b745f5c3df6377313e5140b1a625c546ee9a93eaf050d70ccad4ad351b2
-  data.tar.gz: 64a6c9e1f751d6b8bfeae3c22b6fe7197e1d516afda4205dbcaf4cd67381ee6fc95e57865882a916824b6751feec7791138fbffa2d61357fd45e4797c436c35a
+  metadata.gz: d1b1c058632239fefd0bb171f645eba0a7036e806fc3064faa4f2742d386e01e07f891b4c89172ae6b9811e75d6d05b0603391e68b58ae88789cb2d9cbd8ed35
+  data.tar.gz: '07039ccd91afca1ebc62471d0c7b3fa64695f7f5ed88f0eb11fd12d00c87851a33f66c08d7ba4e69f61ff0b1a82bb9e0a88eaf613d18d00b4a4e52ac051916f4'

data/lib/relaton_nist/hit_collection.rb

@@ -58,14 +58,11 @@ module RelatonNist
         parts = doi_parts(item.hit[:json]) || code_parts(item.hit[:code])
         (refparts[:code] && [parts[:series], item.hit[:series]].include?(refparts[:series]) &&
           refparts[:code].casecmp(parts[:code].upcase).zero? &&
-          (!refparts[:prt] || refparts[:prt] == parts[:prt]) &&
-          (!refparts[:vol] || refparts[:vol] == parts[:vol]) &&
-          (!refparts[:ver] || refparts[:ver] == parts[:ver]) &&
-          (!refparts[:rev] || refparts[:rev] == parts[:rev]) &&
-          refparts[:draft] == parts[:draft] && refparts[:add] == parts[:add] &&
-          refparts[:res] == parts[:res]) # ||
-          # (refparts[:code] && !refparts[:code].empty? &&
-          #   item.hit[:title]&.include?("#{refparts[:series]} #{refparts[:code]}"))
+          (refparts[:prt] == parts[:prt]) &&
+          (refparts[:vol] == parts[:vol]) &&
+          (refparts[:ver] == parts[:ver]) &&
+          (refparts[:rev] == parts[:rev]) &&
+          refparts[:draft] == parts[:draft] && refparts[:add] == parts[:add])
       end
     end
 
@@ -73,7 +70,7 @@ module RelatonNist
 
     def code_parts(code) # rubocop:disable Metrics/MethodLength
       {
-        prefix: match(/^(?:NIST|NBS)\s?/, code),
+        # 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),
         prt: match(/(?:pt|\sPart\s)(?<val>\d+)/, code),
@@ -86,7 +83,6 @@ module RelatonNist
         # (?:\s(?<rev2>Rev\.\s\d+))?
         add: match(/\sAdd(?:endum)?(?<val>\d*)/, code),
         draft: !match(/\((?:Retired\s)?Draft\)/, code).nil?,
-        res: match(/(?<=\s)RES/, text),
       }
     end
 
@@ -95,7 +91,7 @@ module RelatonNist
 
       id = json["doi"].split("/").last
       {
-        prefix: match(/^(?:NIST|NBS)\./, id),
+        # 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),
         prt: match(/pt?(?<val>\d+)/, id),
@@ -123,7 +119,6 @@ module RelatonNist
         rev: match(/(?:(?:(?<dl>\.)|[^a-z])r|\sRev\.\s)(?(<dl>)-)(?<val>\d+)/, text),
         add: match(/(?:(?<dl>\.)?add|\/Add)(?(<dl>)-)(?<val>\d*)/, text),
         draft: !(match(/\((?:Draft|PD)\)/, text).nil? && @opts[:stage].nil?),
-        res: match(/(?<=\s)RES/, text),
         # prt2: match(/(?<=\s)Part\s[A-Z\d]+/, text),
         # vol2: match(/(?<=\s)Vol\.\s\d+/, text),
         # ver2: match(/(?<=\s)Ver\.\s\d+/, text),

data/lib/relaton_nist/nist_bibliographic_item.rb

@@ -120,7 +120,7 @@ module RelatonNist
     #
     def ref_attrs
       docidentifier.detect(&:primary)&.tap do |di|
-        return { anchor: di.id.gsub(" ", ".") }
+        return { anchor: di.id.gsub(" ", ".").squeeze(".") }
       end
     end
   end

data/lib/relaton_nist/version.rb

@@ -1,3 +1,3 @@
 module RelatonNist
-  VERSION = "1.14.4".freeze
+  VERSION = "1.14.5".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-nist
 version: !ruby/object:Gem::Version
-  version: 1.14.4
+  version: 1.14.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-06-03 00:00:00.000000000 Z
+date: 2023-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: relaton-bib