relaton-nist 1.14.4 → 1.14.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6d5fa6a33aea5f2dd4cf62aa71a4da7ab9b41847ac35f35053810cccf2d334a
-  data.tar.gz: f38d1704600169333dfbcc8e24f29bbdc93f92f47ded7754f04a4492bd3dd1a1
+  metadata.gz: ff158dab9df4bfc2254789771db9ca74bc422b9d6ac78351da0ccbca1d858815
+  data.tar.gz: e7ef8d2cb1ff797095f7c6646194610ffe7bab67f97d909c9d54d75d9f0552c3
 SHA512:
-  metadata.gz: c807912db5bef3e57fc3a70ae862a6f9adca7b884d9174f56457ac28443a6bef6c572b745f5c3df6377313e5140b1a625c546ee9a93eaf050d70ccad4ad351b2
-  data.tar.gz: 64a6c9e1f751d6b8bfeae3c22b6fe7197e1d516afda4205dbcaf4cd67381ee6fc95e57865882a916824b6751feec7791138fbffa2d61357fd45e4797c436c35a
+  metadata.gz: ef6f0be37367d7e71ac0783be8252219a9a49e7affe27bfcef78c21929d64c10b2f4cba081a4515d75e64bfccffed21dd72848d2653594363f9e4fa753c7c002
+  data.tar.gz: f9b24bb62b115b11f291a9514420426a758d3207062e4bd75fc09169f32338d3891ca802441df405ce9b4ab159f39aea2762c458e811c30e87523e9835a94dbc

data/lib/relaton_nist/data_fetcher.rb

@@ -29,14 +29,6 @@ module RelatonNist
     end
 
     def parse_docid(doc) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
-      # case doi
-      # when "10.6028/NBS.CIRC.12e2revjune" then doi.sub!("13e", "12e")
-      # when "10.6028/NBS.CIRC.36e2" then doi.sub!("46e", "36e")
-      # when "10.6028/NBS.HB.67suppJune1967" then doi.sub!("1965", "1967")
-      # when "10.6028/NBS.HB.105-1r1990" then doi.sub!("105-1-1990", "105-1r1990")
-      # when "10.6028/NIST.HB.150-10-1995" then doi.sub!(/150-10$/, "150-10-1995")
-      # end
-      # anchor = doi.split("/")[1..-1].join "/"
       [
         { type: "NIST", id: pub_id(doc), primary: true },
         { type: "DOI", id: fetch_doi(doc) },
@@ -135,8 +127,12 @@ module RelatonNist
     # @param doc [Nokogiri::XML::Element]
     # @return [Array<RelatonBib::FormattedString>]
     def fetch_abstract(doc)
-      doc.xpath("jats:abstract/jats:p", "jats" => "http://www.ncbi.nlm.nih.gov/JATS1").map do |a|
-        RelatonBib::FormattedString.new(content: a.text, language: doc["language"], script: "Latn")
+      doc.xpath(
+        "jats:abstract/jats:p", "jats" => "http://www.ncbi.nlm.nih.gov/JATS1"
+      ).each_with_object([]) do |a, m|
+        next if a.text.empty?
+
+        m << RelatonBib::FormattedString.new(content: a.text, language: doc["language"], script: "Latn")
       end
     end
 

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.6".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.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-06-03 00:00:00.000000000 Z
+date: 2023-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: relaton-bib