relaton-nist 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44c34385848a8014460e7001487ae66c504889a55d4d43e7825436af1ed8b447
-  data.tar.gz: 5a8484fe85b73b539de8d247193359a0004586644163dea56c7d31aa67c15afd
+  metadata.gz: 44c06fc2b378b7ac0ad228f82dbfe6d962d5cd22fb27fa8c6f19cfcde20589f7
+  data.tar.gz: 96e9c89fdf092af8933e65dc02b98f4d19d70593de2b12a18a18740d85b47d27
 SHA512:
-  metadata.gz: 53e6e72ccf31a11324e4258bef3a0239820af979ecf415f366936f4c7a15cb1564d3a26dd91812bccba3b87c9163b2ce6e76f6a83342a1d017b48c0be4a6989d
-  data.tar.gz: a2c5b41f673d8c6efd526d57f5c12b79d9e2c36db3609bbdf9d4059baea2dd183914d5ea873d2524bed998e41837b605b51919e4f5bfeed3e4d2e93c37ced2aa
+  metadata.gz: ca9c2ecb226ceec065fd82db6ce7d4584a0c11176364235102a97c5e3673fb156b60f68631afb5655c91bd313a1d370fe2377ec8c5c6498f06b46e57a478f459
+  data.tar.gz: 76bcdb75f303654bbb08bb9cc70c1859795d4ea41d73ee1db0b6f854a595b4871d2038ce169146c8112c08f6fad4631d33b80445b024ae56ff71dd1d7100107c

data/CLAUDE.md

@@ -82,6 +82,21 @@ errors = schema.validate(file)
 
 Tests use VCR with WebMock. Cassettes are stored in `spec/vcr_cassettes/` and re-record every 7 days.
 
