relaton 3.0.1 → 3.0.3

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/docidentifier.rb

@@ -74,10 +74,6 @@ module Relaton
         original_content
       end
 
-      def to_s
-        content.to_s
-      end
-
       # `#exclude` (no args) clones the whole graph (incl. a supplement's
       # base), since `walk_chain` mutates it in place. `@raw_content` freezes
       # the stripped rendering — `content` is live from `@pubid`, and the

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/pubs_export.rb

@@ -1,3 +1,4 @@
+require "yeptris"
 require "singleton"
 
 module Relaton
@@ -61,7 +62,7 @@ module Relaton
       #
       def unzip
         Zip::File.open(DATAFILE) do |zf|
-          JSON.parse zf.first.get_input_stream.read
+          Relaton::Json.parse_external zf.first.get_input_stream.read
         end
       end
     end

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/ogc/data_fetcher.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
+
 require "fileutils"
 require "faraday"
-require "json"
 require_relative "../ogc"
 require_relative "scraper"
 
@@ -126,7 +126,7 @@ module Relaton
         resp = Faraday.new(ENDPOINT, headers: h).get
         case resp.status
         when 200
-          json = JSON.parse(resp.body)
+          json = Relaton::Json.parse_external(resp.body)
           block_given? ? yield(resp[:etag], json) : json
         when 304 then []
         else raise Relaton::RequestError, "Could not access #{ENDPOINT}"

data/lib/relaton/omg/scraper.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "json"
+
 require "mechanize"
 require "pubid"
 
@@ -118,10 +118,10 @@ module Relaton
         script = @doc.at_xpath('//script[@type="application/ld+json"]')
         return unless script
 
-        node = JSON.parse(script.text).find { |e| e.is_a?(Hash) && e[LD_DATE] }
+        node = Relaton::Json.parse_external(script.text).find { |e| e.is_a?(Hash) && e[LD_DATE] }
         value = node && node[LD_DATE].first["@value"]
         value && ::Date.parse(value)
-      rescue JSON::ParserError, ::Date::Error
+      rescue ::JSON::ParserError, ::Date::Error
         nil
       end
 

data/lib/relaton/plateau/data_fetcher.rb

@@ -1,3 +1,4 @@
+require "yeptris"
 require "json"
 require "relaton/core"
 require_relative "../plateau"
@@ -78,7 +79,7 @@ module Relaton
         body = hadle_response(response)
 
         # Parse the JSON response
-        JSON.parse(body)
+        Relaton::Json.parse_external(body)
       rescue StandardError => e
         # Handle any errors during the fetching process
         Util.error "Error fetching JSON data from #{url}: #{e.message}"

data/lib/relaton/un/hit_collection.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
+require "yeptris"
+
 require "faraday"
-require "json"
 require "securerandom"
 
 module Relaton
@@ -28,11 +29,11 @@ module Relaton
       def search_api(text) # rubocop:disable Metrics/MethodLength
         resp = connection.post("search?l=en&rid=#{SecureRandom.uuid}") do |req|
           req.headers["Content-Type"] = "application/json"
-          req.body = JSON.generate(search_body(text))
+          req.body = Yeptris::JSON.dump(search_body(text))
         end
         return unless resp.success?
 
-        body = JSON.parse(resp.body)
+        body = Relaton::Json.parse_external(resp.body)
         return unless body["status"] == 1
 
         body.dig("body", "data")

data/lib/relaton/version.rb

@@ -1,3 +1,3 @@
 module Relaton
-  VERSION = "3.0.1".freeze
+  VERSION = "3.0.3".freeze
 end

data/lib/relaton.rb

@@ -22,6 +22,7 @@ module Relaton
   autoload :Logger, "relaton/logger"
   autoload :Equivalence, "relaton/equivalence"
   autoload :Core, "relaton/core"
+  autoload :Json, "relaton/json"
   autoload :Index, "relaton/index"
   autoload :Bib, "relaton/bib"
   autoload :ThreeGpp, "relaton/3gpp"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-10-29 00:00:00.000000000 Z
+date: 2026-10-31 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
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: '2.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: faraday-net_http_persistent
   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
@@ -248,20 +248,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.6
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
 - !ruby/object:Gem::Dependency
   name: loc_mods
   requirement: !ruby/object:Gem::Requirement
@@ -296,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
@@ -384,30 +364,30 @@ dependencies:
   name: moxml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: 0.5.174
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: 0.5.174
 - !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
@@ -424,86 +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.112
-    - - "<"
-      - !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.112
-    - - "<"
-      - !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.0.pre.alpha.62
+        version: 2.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre.alpha.62
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: yeptris
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: 0.6.51
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        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
@@ -1149,6 +1103,7 @@ files:
 - lib/relaton/jis/scraper.rb
 - lib/relaton/jis/structured_identifier.rb
 - lib/relaton/jis/util.rb
+- lib/relaton/json.rb
 - lib/relaton/logger.rb
 - lib/relaton/logger/CLAUDE.md
 - lib/relaton/logger/README.adoc
@@ -1166,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