relaton-nist 1.19.5 → 1.19.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47c01d46202e813e27019c4beb5e5ccc4aa258a61dd4f6ea3b184009e6ae9e09
-  data.tar.gz: 2dadbcee5b551aefb4f4cefe04620964d3455acb842f005944e2f30e195d94ba
+  metadata.gz: 255770dfd71b03dfd82eb6d6cfd9710a77fc0dab5e46f744b2a544058ef497c1
+  data.tar.gz: 9914dce97923f334dff7dcead5e9037135eed26d0d4c31e96a8d632f211a5699
 SHA512:
-  metadata.gz: 3e264c34cfea0e5ef97894265d0e6917081d05e7d317142475badb242036eeae4e4caafde6cd2f19c62ae12b99560cef88d92638f40d2e9592a37a704cef8aca
-  data.tar.gz: 262e7bf0461fbd19f9da7346128166ab2d07fdc3e8f3cffff2ec20ec5fad2b6883a8f4f85624675e5e586a29b3a17cfe28eee426b63b23ce8b7c3fc3fb83a426
+  metadata.gz: 54eaf26dc7f4f01f05206af204cd44b737b8b87c2a486afd18b0c4b1593420e26ef4dc38c74fdef8825ca6e62e7ecc9ce271ccb37aeef4e68bb363642f26ed04
+  data.tar.gz: 6cee7c2c9776dcbbf96c8868837682870a575a6ccb86831a4afad1f1ea2a88d55d47b44e113819a9d6976c53f6f1a829bcece881fdcafcb22f6a9b2d35a852a7

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/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
 
     #
@@ -291,15 +279,15 @@ module RelatonNist
 
       ref = "#{refparts[:series]} #{refparts[:code]}"
       d = Date.strptime year, "%Y" if year
-      statuses = %w[draft-public draft-prelim]
+      # statuses = %w[draft-public draft-prelim]
       PubsExport.instance.data.select do |doc|
         next unless match_year?(doc, d)
 
-        if @opts[:stage]&.include?("PD")
-          next unless statuses.include? doc["status"]
-        else
-          next unless doc["status"] == "final"
-        end
+        # if @opts[:stage]&.include?("PD")
+        #   next unless statuses.include? doc["status"]
+        # else
+        #   next unless doc["iteration"] == "final"
+        # end
         doc["docidentifier"].include?(ref) || doc["docidentifier"].include?(full_ref)
       end
     end

data/lib/relaton_nist/version.rb

@@ -1,3 +1,3 @@
 module RelatonNist
-  VERSION = "1.19.5".freeze
+  VERSION = "1.19.7".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-nist
 version: !ruby/object:Gem::Version
-  version: 1.19.5
+  version: 1.19.7
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-10-17 00:00:00.000000000 Z
+date: 2024-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -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
@@ -157,8 +157,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.27
-signing_key: 
+rubygems_version: 3.5.19
+signing_key:
 specification_version: 4
 summary: 'RelatonNist: retrive NIST standards.'
 test_files: []