+### Test Data Stubbing
+
+Tests pre-load both the NIST index and CSRC pubs-export data from local fixtures in `before(:suite)` (see `spec/support/webmock.rb`), avoiding all HTTP requests for these data sources. VCR is configured to ignore both `index-v1.zip` and `pubs-export` requests (`spec/support/vcr.rb`).
+
+- **Index**: A `Relaton::Index::Type` instance is created with `@index` set directly from `spec/fixtures/index-v1.zip`, then injected into `Relaton::Index.pool`. Run `rake spec:update_index` to refresh.
+- **PubsExport**: The `PubsExport` singleton's `@data` is set directly from `spec/fixtures/pubs-export.zip`. Run `rake spec:update_pubs_export` to refresh.
+
+To apply the index stubbing pattern to other relaton gems:
+
+1. Add `spec:update_index` rake task (downloads `index-v1.zip` from the gem's GitHub data repo)
+2. Run `rake spec:update_index` to create `spec/fixtures/index-v1.zip`
+3. In `spec/support/webmock.rb`: parse the zip once, create a `Type` instance with `@index` set directly, override `actual?` to return `true`, inject into `Relaton::Index.pool`
+4. In `spec/support/vcr.rb`: add `ignore_request` for `index-v1.zip`
+5. Remove any `allow_any_instance_of(Relaton::Index::Type)` workarounds from specs
+
 ## Key Dependencies
 
 - `relaton-bib` — base bibliographic models and shared mixins

data/Gemfile

@@ -3,6 +3,7 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in relaton_nist.gemspec
 gemspec
 
+
 gem "equivalent-xml", "~> 0.6"
 gem "pry-byebug"
 gem "rake", "~> 13.0"

data/README.adoc

@@ -405,6 +405,25 @@ refer to the https://github.com/relaton/relaton-logger#usage[relaton-logger]
 documentation.
 
 
+== Development
+
+=== Updating test fixtures
+
+The test suite uses local copies of the NIST index and CSRC pubs-export data
+to avoid network requests. To update the fixtures:
+
+[source,sh]
+----
+$ rake spec:update_index
+$ rake spec:update_pubs_export
+----
+
+`spec:update_index` downloads the latest `index-v1.zip` from the
+https://github.com/relaton/relaton-data-nist[relaton-data-nist] repository.
+
+`spec:update_pubs_export` downloads the latest `pubs-export.zip` from
+the NIST Cybersecurity Resource Center (CSRC).
+
 == Contributing
 
 Bug reports and pull requests are welcome.

data/Rakefile

@@ -4,3 +4,45 @@ require "rspec/core/rake_task"
 RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec
+
+namespace :spec do
+  desc "Download latest NIST index fixture from relaton-data-nist"
+  task :update_index do
+    require "net/http"
+    require "uri"
+
+    url = "https://raw.githubusercontent.com/relaton/relaton-data-nist/data-v2/index-v1.zip"
+    dest = File.join(__dir__, "spec", "fixtures", "index-v1.zip")
+
+    puts "Downloading #{url} ..."
+    uri = URI.parse(url)
+    response = Net::HTTP.get_response(uri)
+
+    if response.is_a?(Net::HTTPSuccess)
+      File.binwrite(dest, response.body)
+      puts "Updated #{dest} (#{response.body.bytesize} bytes)"
+    else
+      abort "Failed to download: HTTP #{response.code}"
+    end
+  end
+
+  desc "Download latest NIST pubs-export fixture from CSRC"
+  task :update_pubs_export do
+    require "net/http"
+    require "uri"
+
+    url = "https://csrc.nist.gov/CSRC/media/feeds/metanorma/pubs-export.zip"
+    dest = File.join(__dir__, "spec", "fixtures", "pubs-export.zip")
+
+    puts "Downloading #{url} ..."
+    uri = URI.parse(url)
+    response = Net::HTTP.get_response(uri)
+
+    if response.is_a?(Net::HTTPSuccess)
+      File.binwrite(dest, response.body)
+      puts "Updated #{dest} (#{response.body.bytesize} bytes)"
+    else
+      abort "Failed to download: HTTP #{response.code}"
+    end
+  end
+end

data/grammars/biblio.rng

@@ -2015,15 +2015,11 @@ provided that it is not the entire bibliographic item that is so related</a:docu
     <a:documentation>A version of the bibliographic item (within an edition). Can be used for drafts</a:documentation>
     <element name="version">
       <optional>
-        <ref name="revision-date">
-          <a:documentation>The date at which the current version of the bibliographic item was produced</a:documentation>
-        </ref>
-      </optional>
-      <optional>
-        <ref name="draft">
-          <a:documentation>The identifier for the current draft of the bibliographic item</a:documentation>
-        </ref>
+        <attribute name="type">
+          <a:documentation>Versioning scheme, in case of multiple versioning schemes</a:documentation>
+        </attribute>
       </optional>
+      <text/>
     </element>
   </define>
   <define name="vedition">

data/lib/relaton/nist/bibdata.rb

@@ -1,6 +1,7 @@
 module Relaton
   module Nist
     class Bibdata < Item
+      model ItemData
       include Bib::BibdataShared
     end
   end

data/lib/relaton/nist/bibitem.rb

@@ -1,6 +1,7 @@
 module Relaton
   module Nist
     class Bibitem < Item
+      model ItemData
       include Bib::BibitemShared
     end
   end

data/lib/relaton/nist/ext.rb

@@ -4,17 +4,13 @@ require_relative "comment_period"
 module Relaton
   module Nist
     class Ext < Bib::Ext
-      attribute :schema_version, method: :get_schema_version
       attribute :doctype, Doctype
       attribute :commentperiod, CommentPeriod
 
-      xml do
-        map_element "commentperiod", to: :commentperiod
-      end
+      xml { map_element "commentperiod", to: :commentperiod }
+      key_value { map_element "commentperiod", to: :commentperiod }
 
-      def get_schema_version
-        Relaton.schema_versions["relaton-model-nist"]
-      end
+      def get_schema_version = Relaton.schema_versions["relaton-model-nist"]
     end
   end
 end

data/lib/relaton/nist/hit_collection.rb

@@ -169,14 +169,32 @@ module Relaton
       #
       def sort_hits!
         @array.sort! do |a, b|
-          code = a.hit[:code] <=> b.hit[:code]
-          next code unless code.zero?
+          base_a, upd_a = base_and_update(a.hit[:code])
+          base_b, upd_b = base_and_update(b.hit[:code])
+
+          cmp = base_a <=> base_b
+          next cmp unless cmp.zero?
+
+          # Same base code: prefer higher /UpdN (latest update wins).
+          cmp = upd_b <=> upd_a
+          next cmp unless cmp.zero?
 
           b.hit[:release_date] <=> a.hit[:release_date]
         end
         self
       end
 
+      # Split a code like "NIST FIPS 140-2/Upd2" into ["NIST FIPS 140-2", 2].
+      # Codes without an update suffix return update 0.
+      def base_and_update(code)
+        code = code.to_s
+        if (m = code.match(%r{\A(.*?)/Upd(\d+)\z}))
+          [m[1], m[2].to_i]
+        else
+          [code, 0]
+        end
+      end
+
       def pubid(id = ref)
         Pubid::Nist::Identifier.parse(id).to_s
       rescue StandardError
@@ -230,12 +248,16 @@ module Relaton
         id.sub!(/(?:-draft\d*|\.\wpd)$/, "")
         id = id.gsub(".", " ").sub(/-Add(\d*)$/, ' Add\1') if id.match?(/-Add\d*$/)
         pid = ::Pubid::Nist::Identifier.parse(id)
-        case json["iteration"]
-        when "final"
-          pid.stage = ::Pubid::Nist::Stage.new id: "f", type: "pd"
+
+        # Stage: URI is authoritative, fall back to iteration. "final" => no stage.
+        uri_stage = json["uri"] && json["uri"][%r{/(final|ipd|fpd|\dpd)(?:-\(\d+\))?(?:/|$)}, 1]
+        stage_src = uri_stage || json["iteration"]
+        case stage_src
+        when nil, "final"
+          # no stage — "final" means published
         when "fpd"
           pid.stage = ::Pubid::Nist::Stage.new id: "f", type: "pd"
-        when /(\w)pd/
+        when /\A(\w)pd\z/
           pid.stage = ::Pubid::Nist::Stage.new id: Regexp.last_match(1), type: "pd"
         end
 
@@ -243,7 +265,7 @@ module Relaton
         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 += " #{json["iteration"]}" if json["iteration"] && json["iteration"] != "final"
         id
       end
 

data/lib/relaton/nist/version.rb

@@ -1,5 +1,5 @@
 module Relaton
   module Nist
-    VERSION = "2.0.0".freeze
+    VERSION = "2.1.0".freeze
   end
 end

data/{relaton_nist.gemspec → relaton-nist.gemspec}

@@ -25,9 +25,9 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "base64"
   spec.add_dependency "mechanize", "~> 2.0"
-  spec.add_dependency "loc_mods", "~> 0.2.0"
+  spec.add_dependency "loc_mods", "~> 0.3.0"
   spec.add_dependency "pubid", "~> 1.15.6"
-  spec.add_dependency "relaton-bib", "~> 2.0.0"
+  spec.add_dependency "relaton-bib", "~> 2.1.0"
   spec.add_dependency "relaton-core", "~> 0.0.13"
   spec.add_dependency "relaton-index", "~> 0.2.0"
   spec.add_dependency "rubyzip"

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-nist
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Ribose Inc.
+autorequire:
 bindir: exe
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2026-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -43,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: pubid
   requirement: !ruby/object:Gem::Requirement
@@ -71,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: relaton-core
   requirement: !ruby/object:Gem::Requirement
@@ -167,11 +168,12 @@ files:
 - lib/relaton/nist/series.yaml
 - lib/relaton/nist/util.rb
 - lib/relaton/nist/version.rb
-- relaton_nist.gemspec
+- relaton-nist.gemspec
 homepage: https://github.com/metanorma/relaton-nist
 licenses:
 - MIT
 metadata: {}
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -186,7 +188,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: 'Relaton::Nist: retrive NIST standards.'
 test_files: []