relaton-nist 1.19.6 → 1.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6654ed357cf14e1ab2a0a9c1781dca9904ed18e4e9690fb12391442827c2e5b9
-  data.tar.gz: c56f38923aec8ff5093c52dda68b0cd7655c1290d9ddb3fe13fc380ee122d9a6
+  metadata.gz: 905967f1d00f1aa14e1cc6209670cb9c81773c2a798416c06e78766921abdf89
+  data.tar.gz: 4fd6dfee3f486a7c42f13dfc844f5441567297a6bb0388b57d63fb8d7c7bdf32
 SHA512:
-  metadata.gz: bdcef3ff2f3f9fd156e9b1f365a9bb4a89da8f64cfe03e6780ea8f4aefe57390662ddca0c2d5efef756006ea031543c720012e94c51bdbb96a6e9bdaa07967d4
-  data.tar.gz: fd2f4a3c15ea00891a31fd94c233ebcb772fdd9c9e41505a9f7bcec765b1c60ffd73034c9bb9f1866f86bbdad046ac72ec3da4b53280c6506194d1a4955b3f4f
+  metadata.gz: 2d6422c42a810aea5e80d10a09ca3ceb0e7e03f7c14bac33118f7592041370d0feafecf615422d11bf287b584c5f69580f57d8fc69da98f4df95ffa532788f55
+  data.tar.gz: e633bf3b78b8421933b59862d3207a6202a00eaba5c89267be72340a728de93eeef75569695b8815d79c0ea703a43292f8d8ddb466827ad3852091fc8eef19b5

data/lib/relaton_nist/data_fetcher.rb

@@ -6,7 +6,7 @@ require_relative "mods_parser"
 
 module RelatonNist
   class DataFetcher
-    URL = "https://github.com/usnistgov/NIST-Tech-Pubs/releases/download/Oct2024/allrecords-MODS.xml"
+    URL = "https://github.com/usnistgov/NIST-Tech-Pubs/releases/download/Nov2024/allrecords-MODS.xml"
 
     def initialize(output, format)
       @output = output

data/lib/relaton_nist/hash_converter.rb

@@ -24,9 +24,10 @@ module RelatonNist
     end
 
     def commentperiod_hash_to_bib(ret)
-      return unless ret[:commentperiod]
+      cp = ret.dig(:ext, :commentperiod) || ret[:commentperiod] # @TODO: remove ret[:commentperiod] after all gem versions are updated
+      return unless cp
 
-      ret[:commentperiod] = CommentPeriod.new(**ret[:commentperiod])
+      ret[:commentperiod] = CommentPeriod.new(**cp)
     end
 
     # @param ret [Hash]

data/lib/relaton_nist/hit_collection.rb

@@ -57,21 +57,12 @@ module RelatonNist
     #
     # @return [Array<RelatonNist::Hit>] hits
     #
-    def search_filter # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity,Metrics/MethodLength
+    def search_filter
       refid = ::Pubid::Nist::Identifier.parse(@reference)
+      parts = exclude_parts refid
       arr = @array.select do |item|
         pubid = ::Pubid::Nist::Identifier.parse(item.hit[:code].sub(/\.$/, ""))
-        pubid == refid
-        # parts = doi_parts(item.hit[:json]) || code_parts(item.hit[:code])
-        # iteration = item.hit.dig(:json, "iteration")
-        # draft = parts[:draft] || (!iteration.nil? && iteration.match?(/\wpd/i))
-        # refparts[:code] && [parts[:series], item.hit[:series]].include?(refparts[:series]) &&
-        #   refparts[:code].casecmp(parts[:code].upcase).zero? &&
-        #   refparts[:prt] == parts[:prt] &&
-        #   (refparts[:vol].nil? || refparts[:vol] == parts[:vol]) &&
-        #   (refparts[:ver].nil? || refparts[:ver] == parts[:ver]) &&
-        #   (refparts[:rev].nil? || refparts[:rev] == parts[:rev]) &&
-        #   refparts[:draft] == draft && refparts[:add] == parts[:add]
+        pubid.exclude(*parts) == refid
       rescue StandardError
         item.hit[:code] == text
       end
