relaton 3.0.2 → 3.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f15745a534625b27b3d013d7b3d6edd7e0185f1bcc1c545f7b44dc6059d9d113
-  data.tar.gz: ac15b5259abb3c980cd6bee9d10c5f2f0ae12fea955478ca28f7da82027ab6f6
+  metadata.gz: f6cef1665e29f9d4a6e8ab48528253675e5b901399666138306c2be69c0d1b6e
+  data.tar.gz: e4eef10cab8373db1d911a4b68342b35c1bb335c15f986d24697f286e83d9a96
 SHA512:
-  metadata.gz: de3f2c7182f6a2b1737a54e9168bcab856dbc81fe169f293b5b932f0224e8cb95187f506829230068ebc5308884e89a918515b03838f969c9c9870020442efff
-  data.tar.gz: a4bfe1d14667d8907eecd43fe880b02e7d15ceab20d2c6302c8f5c220d6c4398b3adefa056ff8815639686ad85674713c5c3a4759bd5ad57ffdd1e42b9bc39e1
+  metadata.gz: 41185be7ff82e3b45667eb33380fb3eee8e548e3ea24039d8743c5ed50b2fcc1b1c252536f87a1d6b0c4821e41e17b08a45e861af1d6886a8abe9df287a800a6
+  data.tar.gz: 3235473497b828e0f5d8890a59b6548994b2ab113d665f010d24e1970c6b24eaa398b298d7f83ba3b770153c558c712059ff5147b5f39d86b61ad5e35312d930

data/lib/relaton/3gpp/data_fetcher.rb

@@ -1,3 +1,4 @@
+require "yeptris/psych"
 require "fileutils"
 require "net/http"
 require "uri"
@@ -64,7 +65,7 @@ module Relaton
       # @return [String, nil] file name
       #
       def get_file(renewal) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
-        @current = YAML.load_file CURRENT if File.exist? CURRENT
+        @current = Yeptris::Psych.load_file CURRENT if File.exist? CURRENT
         @current ||= {}
         uri = URI(CSV_URL)
         n = 0
@@ -183,7 +184,7 @@ module Relaton
       # @return [Relaton3gpp::BibliographicItem, nil] merged bibliographic item or nil if no merge has been done
       #
       def merge_duplication(bib, file)
-        hash = YAML.load_file file
+        hash = Yeptris::Psych.load_file file
         existed = Item.from_hash hash
         changed = update_source? bib, existed
         bib1, bib2, chng = transposed_relation bib, existed

data/lib/relaton/bipm/data_outcomes_parser.rb

@@ -1,3 +1,4 @@
+require "yeptris/psych"
 module Relaton::Bipm
   class DataOutcomesParser
     SHORTTYPE = {
@@ -130,7 +131,7 @@ module Relaton::Bipm
       fr_file = en_file.sub "en", "fr"
       [en_file, fr_file].map do |file|
         if File.exist? file
-          data = YAML.safe_load(File.read(file, encoding: "UTF-8"))
+          data = Yeptris::Psych.safe_load(File.read(file, encoding: "UTF-8"))
           path = file
         end
         [path, data]

data/lib/relaton/bipm/si_brochure_parser.rb

@@ -1,3 +1,4 @@
+require "yeptris/psych"
 require "moxml"
 
 module Relaton::Bipm
@@ -60,8 +61,8 @@ module Relaton::Bipm
             warn_duplicate = false
             item2 = Item.from_yaml File.read(outfile, encoding: "UTF-8")
             fix_si_brochure_id item2
-            hash1 = YAML.safe_load item1.to_yaml
-            hash2 = YAML.safe_load item2.to_yaml
+            hash1 = Yeptris::Psych.safe_load item1.to_yaml
+            hash2 = Yeptris::Psych.safe_load item2.to_yaml
             Item.from_yaml deep_merge(hash1, hash2).to_yaml
           else
             warn_duplicate = true

data/lib/relaton/bipm.rb

@@ -1,6 +1,5 @@
 require "zip"
 require "fileutils"
-require "parslet"
 require "relaton/bib"
 require "relaton/index"
 require "relaton/core"

data/lib/relaton/core/data_fetcher.rb

@@ -1,3 +1,4 @@
+require "yeptris/psych"
 require "yeptris"
 require "fileutils"
 
@@ -121,7 +122,7 @@ module Relaton
         kept = ledger.merge(ledger_new).select do |_, row|
           row.is_a?(Hash) && row["file"] && @written.include?(row["file"])
         end
-        File.write ledger_path, YAML.dump(kept), encoding: "UTF-8"
+        File.write ledger_path, Yeptris::Psych.dump(kept), encoding: "UTF-8"
         @ledger = kept
       end
 
@@ -349,7 +350,7 @@ module Relaton
 
       def ledger
         @ledger ||= if File.exist?(ledger_path)
-                      YAML.safe_load_file(ledger_path) || {}
+                      Yeptris::Psych.safe_load_file(ledger_path) || {}
                     else
                       {}
                     end

data/lib/relaton/core/processor.rb

@@ -67,7 +67,7 @@ module Relaton
       # @return [Pubid::Identifier, nil]
       def cache_pubid(ref)
         pubid_class&.parse(ref)
-      rescue ArgumentError, ::Pubid::Errors::Error, Parslet::ParseFailed
+      rescue ArgumentError, ::Pubid::Errors::Error
         # relaton-bib carries the log facade; core specs load without it.
         require "relaton/bib"
         Relaton::Bib::Util.info "does not parse as this flavor's pubid; " \
@@ -134,6 +134,21 @@ module Relaton
         copy
       end
 
+      # A copy of `pubid` with each given component the parse leaves nil, for
+      # #item_cache_key. `pubid` itself when there is nothing to add.
+      #
+      # @param pubid [Pubid::Identifier]
+      # @param values [Hash{Symbol => String, nil}]
+      # @return [Pubid::Identifier]
+      def with_components(pubid, **values)
+        values = values.select { |attr, value| value && pubid.public_send(attr).nil? }
+        return pubid if values.empty?
+
+        copy = pubid.class.from_hash pubid.to_hash
+        values.each { |attr, value| copy.public_send "#{attr}=", value }
+        copy
+      end
+
       # The cache key for a query: the parsed pubid with the `year` and
       # `all_parts` options folded in. The publication date range is not part
       # of the identity, so it never enters the key.
@@ -153,6 +168,20 @@ module Relaton
         pubid
       end
 
+      # The cache key of a fetched document: its primary docidentifier as
+      # parsed (`pubid`), plus the components that docid omits by design and
+      # the item keeps elsewhere. A flavor whose printed docid drops the
+      # edition (IHO `B-12`, ECMA `ECMA-262`) overrides this, or every
+      # edition gets one key and one cache file (relaton#408). The same set
+      # as relaton-cli's `MachineIndex::REFINABLE_KEYS`.
+      #
+      # @param pubid [Pubid::Identifier] the docid's parse; not mutated
+      # @param _item [Relaton::Bib::ItemData] the fetched document
+      # @return [Pubid::Identifier]
+      def item_cache_key(pubid, _item)
+        pubid
+      end
+
       def initialize
         raise "This is an abstract class!"
       end

data/lib/relaton/db/CLAUDE.md

@@ -223,6 +223,17 @@ relaton#189 item 2 / relaton#204. Two lutaml-store `FileSystem` stores under
   both naming the same file. There are no redirect entries. A document is
   deleted with the last row that points to it; a row whose document is gone is
   a miss.
+- **The item row's key must tell editions apart (relaton#408).** `Db#item_key`
+  parses the primary docidentifier and passes it through
+  `Core::Processor#item_cache_key(pubid, item)`. A flavor whose printed docid
+  omits the edition by design overrides the hook to add it from the item:
+  IHO adds `version` from `edition` (`IHO B-12` → `IHO B-12 3.0.0`), ECMA adds
+  `edition` and the `volume` extent (`ECMA-262` → `ECMA-262 ed16`), through
+  `#with_components`, which fills only components the parse leaves nil, on a
+  copy. Without it every edition got one item key and one file, and a fetch of
+  `IHO B-12 2.0.3` overwrote the file the `IHO B-12 3.0.0` query row named. A
+  cache with such a file is dropped by the next `Relaton::VERSION` bump
+  (`grammar_hash`), so no separate cache-version bump was made.
 
 Matching: the **exact** row first (canonical `to_hash`, not pubid `==`, which
 is false after a `from_hash` round trip for some flavors, e.g. UN). Only a
@@ -233,8 +244,9 @@ still applies and it never answers with another query's year-stripped copy.
 `ISO 19115:2003 === ISO 19115-1:2003` (and the same for IEC, BSI, JIS, GB).
 `Cache#subset_of?` therefore also requires that every component the row adds
 (at any depth) is allowed: only a language for the dated fallback
-(`LANGUAGE_COMPONENTS`), a year/date/month or a language for the date-range
-`candidates` (`EDITION_COMPONENTS`). A row with no `root.number` (DOI, ISBN)
+(`LANGUAGE_COMPONENTS`), a year/date/month, an edition/version (the
+`item_cache_key` components; not a volume, which names another document) or a
+language for the date-range `candidates` (`EDITION_COMPONENTS`). A row with no `root.number` (DOI, ISBN)
 goes to one of 256 digest buckets (`<flavor>/~<hex>`).
 
 Expiry (`Cache#valid_row?`): an undated row, and **every** `not_found` row,

data/lib/relaton/db/cache.rb

@@ -36,8 +36,11 @@ module Relaton
       # reads an omitted `part` as "any part" (`ISO 19115:2003 ===
       # ISO 19115-1:2003`), which names another document.
       LANGUAGE_COMPONENTS = %w[language languages].freeze
-      # What a row may add to a key and still be one of its editions.
-      EDITION_COMPONENTS = (%w[year date month] + LANGUAGE_COMPONENTS).freeze
+      # What a row may add to a key and still be one of its editions. An
+      # `edition` or a `version` comes from Core::Processor#item_cache_key
+      # (IHO, ECMA; relaton#408). A `volume` names another document.
+      EDITION_COMPONENTS =
+        (%w[year date month edition version] + LANGUAGE_COMPONENTS).freeze
 
       # @return [String]
       attr_reader :dir

data/lib/relaton/db/registry.rb

@@ -221,7 +221,7 @@ module Relaton
         require "pubid"
         parsed = ::Pubid.parse reference
         parsed if parsed.to_s == reference
-      rescue ArgumentError, ::Pubid::Errors::Error, Parslet::ParseFailed
+      rescue ArgumentError, ::Pubid::Errors::Error
         nil
       end
 

data/lib/relaton/db.rb

@@ -226,7 +226,7 @@ module Relaton
     # reference they cannot read is not-found, not a failure (relaton#412).
     def unreadable_reference?(error)
       (defined?(Pubid::Errors::Error) && error.is_a?(Pubid::Errors::Error)) ||
-        (defined?(Parslet::ParseFailed) && error.is_a?(Parslet::ParseFailed))
+        false
     end
 
     # The flavor routing picks for `fetch_async`'s per-flavor queue; nil
@@ -382,14 +382,18 @@ module Relaton
       [query, query && processor.cache_key(code, year, opts, query)]
     end
 
-    # The key of a fetched document, from its primary identifier. The
-    # identifier is data, so an unparseable one gives no key.
+    # The key of a fetched document, from its primary identifier and what
+    # that identifier omits (Core::Processor#item_cache_key, relaton#408).
+    # The identifier is data, so an unparseable one gives no key.
     def item_key(bib, stdclass)
       docid = bib.docidentifier.detect(&:primary) || bib.docidentifier.first
       return unless docid&.content
 
-      cache_key docid.content, nil, {}, stdclass
-    rescue ::Pubid::Errors::Error, Parslet::ParseFailed
+      key = cache_key docid.content, nil, {}, stdclass
+      return key unless key.is_a? ::Pubid::Identifier
+
+      @registry[stdclass].item_cache_key key, bib
+    rescue ::Pubid::Errors::Error
       nil
     end
 
@@ -456,7 +460,7 @@ module Relaton
     def copublisher_query(code, opts, stdclass, publisher)
       query = begin
         @registry[stdclass].query_pubid(code, opts)
-      rescue ::Pubid::Errors::Error, Parslet::ParseFailed
+      rescue ::Pubid::Errors::Error
         nil
       end
       return query if query

data/lib/relaton/ecma/processor.rb

@@ -21,6 +21,14 @@ module Relaton
         Bibliography.get(code, date, opts)
       end
 
+      # An ECMA record prints `ECMA-262` with no ` ed<N>`/` vol<N>`, and keeps
+      # them in `edition` and in a `volume` extent (relaton#408).
+      def item_cache_key(pubid, item)
+        volume = item.extent.flat_map(&:locality)
+          .detect { |l| l.type == "volume" }&.reference_from
+        with_components pubid, edition: item.edition&.content, volume: volume
+      end
+
       #
       # Fetch all the documents from a source
       #

data/lib/relaton/equivalence.rb

@@ -1,4 +1,4 @@
-require "yaml"
+require "yeptris/psych"
 
 module Relaton
   # Cross-SDO equivalence as data: chain patterns and explicit equivalences
@@ -23,7 +23,7 @@ module Relaton
                 else
                   [path]
                 end
-        files.each { |f| tables << YAML.safe_load_file(f, aliases: true) }
+        files.each { |f| tables << Yeptris::Psych.safe_load_file(f, aliases: true) }
         tables
       end
 

data/lib/relaton/gb/scraper.rb

@@ -1,7 +1,7 @@
+require "yeptris/psych"
 # encoding: UTF-8
 # frozen_string_literal: true
 
-require "yaml"
 require "gb_agencies"
 
 module Relaton
@@ -132,7 +132,7 @@ module Relaton
       # @param pref [String]
       # @return [Hash{String=>String}]
       def prefix(pref)
-        @prefixes ||= YAML.load_file File.join(__dir__, "yaml/prefixes.yaml")
+        @prefixes ||= Yeptris::Psych.load_file File.join(__dir__, "yaml/prefixes.yaml")
         @prefixes[pref]
       end
 

data/lib/relaton/ieee/data_fetcher.rb

@@ -1,3 +1,4 @@
+require "yeptris/psych"
 require "etc"
 require "zip"
 require_relative "../ieee"
@@ -77,7 +78,7 @@ module Relaton
         # @param file [String]
         # @return [String, nil]
         def primary_docid(file)
-          yaml = YAML.safe_load(File.read(file, encoding: "UTF-8"),
+          yaml = Yeptris::Psych.safe_load(File.read(file, encoding: "UTF-8"),
                                 permitted_classes: [Symbol, Date, Time])
           id = yaml && yaml["docidentifier"]&.find do |i|
             i["type"] == "IEEE" && i["primary"] == true && i["trademark"].nil?

data/lib/relaton/iho/processor.rb

@@ -25,6 +25,12 @@ module Relaton
         Bibliography.get(code, date, opts)
       end
 
+      # An IHO record prints `B-12` and keeps its edition in `edition`, so
+      # the edition goes on the key as the version (relaton#408).
+      def item_cache_key(pubid, item)
+        with_components pubid, version: item.edition&.content
+      end
+
       # @param xml [String]
       # @return [Relaton::Iho::ItemData]
       def from_xml(xml)

data/lib/relaton/index/file_io.rb

@@ -1,3 +1,4 @@
+require "yeptris/psych"
 module Relaton
   module Index
     #
@@ -219,12 +220,12 @@ module Relaton
       end
 
       def load_index(yaml, save = false)
-        index = YAML.safe_load(yaml, permitted_classes: [Symbol])
+        index = Yeptris::Psych.safe_load(yaml, permitted_classes: [Symbol])
         save index if save
         return deserialize_pubid(index) if check_format(index)
 
         report_invalid_index(save, "Wrong structure of")
-      rescue Psych::SyntaxError
+      rescue Yeptris::Psych::SyntaxError
         report_invalid_index(save, "YAML parsing error when reading")
       rescue InvalidIndexError
         report_invalid_index(save, "Wrong structure of")
@@ -430,7 +431,7 @@ module Relaton
         end
         yaml = yaml.read unless yaml.is_a?(String)
         Util.info "Downloaded index from `#{url}` for sqlite materialization", progname
-        raw = YAML.safe_load(yaml, permitted_classes: [Symbol])
+        raw = Yeptris::Psych.safe_load(yaml, permitted_classes: [Symbol])
         return nil unless check_format(raw)
 
         Enumerator.new do |y|
@@ -439,7 +440,7 @@ module Relaton
             y << [number, number, r[:id], r[:file]]
           end
         end
-      rescue Psych::SyntaxError, SocketError, OpenURI::HTTPError, Errno::ECONNRESET,
+      rescue Yeptris::Psych::SyntaxError, SocketError, OpenURI::HTTPError, Errno::ECONNRESET,
              OpenSSL::SSL::SSLError => e
         Util.info "SQLite index build failed (#{e.message}); falling back", progname
         nil
@@ -512,8 +513,8 @@ module Relaton
         return unless yaml
 
         begin
-          raw = YAML.safe_load(yaml, permitted_classes: [Symbol])
-        rescue Psych::SyntaxError
+          raw = Yeptris::Psych.safe_load(yaml, permitted_classes: [Symbol])
+        rescue Yeptris::Psych::SyntaxError
           warn_local_index_error("YAML parsing error when reading")
           delete_sidecar
           return [[], []]
@@ -613,7 +614,7 @@ module Relaton
           yaml = zip.entries.first.get_input_stream.read
         end
         Util.info "Downloaded index from `#{url}`", progname
-        raw = YAML.safe_load(yaml, permitted_classes: [Symbol])
+        raw = Yeptris::Psych.safe_load(yaml, permitted_classes: [Symbol])
         if check_format(raw)
           save raw
           raw = nil # release the parsed copy; read_raw_file loads the sidecar's
@@ -622,7 +623,7 @@ module Relaton
           warn_remote_index_error "Wrong structure of"
           [[], []]
         end
-      rescue Psych::SyntaxError
+      rescue Yeptris::Psych::SyntaxError
         warn_remote_index_error "YAML parsing error when reading"
         [[], []]
       end

data/lib/relaton/index/shard_source.rb

@@ -1,3 +1,4 @@
+require "yeptris/psych"
 require "yeptris"
 require "json"
 require "net/http"
@@ -152,11 +153,11 @@ module Relaton
           yaml = unzip(body)
           raise Error, "empty archive at `#{url(path)}`" unless yaml
 
-          index = YAML.safe_load(yaml, permitted_classes: [Symbol])
+          index = Yeptris::Psych.safe_load(yaml, permitted_classes: [Symbol])
           raise Error, "wrong structure of `#{url(path)}`" unless @file_io.check_basic_format(index)
 
           @file_io.deserialize_pubid(index)
-        rescue FileIO::InvalidIndexError, Psych::SyntaxError, Zip::Error, Zlib::Error => e
+        rescue FileIO::InvalidIndexError, Yeptris::Psych::SyntaxError, Zip::Error, Zlib::Error => e
           raise Error, "cannot read `#{url(path)}`: #{e.message}"
         end
       end

data/lib/relaton/iso/hit_collection.rb

@@ -88,13 +88,30 @@ module Relaton
       end
 
       def pubid_match?(pubid)
-        match_excludings = translate_excludings(excludings) + [:all_parts]
-        match_excludings << :edition unless pubid.typed_stage&.abbr&.include?("DIR")
+        match_excludings = base_match_excludings
+        unless pubid.typed_stage&.abbr&.include?("DIR")
+          match_excludings = match_excludings + [:edition]
+        end
         # Only the candidate is built via .create (from the index) and so may
         # carry a compound part; `ref_pubid_no_year` is always a parsed pubid,
         # already split, so it needs no normalization.
         cand = normalize_compound_part(exclude_id_attrs(pubid, *match_excludings))
-        cand == exclude_id_attrs(ref_pubid_no_year, *match_excludings)
+        cand == ref_excluded(match_excludings)
+      end
+
+      # The candidate's excludings set varies only by the DIR exception; the
+      # reference side is invariant per distinct set. Exclude the ref's
+      # (possibly deep) base chain once per set, not once per candidate —
+      # on a large vocabulary compile this chain ran per candidate per
+      # lookup and dominated the bibitem-resolution phase (relaton#423).
+      def base_match_excludings
+        @base_match_excludings ||= translate_excludings(excludings) + [:all_parts]
+      end
+
+      def ref_excluded(match_excludings)
+        @ref_excluded ||= {}
+        @ref_excluded[match_excludings] ||=
+          exclude_id_attrs(ref_pubid_no_year, *match_excludings)
       end
 
       # @TODO TEMP WORKAROUND (pubid 2.x migration): the v1-generated index

data/lib/relaton/jcgm/meetings_parser.rb

@@ -1,5 +1,5 @@
+require "yeptris/psych"
 require "fileutils"
-require "yaml"
 require "date"
 
 module Relaton::Jcgm
@@ -65,7 +65,7 @@ module Relaton::Jcgm
     end
 
     def load_yaml(file)
-      YAML.safe_load File.read(file, encoding: "UTF-8"), permitted_classes: [Date, Time]
+      Yeptris::Psych.safe_load File.read(file, encoding: "UTF-8"), permitted_classes: [Date, Time]
     end
 
     # "JCGM 17th Meeting (2012)" — ordinal via pubid's Meeting.ordinal.

data/lib/relaton/nist/CLAUDE.md

@@ -64,7 +64,8 @@ All data models inherit from `Lutaml::Model::Serializable` and use declarative a
   - **Per-record resilience (mirrors the ISO flavor).** A single bad record must never abort the crawl. `#write_file` skips (never `id.content`-crashes on) a record whose MODS entry yields **no docidentifier** (e.g. a DOI stored only in `<identifier type="doi">`, which `ModsParser#parse_doi` doesn't read), and records ids that `#pubid` can't parse (new series like `NIST RB`/`NIST CHIPS`) as "not indexed" — the YAML is still written, only the index-v2 entry is skipped. Both classes accumulate in `#failures`; the `#report_errors` override emits each at `:error` (via `#log_error` → `Util.error`), which the shared `Core::DataFetcher` gh_issue machinery turns into one "Error fetching documents" GitHub issue in CI (`GITHUB_REPOSITORY` + `GITHUB_TOKEN`). `#pubid` no longer warns per-failure; reporting is centralized in `#report_errors`.
   - **Draft-stage rows come from CSRC (relaton#313).** The MODS collection has no draft records, so `#fetch_csrc` adds the CSRC pubs-export feed (`PubsExport.instance.data`) after the MODS pass. It builds each row **exactly as the runtime builds a CSRC hit** — `HitCollection#hit_data` (which calls `#pubs_export_id`) → `Scraper.parse_page` — so the crawled id and the live id are one string, with the stage, revision and update from the row's uri and DOI (`NIST FIPS 197/Upd1 ipd`, `NIST SP 800-108r1 ipd`, `NIST SP 1800-12 2pd`). Only a row whose id carries a **stage** is written; finals come from MODS, so a CSRC row never shadows a base document. On the 914-row fixture feed this writes 302 staged records. Don't go back to a hand-built `"NIST #{series} #{docnumber} #{stage}"` id: it dropped the numbered drafts (`2pd`…), the `/UpdN`, and spelled revisions `Rev. 1`. A stage that CSRC does not list (e.g. `NIST FIPS 197 fpd`) still answers through the consumer's #303 family fallback. Three more rules: `#csrc_bib` clears the `fetched` date the runtime stamps, or every draft changes each day and `Core#force_write` rewrites ~300 files per incremental crawl; CSRC lists a republished draft twice (`…/ipd` and `…/ipd-(1)`, one DOI, so one id), so each id is written once and the plain uri wins; and only the build step is rescued (to a `#failures` entry) — a write error stops the crawl, as in the MODS pass. `#pubs_export_id` must not mutate its row (`sub`, not `sub!`): the crawler and the runtime share the `PubsExport` data.
   - **A CSRC relation names the related document (relaton#314).** `Scraper#related_id` finds the related feed row by its uri and derives its id with `HitCollection.pubs_export_id` (the class method the instance method delegates to). The entry's own `docidentifier` drops the update and the part, and the hit's code is the record's own id, so neither is the related id. `HitCollection#search_filter` ends in an `ensure` that returns `arr`: every branch must set `arr`, because an earlier `return` is overridden there.
-  - **CSWP comes from CSRC, not the NIST Library (relaton-nist#104).** The NIST Library announced CSWP data, but its MODS release (`allrecords-MODS.xml`, and the MARC `allrecords.xml`) holds **no** CSWP record — 0 on the Sept2026 release. It publishes CSWPs only as RIS/BibTeX files under `bib/` on its `nist-pages` branch. So the index has only the CSRC draft CSWP rows (`#fetch_csrc`), and a final CSWP answers from CSRC at runtime: `HitCollection#search` asks the CSRC feed (`from_json`) and asks the index (`from_ga`) only when CSRC gives no hit. That is the chosen rule — CSRC wins, no merge — because CSRC lists every numbered CSWP with more metadata (affiliations, status, supersedes, comment period). The known gap: the NIST Library also has about 35 **legacy dated ids** (`NIST CSWP 01142020`, the same paper as `CSWP 9`, from before NIST renumbered the series) and translations (`NIST.CSWP.6.spa`). CSRC lists neither, so they answer not-found; a fix needs a mapping built from those RIS files. `hit_collection_spec.rb` pins the CSRC answer.
+  - **CSWP comes from CSRC, not the NIST Library (relaton-nist#104).** The NIST Library announced CSWP data, but its MODS release (`allrecords-MODS.xml`, and the MARC `allrecords.xml`) holds **no** CSWP record — 0 on the Sept2026 release. It publishes CSWPs only as RIS/BibTeX files under `bib/` on its `nist-pages` branch. So the index has only the CSRC draft CSWP rows (`#fetch_csrc`), and a final CSWP answers from CSRC at runtime: `HitCollection#search` asks the CSRC feed (`from_json`) and asks the index (`from_ga`) only when CSRC gives no hit. That is the chosen rule — CSRC wins, no merge — because CSRC lists every numbered CSWP with more metadata (affiliations, status, supersedes, comment period). `hit_collection_spec.rb` pins the CSRC answer.
+  - **Legacy dated CSWP ids and CSWP translations come from a static table (relaton#406).** CSRC lists neither the ~30 **legacy dated ids** (`NIST CSWP 01142020`, the same paper as `CSWP 9`, from before NIST numbered the series) nor the translations (`NIST.CSWP.6.spa`). `cswp.yaml` holds both, built once from the 84 RIS files (header of the file says how), and `Cswp` reads it. `Bibliography.get` asks `Cswp.lookup` **first** — the parenthetical-date regex after it would strip `(spa)`. A legacy id fetches the numbered id through the normal CSRC path and adds the dated id as a non-primary docidentifier (`06222021-draft` → the CSRC `CSWP 19 ipd`); a translation, dated or numbered, answers an offline record from the table (`NIST CSWP 6(spa)`, the RIS title/authors/year/DOI, `language`/`script` from `Cswp::LANGUAGES`, a `translatedFrom` relation to the original). `normalize` reads `NIST CSWP 6 spa`, `NIST CSWP 6(spa)` and `NIST.CSWP.6.spa` as one key. `Processor#cache_pubid` returns nil (so `Db` hands `get` the String and does not cache) for **every legacy id** and for a translation that pubid does not render back. A legacy answer is the numbered record plus the dated id, and `Db` would store it under the numbered id's row, so a later `NIST CSWP 9` would carry `NIST CSWP 01142020`. pubid reads `04162018ar` as `04162018a`, `6 spa` as `6(spa)`, and fails on `04162018bg`/`02122014pl`. A translation answers only for its own RIS year. Not mapped, on purpose: `02042022-1`…`-5` have no SN and share the title "Cybersecurity White Paper: EO Response", so they still answer not-found. The CSRC `ipd` rows of `27`/`29`/`32` already answer, so the table leaves out their RIS files. A new translation means a new table row.
   - **`#write_file` serializes before it indexes**, so a record that fails to serialize leaves no index row naming a file that was never written. That is how a `Bib::Date` in `Scraper.fetch_dates` hid: `Nist::ItemData` takes `Nist::Date`, and YAML serialization rejects the parent class (the same strictness as the docidentifier note below).
 - `ModsParser` — maps MODS XML (via `loc_mods`) to `ItemData`
 - `Scraper` — fetches items from GitHub YAML or CSRC JSON

data/lib/relaton/nist/bibliography.rb

@@ -39,6 +39,9 @@ module Relaton
           # read back as its printed form; the pubid itself is not changed.
           ref = ref.to_s unless ref.is_a?(String)
           return fetch_ref_err(ref, year, []) if ref.match?(/\sEP$/)
+          # Before the parsing below, which reads "(spa)" as a date.
+          cswp = Cswp.lookup(ref)
+          return cswp_get(ref, cswp, year, opts) if cswp
 
           /^(?<code2>[^(]+)(?:\((?<date2>\w+\s(?:\d{2},\s)?\d{4})\))?\s?\(?(?:(?<=\()(?<stage>(?:I|F|\d)PD))?/ =~ ref
           stage ||= /(?<=\.)PD-\w+(?=\.)/.match(ref)&.to_s
@@ -62,6 +65,34 @@ module Relaton
 
         private
 
+        #
+        # Get a CSWP that CSRC does not list (relaton#406). A legacy dated id
+        # answers the numbered CSRC record, with the dated id as an extra
+        # docidentifier; a translation answers its record from the RIS table.
+        #
+        # @param ref [String] reference
+        # @param cswp [Array] the Cswp.lookup result
+        # @param year [String, nil] year
+        # @param opts [Hash] options
+        #
+        # @return [Relaton::Nist::ItemData, nil] bibliographic item
+        #
+        def cswp_get(ref, cswp, year, opts)
+          type, id, dated = cswp
+          if type == :translation
+            return fetch_ref_err(ref, year, [id[:year]]) if year && year.to_s != id[:year]
+
+            item = Cswp.translation_item(id)
+            Util.info "Found: `#{item.docidentifier.first.content}`", key: ref
+            return item
+          end
+
+          Util.info "Legacy dated CSWP id, fetching `#{id}`", key: ref
+          item = nistbib_get(id, year, opts)
+          item&.docidentifier&.<< Docidentifier.new(content: dated, type: "NIST")
+          item
+        end
+
         #
         # Get NIST document by reference
         #

data/lib/relaton/nist/cswp.rb

@@ -0,0 +1,137 @@
+require "yeptris/psych"
+
+module Relaton
+  module Nist
+    #
+    # CSWP ids the CSRC pubs-export feed does not list (relaton#406): the
+    # legacy dated ids from before the series was numbered, and the
+    # translations. The table (`cswp.yaml`) is built from the NIST Library RIS
+    # files; see the header of that file.
+    #
+    # This file loads no flavor model at require time, so the processor can
+    # ask #lookup on the cold path. #translation_item needs the models.
+    #
+    module Cswp
+      # ISO 639-2 code of a translation => [ISO 639-1 code, ISO 15924 script]
+      LANGUAGES = {
+        "ara" => %w[ar Arab], "bul" => %w[bg Cyrl], "fre" => %w[fr Latn],
+        "gre" => %w[el Grek], "ind" => %w[id Latn], "jpn" => %w[ja Jpan],
+        "kor" => %w[ko Kore], "may" => %w[ms Latn], "nor" => %w[no Latn],
+        "pol" => %w[pl Latn], "por" => %w[pt Latn], "spa" => %w[es Latn],
+        "ukr" => %w[uk Cyrl]
+      }.freeze
+
+      class << self
+        # @return [Hash] the table as written in cswp.yaml
+        def table
+          @table ||= Yeptris::Psych.load_file File.expand_path("cswp.yaml", __dir__)
+        end
+
+        #
+        # The comparable form of a CSWP reference: no publisher, the
+        # separators (".", "(...)") read as spaces, upper case.
+        # "NIST CSWP 6(spa)", "NIST.CSWP.6.spa" and "NIST CSWP 6 spa" all
+        # give "CSWP 6 SPA".
+        #
+        # @param ref [String]
+        # @return [String]
+        def normalize(ref)
+          ref.to_s.sub(/\ANIST[.\s]+/i, "").gsub(/[().]/, " ").squeeze(" ").strip.upcase
+        end
+
+        #
+        # Find a reference in the table.
+        #
+        # @param ref [String]
+        # @return [Array, nil] `[:legacy, numbered id, dated id]` for a
+        #   legacy id of an English CSWP, `[:translation, entry]` for a
+        #   translation (dated or numbered), nil otherwise
+        def lookup(ref)
+          key = normalize ref
+          return unless key.start_with? "CSWP "
+
+          key = key.delete_prefix "CSWP "
+          dated, target = legacy[key]
+          entry = translations[(target || key).upcase]
+          return [:translation, entry] if entry
+
+          [:legacy, "NIST CSWP #{target}", "NIST CSWP #{dated}"] if target
+        end
+
+        #
+        # Build the record of a translation from its RIS fields.
+        #
+        # @param entry [Hash] a translation entry from #lookup
+        # @return [Relaton::Nist::ItemData]
+        def translation_item(entry) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
+          number, lang_code = entry[:id].split
+          language, script = LANGUAGES.fetch lang_code
+          id = "NIST CSWP #{number}(#{lang_code})"
+          ItemData.new(
+            type: "standard",
+            docidentifier: [
+              Docidentifier.new(content: id, type: "NIST", primary: true),
+              Docidentifier.new(content: entry[:doi].split("/").last, type: "DOI"),
+            ],
+            title: [Bib::Title.new(content: entry[:title], language: "en", script: "Latn")],
+            source: [Bib::Uri.new(type: "doi", content: "https://doi.org/#{entry[:doi]}")],
+            date: [Date.new(type: "published", at: entry[:year])],
+            contributor: entry[:authors].map { |name| author name } << publisher,
+            language: [language],
+            script: [script],
+            relation: [original_relation("NIST CSWP #{number}")],
+            place: [Bib::Place.new(city: "Gaithersburg", region: [Bib::Place::RegionType.new(iso: "MD")])],
+            ext: Ext.new(doctype: Doctype.new(content: "standard"), flavor: "nist"),
+          )
+        end
+
+        private
+
+        # dated id (upper case) => [dated id, numbered id]
+        def legacy
+          @legacy ||= table["legacy"].to_h { |dated, numbered| [dated.upcase, [dated, numbered]] }
+        end
+
+        # translation id (upper case) => entry
+        def translations
+          @translations ||= table["translations"].to_h do |id, fields|
+            [id.upcase, fields.transform_keys(&:to_sym).merge(id: id, authors: fields["authors"] || [])]
+          end
+        end
+
+        # @param name [String] RIS author, "Surname, Forename"
+        # @return [Bib::Contributor]
+        def author(name)
+          surname, forename = name.split(/,\s*/, 2)
+          fullname = Bib::FullName.new(
+            surname: Bib::LocalizedString.new(content: surname, language: "en", script: "Latn"),
+            forename: [Bib::FullNameType::Forename.new(content: forename, language: "en", script: "Latn")],
+          )
+          Bib::Contributor.new(
+            person: Bib::Person.new(name: fullname),
+            role: [Bib::Contributor::Role.new(type: "author")],
+          )
+        end
+
+        # @return [Bib::Contributor]
+        def publisher
+          org = Bib::Organization.new(
+            name: [Bib::TypedLocalizedString.new(content: "National Institute of Standards and Technology")],
+            abbreviation: Bib::LocalizedString.new(content: "NIST"),
+          )
+          Bib::Contributor.new(organization: org, role: [Bib::Contributor::Role.new(type: "publisher")])
+        end
+
+        # @param id [String] the original's id
+        # @return [Relaton::Nist::Relation]
+        def original_relation(id)
+          bib = ItemData.new(
+            formattedref: Bib::Formattedref.new(content: id),
+            docidentifier: [Docidentifier.new(content: id, type: "NIST", primary: true)],
+          )
+          Relation.new(type: "translatedFrom", bibitem: bib)
+        end
+      end
+    end
+  end
+end

data/lib/relaton/nist/cswp.yaml

@@ -0,0 +1,155 @@
+# CSWP ids the CSRC pubs-export feed does not list (relaton#406).
+#
+# Source: the RIS files `bib/NIST.CSWP.*.ris` on the `nist-pages` branch of
+# usnistgov/NIST-Tech-Pubs (the NIST Library MODS/MARC releases hold no CSWP).
+#
+# legacy: a dated id from before the series was numbered -> the numbered id,
+#   matched by the exact RIS title (TI). A dated translation maps to the
+#   numbered translation. `06222021-draft` has no numbered RIS; its title is
+#   the CSRC `CSWP 19` initial public draft.
+#   Not mapped: `02042022-1`..`-5` have no SN and share the title
+#   "Cybersecurity White Paper: EO Response", so no numbered id matches.
+#
+# translations: numbered id + ISO 639-2 language code -> the RIS fields (TI,
+#   PY, DO, AU). The original is the numbered id without the language code.
+legacy:
+  "01142020": "9"
+  "01162020es": "10 spa"
+  "01162020id": "10 ind"
+  "01162020pt": "10 por"
+  "01262018": "5"
+  "02042020-1": "11"
+  "02042020-2": "11A"
+  "02042020-3": "11B"
+  "02042020-4": "11C"
+  "02042020-5": "11D"
+  "02042020-6": "11E"
+  "02042020-7": "11F"
+  "02122014": "1"
+  "02122014pl": "1 pol"
+  "02192014": "2"
+  "04162018": "6"
+  "04162018ar": "6 ara"
+  "04162018bg": "6 bul"
+  "04162018es": "6 spa"
+  "04162018fr": "6 fre"
+  "04162018id": "6 ind"
+  "04162018pt": "6 por"
+  "04212016": "4"
+  "04222019": "8"
+  "04232020": "13"
+  "04282021": "15"
+  "06032014": "3"
+  "06222021-draft": "19 ipd"
+  "09102018": "7"
+  "09292021": "21"
+translations:
+  "1 pol":
+    title: Framework for Improving Critical Infrastructure Cybersecurity, Version 1.0 (Polish translation)
+    year: "2014"
+    doi: 10.6028/NIST.CSWP.1.pol
+    authors:
+    - Stine, Kevin
+  "6 ara":
+    title: Framework for Improving Critical Infrastructure Cybersecurity, Version 1.1 (Arabic translation)
+    year: "2018"
+    doi: 10.6028/NIST.CSWP.6.ara
+    authors:
+    - Stine, Kevin
+  "6 bul":
+    title: Framework for Improving Critical Infrastructure Cybersecurity, Version 1.1 (Bulgarian translation)
+    year: "2018"
+    doi: 10.6028/NIST.CSWP.6.bul
+    authors:
+    - Stine, Kevin
+  "6 fre":
+    title: Framework for Improving Critical Infrastructure Cybersecurity, Version 1.1 (French Translation)
+    year: "2018"
+    doi: 10.6028/NIST.CSWP.6.fre
+    authors:
+    - Stine, Kevin
+  "6 gre":
+    title: Greek Translation of the Framework for Improving Critical Infrastructure Cybersecurity
+    year: "2018"
+    doi: 10.6028/NIST.CSWP.6.gre
+    authors:
+    - Stine, Kevin
+  "6 ind":
+    title: Framework for Improving Critical Infrastructure Cybersecurity, Version 1.1 (Indonesian Translation)
+    year: "2018"
+    doi: 10.6028/NIST.CSWP.6.ind
+    authors:
+    - Stine, Kevin
+  "6 jpn":
+    title: Japanese Translation of Framework for Improving Critical Infrastructure Cybersecurity Version 1.1 (Cybersecurity Framework)
+    year: "2018"
+    doi: 10.6028/NIST.CSWP.6.jpn
+    authors:
+    - Stine, Kevin
+  "6 kor":
+    title: Korean Translation of the Framework for Improving Critical Infrastructure Cybersecurity Version 1.1
+    year: "2024"
+    doi: 10.6028/NIST.CSWP.6.kor
+    authors:
+    - Stine, Kevin
+  "6 may":
+    title: Malay Translation of the Framework for Improving Critical Infrastructure Cybersecurity V1.1
+    year: "2018"
+    doi: 10.6028/NIST.CSWP.6.may
+    authors:
+    - Stine, Kevin
+  "6 nor":
+    title: Norwegian Translation of the Framework for Improving Critical Infrastructure Cybersecurity Version 1.1
+    year: "2018"
+    doi: 10.6028/NIST.CSWP.6.nor
+    authors:
+    - Stine, Kevin
+  "6 por":
+    title: Portuguese Translation of the Framework for Improving Critical Infrastructure Cybersecurity Version 1.1 (Cybersecurity Framework)
+    year: "2018"
+    doi: 10.6028/NIST.CSWP.6.por
+    authors:
+    - Stine, Kevin
+  "6 spa":
+    title: Framework for Improving Critical Infrastructure Cybersecurity, Version 1.1 (Spanish translation)
+    year: "2018"
+    doi: 10.6028/NIST.CSWP.6.spa
+    authors:
+    - Stine, Kevin
+  "6 ukr":
+    title: Ukranian Translation of the Framework for Improving Critical Infrastructure Cybersecurity Version 1.1 (Cybersecurity Framework)
+    year: "2018"
+    doi: 10.6028/NIST.CSWP.6.ukr
+    authors:
+    - Stine, Kevin
+  "10 ara":
+    title: "NIST Privacy Framework: A Tool for Improving Privacy Through Enterprise Risk Management, Version 1.0 (Arabic translation)"
+    year: "2022"
+    doi: 10.6028/NIST.CSWP.10.ara
+    authors:
+    - Lefkovitz, Naomi
+    - Boeckl, Katie
+  "10 ind":
+    title: Indonesian Translation of the NIST Privacy Framework Version 1.0
+    year: "2020"
+    doi: 10.6028/NIST.CSWP.10.ind
+    authors:
+    - Lefkovitz, Naomi
+  "10 may":
+    title: "NIST Privacy Framework: A Tool for Improving Privacy Through Enterprise Risk Management, Version 1.0 (Malay translation)"
+    year: "2024"
+    doi: 10.6028/NIST.CSWP.10.may
+    authors:
+    - Lefkovitz, Naomi
+  "10 por":
+    title: Portuguese Translation of the NIST Privacy Framework Version 1.0
+    year: "2021"
+    doi: 10.6028/NIST.CSWP.10.por
+    authors:
+    - Lefkovitz, Naomi
+  "10 spa":
+    title: Spanish Translation of the NIST Privacy Framework Version 1.0
+    year: "2021"
+    doi: 10.6028/NIST.CSWP.10.spa
+    authors:
+    - Lefkovitz, Naomi

data/lib/relaton/nist/data_fetcher.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
-require "yaml"
+require "yeptris/psych"
+
 require "mechanize"
 require "loc_mods"
 require_relative "../nist"
@@ -183,7 +184,7 @@ module Relaton
       end
 
       def series
-        @series ||= YAML.load_file File.expand_path("series.yaml", __dir__)
+        @series ||= Yeptris::Psych.load_file File.expand_path("series.yaml", __dir__)
       end
     end
   end

data/lib/relaton/nist/processor.rb

@@ -21,6 +21,26 @@ module Relaton
         Bibliography.get(code, date, opts)
       end
 
+      # Two kinds of Cswp table reference reach `get` as written and are not
+      # cached (relaton#406). A legacy dated id answers the numbered record
+      # with the dated id added, and Db would store that record under the
+      # numbered id's row, so a later "NIST CSWP 9" would carry the dated id.
+      # A translation that pubid reads in another form ("NIST CSWP
+      # 04162018ar" as "...04162018a", "NIST CSWP 6 spa" as "...6(spa)").
+      #
+      # @param ref [String]
+      # @return [Pubid::Nist::Identifier, nil]
+      def cache_pubid(ref)
+        pubid = super
+        return if pubid.nil?
+
+        require_relative "cswp"
+        type, = Cswp.lookup(ref)
+        return pubid if type.nil? || (type == :translation && pubid.to_s == ref)
+
+        nil
+      end
+
       #
       # Fetch all the documents from a source
       #

data/lib/relaton/nist.rb

@@ -12,6 +12,7 @@ require_relative "nist/pubs_export"
 require_relative "nist/hit"
 require_relative "nist/hit_collection"
 require_relative "nist/scraper"
+require_relative "nist/cswp"
 require_relative "nist/bibliography"
 # require_relative "nist/tech_pubs_parser"
 

data/lib/relaton/sdo/store.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "yeptris/psych"
+
 module Relaton
   module Sdo
     # Singleton registry of organizations, built lazily from the index manifest
@@ -35,7 +37,7 @@ module Relaton
 
       def build_index
         yaml = Fetcher.fetch_index
-        data = yaml.nil? || yaml.empty? ? {} : YAML.safe_load(yaml)
+        data = yaml.nil? || yaml.empty? ? {} : Yeptris::Psych.safe_load(yaml)
         # A corrupt/unexpected index (non-mapping YAML) degrades to "no orgs"
         # rather than crashing every lookup with a TypeError.
         organizations = data.is_a?(Hash) ? (data["organizations"] || {}) : {}

data/lib/relaton/version.rb

@@ -1,3 +1,3 @@
 module Relaton
-  VERSION = "3.0.2".freeze
+  VERSION = "3.0.4".freeze
 end

data/lib/relaton/xsf/hit.rb

@@ -1,3 +1,4 @@
+require "yeptris/psych"
 module Relaton
   module Xsf
     class Hit < Relaton::Core::Hit
@@ -6,7 +7,7 @@ module Relaton
 
         agent = Mechanize.new
         resp = agent.get hit[:url]
-        hash = YAML.safe_load resp.body
+        hash = Yeptris::Psych.safe_load resp.body
         hash["fetched"] = Date.today.to_s
         @doc = Relaton::Xsf::Item.from_yaml hash.to_yaml
       rescue StandardError => e

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-10-30 00:00:00.000000000 Z
+date: 2026-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -42,30 +42,30 @@ dependencies:
   name: base64
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: bibtex-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: cnccs
   requirement: !ruby/object:Gem::Requirement
@@ -98,16 +98,16 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.10'
 - !ruby/object:Gem::Dependency
   name: csv
   requirement: !ruby/object:Gem::Requirement
@@ -224,16 +224,16 @@ dependencies:
   name: iso639
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: isoics
   requirement: !ruby/object:Gem::Requirement
@@ -282,20 +282,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: 0.2.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: 0.2.8
 - !ruby/object:Gem::Dependency
   name: lutaml-model
   requirement: !ruby/object:Gem::Requirement
@@ -370,30 +364,30 @@ dependencies:
   name: moxml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: leptris
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.80
+        version: 1.9.391
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.80
+        version: 1.9.391
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement
@@ -410,92 +404,60 @@ dependencies:
         version: '1.26'
 - !ruby/object:Gem::Dependency
   name: parsanol
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.114
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.4'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.114
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.4'
-- !ruby/object:Gem::Dependency
-  name: parslet
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 1.3.114
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 1.3.114
 - !ruby/object:Gem::Dependency
   name: pubid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.1
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.1
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: yeptris
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.51
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.51
 - !ruby/object:Gem::Dependency
   name: relaton-render
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0.pre.alpha.1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0.pre.alpha.1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rfcxml
   requirement: !ruby/object:Gem::Requirement
@@ -1159,6 +1121,8 @@ files:
 - lib/relaton/nist/bibitem.rb
 - lib/relaton/nist/bibliography.rb
 - lib/relaton/nist/comment_period.rb
+- lib/relaton/nist/cswp.rb
+- lib/relaton/nist/cswp.yaml
 - lib/relaton/nist/data_fetcher.rb
 - lib/relaton/nist/date.rb
 - lib/relaton/nist/docidentifier.rb