@@ -83,6 +74,12 @@ module RelatonNist
       return dup
     end
 
+    def exclude_parts(pubid)
+      %i[stage update].each_with_object([]) do |part, parts|
+        parts << part if pubid.send(part).nil?
+      end
+    end
+
     private
 
     def code_parts(code) # rubocop:disable Metrics/MethodLength
@@ -252,8 +249,6 @@ module RelatonNist
       else
         json["docidentifier"]
       end => id
-      # parts = doi_parts(json) || code_parts(json["docidentifier"])
-      # return json["docidentifier"] unless parts
 
       id.sub!(/(?:-draft\d*|\.\wpd)$/, "")
       pid = ::Pubid::Nist::Identifier.parse(id)
@@ -265,20 +260,13 @@ module RelatonNist
       when /(\w)pd/
         pid.stage = ::Pubid::Nist::Stage.new id: Regexp.last_match(1), type: "pd"
       end
+
+      /\/upd(?<upd>\d+)\// =~ json["uri"]
+      pid.update = Pubid::Nist::Update.new number: upd if upd
       pid.to_s
     rescue StandardError
       id += " #{json["iteration"].sub('final', 'fpd')}" if json["iteration"]
       id
-
-      # id = parts[:code]
-      # id = "NIST #{parts[:series]} #{id}" if parts[:series]
-      # id += " Part #{parts[:prt]}" if parts[:prt]
-      # id += " Vol. #{parts[:vol]}" if parts[:vol]
-      # id += " Ver. #{parts[:ver]}" if parts[:ver]
-      # id += " Rev. #{parts[:rev]}" if parts[:rev]
-      # id += "-Add" if parts[:add]
-      # id += " (Draft)" if parts[:draft] || @opts[:stage]
-      # id
     end
 
     #

data/lib/relaton_nist/nist_bibliographic_item.rb

@@ -98,10 +98,14 @@ module RelatonNist
     def to_hash(embedded: false)
       hash = super
       # hash["keyword"] = single_element_array(keyword) if keyword&.any?
-      hash["commentperiod"] = commentperiod.to_hash if commentperiod
+      hash["ext"]["commentperiod"] = commentperiod.to_hash if commentperiod
       hash
     end
 
+    def has_ext?
+      super || commentperiod
+    end
+
     # @param prefix [String]
     # @return [String]
     def to_asciibib(prefix = "")

data/lib/relaton_nist/version.rb

@@ -1,3 +1,3 @@
 module RelatonNist
-  VERSION = "1.19.6".freeze
+  VERSION = "1.20.0".freeze
 end

data/relaton_nist.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "base64"
   spec.add_dependency "loc_mods", "~> 0.2.0"
   spec.add_dependency "pubid", "~> 0.1.0"
-  spec.add_dependency "relaton-bib", "~> 1.19.2"
+  spec.add_dependency "relaton-bib", "~> 1.20.0"
   spec.add_dependency "relaton-index", "~> 0.2.0"
   spec.add_dependency "rubyzip"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-nist
 version: !ruby/object:Gem::Version
-  version: 1.19.6
+  version: 1.20.0
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-10-20 00:00:00.000000000 Z
+date: 2024-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.19.2
+        version: 1.20.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.19.2
+        version: 1.20.0
 - !ruby/object:Gem::Dependency
   name: relaton-index
   requirement: !ruby/object:Gem::Requirement
@@ -142,7 +142,7 @@ homepage: https://github.com/metanorma/relaton-nist
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -158,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.3.27
-signing_key: 
+signing_key:
 specification_version: 4
 summary: 'RelatonNist: retrive NIST standards.'
 test_files: []