relaton 3.0.0.pre.alpha.4 → 3.0.0.pre.alpha.6

data/lib/relaton/iana/bibliography.rb

@@ -15,10 +15,10 @@ module Relaton
     module Bibliography
       SOURCE = "https://raw.githubusercontent.com/relaton/relaton-data-iana/refs/heads/v2/"
 
-      # @param text [String, Pubid::Iana::Identifier]
+      # @param ref [String, Pubid::Iana::Identifier]
       # @return [Relaton::Iana::Item, nil]
-      def search(text)
-        pubid = parse_ref text
+      def search(ref)
+        pubid = parse_ref ref
         return unless pubid
 
         # Pass the pubid so Relaton::Index narrows candidates by number via
@@ -34,19 +34,19 @@ module Relaton
         raise Relaton::RequestError, e.message
       end
 
-      # @param ref [String] the IANA registry slug to look up
+      # @param ref [String, Pubid::Iana::Identifier] the IANA registry slug to look up
       # @param year [String, NilClass] not used
       # @param opts [Hash] options
       # @return [Relaton::Iana::Item, nil]
       def get(ref, _year = nil, _opts = {})
-        Util.info "Fetching from Relaton repository ...", key: ref
+        Util.info "Fetching from Relaton repository ...", key: ref.to_s
         result = search(ref)
         unless result
-          Util.info "Not found.", key: ref
+          Util.info "Not found.", key: ref.to_s
           return
         end
 
-        Util.info "Found: `#{result.docidentifier[0].content}`", key: ref
+        Util.info "Found: `#{result.docidentifier[0].content}`", key: ref.to_s
         result
       end
 
@@ -63,14 +63,14 @@ module Relaton
       # RuntimeError on anything else, and a citation relaton cannot parse is a
       # miss, not an error — `#get` reports it as "Not found.".
       #
-      # @param text [String, Pubid::Iana::Identifier]
+      # @param ref [String, Pubid::Iana::Identifier]
       # @return [Pubid::Iana::Identifier, nil]
-      def parse_ref(text)
-        return text unless text.is_a? String
+      def parse_ref(ref)
+        return ref unless ref.is_a? String
 
-        ::Pubid::Iana::Identifier.parse text
+        ::Pubid::Iana::Identifier.parse ref
       rescue StandardError => e
-        Util.warn "Failed to parse pubid `#{text}`: #{e.message}"
+        Util.warn "Failed to parse pubid `#{ref}`: #{e.message}"
         nil
       end
 

data/lib/relaton/iana/data_fetcher.rb

@@ -51,11 +51,11 @@ module Relaton
       end
 
       def parse(content)
-        xml = Nokogiri::XML(content)
-        registry = xml.at("/xmlns:registry")
+        xml = Moxml.parse(content)
+        registry = xml.at_xpath("/xmlns:registry", NS)
         doc = Parser.parse registry, nil, @errors
         save_doc doc
-        registry.xpath("./xmlns:registry").each { |r| save_doc Parser.parse(r, doc, @errors) }
+        registry.xpath("./xmlns:registry", NS).each { |r| save_doc Parser.parse(r, doc, @errors) }
       end
 
       #

data/lib/relaton/iana/parser.rb

@@ -1,10 +1,14 @@
 module Relaton
   module Iana
+    # The IANA registry XML uses a default namespace, and moxml (unlike raw
+    # nokogiri) does not bind the literal `xmlns:` prefix to it — every
+    # namespaced query passes this binding explicitly.
+    NS = { "xmlns" => "http://www.iana.org/assignments" }.freeze
     class Parser
       #
       # Document parser initalization
       #
-      # @param [Nokogiri::XML::Element] xml
+      # @param [Moxml::Element] xml
       #
       def initialize(xml, rootdoc, errors = {})
         @xml = xml
@@ -15,7 +19,7 @@ module Relaton
       #
       # Initialize document parser and run it
       #
-      # @param [Nokogiri::XML::Element] xml
+      # @param [Moxml::Element] xml
       #
       # @return [Relaton::Iana::ItemData, nil] bibliographic item
       #
@@ -50,7 +54,7 @@ module Relaton
       # @return [Array<Relaton::Bib::Title>] title
       #
       def parse_title
-        content = @xml.at("./xmlns:title")&.text || @xml[:id]
+        content = @xml.at_xpath("./xmlns:title", NS)&.text || @xml[:id]
         result = [Bib::Title.new(content: content, language: "en", script: "Latn")]
         @errors[:title] &&= result.empty?
         result
@@ -121,8 +125,11 @@ module Relaton
       # @return [Array<Relaton::Bib::Date>] date
       #
       def parse_date
-        d = @xml.xpath("./xmlns:created|./xmlns:published|./xmlns:updated").map do |dt|
-          Bib::Date.new(type: dt.name, at: dt.text)
+        # moxml 0.5.98 drops every branch after the second in an N>=3 union
+        # under the reserved `xmlns` prefix (lutaml/moxml#315), which silently
+        # stripped `updated` dates from every crawled registry.
+        d = %w[created published updated].flat_map do |type|
+          @xml.xpath("./xmlns:#{type}", NS).map { |dt| Bib::Date.new(type: dt.name, at: dt.text) }
         end
         result = d.none? && @rootdoc ? @rootdoc.date : d
         @errors[:date] &&= result.empty?

data/lib/relaton/iana/processor.rb

@@ -8,6 +8,7 @@ module Relaton
       def initialize # rubocop:disable Lint/MissingSuper
         @short = :relaton_iana
         @prefix = "IANA"
+        @pubid_identifier = :Iana # Db cache key
         @defaultprefix = %r{^IANA\s}
         @idtype = "IANA"
         @datasets = %w[iana-registries]
@@ -35,6 +36,14 @@ module Relaton
         DataFetcher.fetch(source, **opts)
       end
 
+      # `get` reads a reference pubid cannot parse as a miss, so it gets no key
+      # here either: it is not cached.
+      def cache_pubid(ref)
+        super
+      rescue StandardError
+        nil
+      end
+
       # @param xml [String]
       # @return [Relaton::Iana::ItemData]
       def from_xml(xml)

data/lib/relaton/iec/bibliography.rb

@@ -24,18 +24,29 @@ module Relaton
           raise Relaton::RequestError, e.message
         end
 
-        # @param code [String] the IEC standard code to look up (e.g. "IEC 8000")
+        # @param ref [String, Pubid::Iec::Identifier] the IEC standard code to
+        #   look up (e.g. "IEC 8000"), or the parse that Relaton::Db routed
+        #   with (relaton#205); a pubid is never mutated
         # @param year [String] the year the standard was published (optional)
         # @param opts [Hash] options; restricted to :all_parts if all-parts
         #   reference is required
         # @return [Relaton::Iec::ItemData, nil]
-        def get(code, year = nil, opts = {}) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity
-          opts[:all_parts] ||= code.match?(/\s\(all parts\)/)
-          ref = code.sub(/\s\(all parts\)/, "")
-          return iev if ref.casecmp("IEV").zero?
-
-          pubid = ::Pubid::Iec::Identifier.parse ref.upcase
+        def get(ref, year = nil, opts = {}) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity,Metrics/MethodLength
+          if ref.is_a?(String)
+            opts[:all_parts] ||= ref.match?(/\s\(all parts\)/)
+            text = ref.sub(/\s\(all parts\)/, "")
+            return iev if text.casecmp("IEV").zero?
+
+            pubid = ::Pubid::Iec::Identifier.parse text.upcase
+          elsif ref.all_parts?
+            opts[:all_parts] = true
+            pubid = ref.identifiers.first
+          else
+            pubid = ref
+          end
           if year
+            # Copy first: a caller's pubid is also its Db cache key.
+            pubid = pubid.class.from_hash(pubid.to_hash)
             pubid.date = ::Pubid::Components::Date.new(year: year.to_s)
           end
 

data/lib/relaton/iec/data_parser.rb

@@ -289,38 +289,53 @@ module Relaton
       #
       # @return [Array<Relaton::Bib::Relation>] relation
       #
-      def relation # rubocop:disable Metrics/MethodLength
+      def relation
+        result = fetch_relations
+        @errors[:relation] &&= result.empty?
+        result
+      end
+
+      #
+      # Fetch relations from the webstore. Retry on network errors only.
+      # A non-success response (the legacy endpoint now redirects to a 404
+      # HTML page) or a malformed body gives no relations.
+      #
+      # @return [Array<Relaton::Bib::Relation>] relations
+      #
+      def fetch_relations # rubocop:disable Metrics/MethodLength
         try = 0
-        result = begin
+        begin
           uri = URI "#{DOMAIN}/webstore/webstore.nsf/AjaxRequestXML?Openagent&url=#{urn_id}"
           resp = Net::HTTP.get_response uri
-          doc = Nokogiri::XML resp.body
-          create_relations doc
         rescue StandardError => e
           try += 1
           try < 3 ? retry : raise(e)
         end
-        @errors[:relation] &&= result.empty?
-        result
+        return [] if resp.is_a?(Net::HTTPResponse) && !resp.is_a?(Net::HTTPSuccess)
+
+        create_relations Moxml.parse(resp.body)
+      rescue Moxml::ParseError => e
+        Util.warn "Failed to parse relations for `#{urn_id}`: #{e.message.lines.first&.strip}"
+        []
       end
 
       #
       # Create relations.
       #
-      # @param [Nokogiri::XML::Document] doc XML document
+      # @param [Moxml::Document] doc XML document
       #
       # @return [Array<Relaton::Bib::Relation>] relations
       #
       def create_relations(doc) # rubocop:disable Metrics/MethodLength
         doc.xpath('//ROW[STATUS[.!="PREPARING" and .!="PUBLISHED"]]')
           .map do |r|
-          r_type = r.at("STATUS").text.downcase
+          r_type = r.at_xpath("STATUS").text.downcase
           type = case r_type
                 when "revised", "replaced" then "updates"
                 when "withdrawn" then "obsoletes"
                 else r_type
                 end
-          ref = r.at("FULL_NAME").text
+          ref = r.at_xpath("FULL_NAME").text
           docid = Docidentifier.new(content: ref, type: "IEC", primary: true)
           bibitem = ItemData.new(formattedref: Bib::Formattedref.new(content: ref), docidentifier: [docid])
           Relation.new type: type, bibitem: bibitem

data/lib/relaton/iec/processor.rb

@@ -34,6 +34,12 @@ module Relaton
         DataFetcher.fetch(source, **opts)
       end
 
+      # `IEV` is not a document identifier (`get` answers it with the IEV
+      # vocabulary), so it gets no key: it is not cached.
+      def cache_pubid(ref)
+        ref.strip.casecmp?("IEV") ? nil : super
+      end
+
       # @param xml [String]
       # @return [Relaton::Iec::ItemData]
       def from_xml(xml)
@@ -57,7 +63,12 @@ module Relaton
 
       # @param code [String]
       # @return [String, nil]
+      # Only a URN: `Relaton::Iec.urn_to_code` splits on `:`, so it would
+      # rewrite any reference with enough colons
+      # (`IEC 60034-1:1969+AMD1:1977+AMD2:1979+AMD3:1980 CSV`).
       def urn_to_code(code)
+        return unless code.match?(/\Aurn:/i)
+
         require_relative "../iec"
         Relaton::Iec.urn_to_code code
       end

data/lib/relaton/iec.rb

@@ -1,6 +1,6 @@
 require "digest/md5"
 require "net/http"
-require "nokogiri"
+require "moxml"
 require "pubid"
 require "zip"
 require "relaton/index"

data/lib/relaton/ieee/bibliography.rb

@@ -7,11 +7,12 @@ module Relaton
         #
         # Search IEEE bibliography item by reference.
         #
-        # @param code [String]
+        # @param ref [String, Pubid::Ieee::Identifier] the reference, or its
+        #   parse from Relaton::Db (relaton#205)
         #
         # @return [Relaton::Ieee::ItemData, nil]
         #
-        def search(code) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+        def search(ref) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
           index = Relaton::Index.find_or_create :ieee, url: "#{GH_URL}#{INDEXFILE}.zip", file: "#{INDEXFILE}.yaml",
                                                        pubid_class: ::Pubid::Ieee::Identifier
           # Pass the parsed pubid (not the raw String) so index-v2 narrows
@@ -20,7 +21,7 @@ module Relaton
           # unparseable/partial ref falls back to the full-scan String search.
           # Rows are Pubid::Ieee::Identifier objects (not Comparable), so pick by
           # the string form.
-          pubid = parse_pubid code
+          pubid = parse_pubid ref
           needle = pubid.to_s
           row = index.search(pubid) { |r| r[:id].to_s.include?(needle) }.min_by { |r| r[:id].to_s }
           return unless row
@@ -36,20 +37,22 @@ module Relaton
         #
         # Get IEEE bibliography item by reference.
         #
-        # @param code [String] the IEEE standard Code to look up (e..g "528-2019")
+        # @param ref [String, Pubid::Ieee::Identifier] the IEEE standard
+        #   reference to look up (e.g. "IEEE 528-2019"), or its parse from
+        #   Relaton::Db (relaton#205)
         # @param year [String] the year the standard was published (optional)
         # @param opts [Hash] options
         #
         # @return [Relaton::Ieee::ItemData, nil]
         #
-        def get(code, _year = nil, _opts = {}) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
-          Util.info "Fetching from Relaton repository ...", key: code
-          item = search(code)
+        def get(ref, _year = nil, _opts = {}) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+          Util.info "Fetching from Relaton repository ...", key: ref.to_s
+          item = search(ref)
           if item
-            Util.info "Found: `#{item.docidentifier.first.content}`", key: code
+            Util.info "Found: `#{item.docidentifier.first.content}`", key: ref.to_s
             item
           else
-            Util.info "Not found.", key: code
+            Util.info "Not found.", key: ref.to_s
             nil
           end
         end
@@ -60,12 +63,15 @@ module Relaton
         # return the raw String when pubid can't parse it (e.g. a partial ref) so
         # the search falls back to the substring scan.
         #
-        # @param code [String]
+        # @param ref [String, ::Pubid::Ieee::Identifier]
         # @return [::Pubid::Ieee::Identifier, String]
-        def parse_pubid(code)
-          ::Pubid::Ieee::Identifier.parse code
+        def parse_pubid(ref)
+          # A pubid from Relaton::Db (relaton#205) is used as it is.
+          return ref unless ref.is_a?(String)
+
+          ::Pubid::Ieee::Identifier.parse ref
         rescue StandardError
-          code
+          ref
         end
       end
     end

data/lib/relaton/ieee/data_fetcher.rb

@@ -147,7 +147,7 @@ module Relaton
       # IdamsParser#parse_relation, so mutates crossrefs under a mutex.
       #
       # @param [String] docnumber of main document
-      # @param [Nokogiri::XML::Element] amsid relation data
+      # @param [Moxml::Element] amsid relation data
       #
       def add_crossref(docnumber, amsid)
         return if RELATION_TYPES[amsid.type] == false

data/lib/relaton/ieee/processor.rb

@@ -36,6 +36,30 @@ module Relaton
         DataFetcher.fetch(source, **opts)
       end
 
+      # `get` reads a reference pubid cannot parse as a miss, so it gets no key
+      # here either: it is not cached.
+      def cache_pubid(ref)
+        super
+      rescue StandardError
+        nil
+      end
+
+      # An IEEE pubid keeps the other publishers in `publishers` (a joint
+      # development) or `copublisher` (a standard), not in the shared
+      # `copublishers`.
+      #
+      # @param pubid [Pubid::Ieee::Identifier]
+      # @return [Array<String>]
+      def copublishers(pubid)
+        pubid = pubid.identifiers.first if pubid.all_parts?
+        others = if pubid.respond_to?(:publishers) && pubid.publishers
+                   pubid.publishers
+                 elsif pubid.respond_to?(:copublisher)
+                   pubid.copublisher
+                 end
+        Array(others).map(&:to_s) - %w[IEEE AIEE]
+      end
+
       # @param xml [String]
       # @return [Relaton::Ieee::ItemData]
       def from_xml(xml)

data/lib/relaton/ieee/rawbib_id_parser.rb

@@ -138,8 +138,8 @@ module Relaton
           Renderer.new(publisher: "IEEE", number: "P802", part: "11aj", draft: "8.0", year: "2017")
         when "IEEE P802.11ajD9.0, November 2017" # "IEEE P802-11aj/D9.0.2017"
           Renderer.new(publisher: "IEEE", number: "P802", part: "11aj", draft: "9.0", year: "2017")
-        when "ISO/IEC/IEEE P29119-4-DISMay2013" # "ISO/IEC/IEEE DIS P29119-4.2013"
-          Renderer.new(publisher: "ISO/IEC/IEEE", stage: "DIS", number: "P29119", part: "4", year: "2013")
+        when "ISO/IEC/IEEE P29119-4-DISMay2013" # "ISO/IEC/IEEE DIS P29119-4.2013-05"
+          Renderer.new(publisher: "ISO/IEC/IEEE", stage: "DIS", number: "P29119", part: "4", year: "2013", month: "05")
         when "IEEE-P15026-3-DIS-January 2015" # "IEEE DIS P15026-3.2015"
           Renderer.new(publisher: "IEEE", stage: "DIS", number: "P15026", year: "2015")
         when "ANSI/IEEE PC63.7/D rev17, December 2014" # "ANSI/IEEE PC63-7/D/REV-17.2014"

data/lib/relaton/ietf/bibliography.rb

@@ -7,25 +7,27 @@ module Relaton
   # IETF bibliography module
     module Bibliography
       class << self
-        # @param code [String] the ISO standard Code to look up (e..g "ISO 9000")
+        # @param ref [String, Pubid::Ietf::Identifier] the IETF reference
+        #   (e.g. "RFC 8341"), or its parse from Relaton::Db (relaton#205)
         # @return [RelatonIetf::IetfBibliographicItem]
-        def search(text)
-          Scraper.scrape_page text
+        def search(ref)
+          Scraper.scrape_page ref
         end
 
-        # @param code [String] the ISO standard Code to look up (e..g "ISO 9000")
+        # @param ref [String, Pubid::Ietf::Identifier] the IETF reference
+        #   (e.g. "RFC 8341"), or its parse from Relaton::Db (relaton#205)
         # @param year [String] the year the standard was published (optional)
         # @param opts [Hash] options; restricted to :all_parts if all-parts
         #   reference is required
         # @return [RelatonIetf::IetfBibliographicItem] Relaton of reference
-        def get(code, _year = nil, _opts = {})
-          Util.info "Fetching from Relaton repository ...", key: code
-          result = search code
+        def get(ref, _year = nil, _opts = {})
+          Util.info "Fetching from Relaton repository ...", key: ref.to_s
+          result = search ref
           if result
             docid = result.docidentifier.detect(&:primary) || result.docidentifier.first
-            Util.info "Found: `#{docid.content}`", key: code
+            Util.info "Found: `#{docid.content}`", key: ref.to_s
           else
-            Util.info "Not found.", key: code
+            Util.info "Not found.", key: ref.to_s
           end
           result
         end

data/lib/relaton/ietf/data_fetcher.rb

@@ -332,7 +332,7 @@ module Relaton
       #
       # Get RFC index
       #
-      # @return [Nokogiri::XML::Document] RFC index
+      # @return [Moxml::Document] RFC index
       #
       def rfc_index
         uri = URI "https://www.rfc-editor.org/rfc-index.xml"

data/lib/relaton/ietf/processor.rb

@@ -6,6 +6,7 @@ module Relaton
       def initialize # rubocop:disable Lint/MissingSuper
         @short = :relaton_ietf
         @prefix = "IETF"
+        @pubid_identifier = :Ietf # Db cache key
         @defaultprefix = /^((IETF|RFC|BCP|FYI|STD)\s|I-D[.\s])/
         @idtype = "IETF"
         @datasets = %w[ietf-rfcsubseries ietf-internet-drafts ietf-rfc-entries]

data/lib/relaton/ietf/rfc/entry.rb

@@ -195,8 +195,7 @@ module Relaton
             formattedref: build_formattedref,
             date: build_subseries_date(rfc_index),
             relation: build_relations(rfc_index, wg_names: wg_names),
-            series: build_series,
-            ext: Ext.new(doctype: Doctype.new(content: "rfc"), stream: stream, flavor: "ietf"),
+            ext: Ext.new(doctype: Doctype.new(content: "rfc"), stream: canonical_stream, flavor: "ietf"),
           )
         end
 
@@ -259,13 +258,6 @@ module Relaton
           ItemData.new(formattedref: Bib::Formattedref.new(content: ref), docidentifier: [docid])
         end
 
-        def build_series
-          return [] unless stream
-
-          t = Bib::Title.new(content: stream)
-          [Bib::Series.new(type: "stream", title: [t])]
-        end
-
         # --- RFC entry builders ---
 
         def build_rfc_docid
@@ -388,7 +380,7 @@ module Relaton
         def build_rfc_series
           series = build_rfc_is_also_series
           series << Bib::Series.new(title: [Bib::Title.new(content: "RFC")], number: shortnum)
-          series + build_rfc_stream_series
+          series
         end
 
         def build_rfc_is_also_series
@@ -401,27 +393,31 @@ module Relaton
           end
         end
 
-        def build_rfc_stream_series
-          return [] unless stream
-
-          t = Bib::Title.new(content: stream)
-          [Bib::Series.new(type: "stream", title: [t])]
-        end
-
         STREAM_ORGS = {
           "IETF" => ["IETF", "Internet Engineering Task Force"],
           "IRTF" => ["IRTF", "Internet Research Task Force"],
           "IAB" => ["IAB", "Internet Architecture Board"],
         }.freeze
 
+        # rfc-index.xml spells the independent stream "INDEPENDENT";
+        # Ext.stream's declared values use "Independent". Match case-insensitively
+        # against the declared values so both Ext.stream and STREAM_ORGS see the
+        # canonical spelling.
+        def canonical_stream
+          return unless stream
+
+          values = Ext.attributes[:stream].options[:values]
+          values.find { |v| v.casecmp?(stream) } || stream
+        end
+
         def build_rfc_ext
-          Ext.new(doctype: Doctype.new(content: "rfc"), stream: stream, flavor: "ietf")
+          Ext.new(doctype: Doctype.new(content: "rfc"), stream: canonical_stream, flavor: "ietf")
         end
 
         def build_committee_contributor(wg_names = {})
           return if wg_acronym.nil? || wg_acronym == "NON WORKING GROUP"
 
-          abbr, name = STREAM_ORGS[stream]
+          abbr, name = STREAM_ORGS[canonical_stream]
           org = if abbr
                   Ietf::BibXMLParser.build_org(abbr, name)
                 else

data/lib/relaton/ietf/scraper.rb

@@ -15,17 +15,18 @@ module Relaton
       # publishing their `index-v1` for released relatons, untouched.
       IETF = "https://raw.githubusercontent.com/relaton/relaton-data-ietf/main/"
 
-      # @param text [String]
+      # @param ref [String, Pubid::Ietf::Identifier] a reference, or its parse
+      #   from Relaton::Db (relaton#205), which is used as it is
       # @return [Relaton::Ietf::ItemData, nil]
-      def scrape_page(text)
-        id = parse_id text.sub(/\AIETF\s+/, "")
+      def scrape_page(ref)
+        id = ref.is_a?(String) ? parse_id(ref.sub(/\AIETF\s+/, "")) : ref
         return unless id
 
         fetch_doc id
       rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError,
              Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError,
              Net::ProtocolError, SocketError
-        raise Relaton::RequestError, "No document found for #{text} reference"
+        raise Relaton::RequestError, "No document found for #{ref} reference"
       end
 
       private

data/lib/relaton/iho/processor.rb

@@ -8,6 +8,7 @@ module Relaton
       def initialize
         @short = :relaton_iho
         @prefix = "IHO"
+        @pubid_identifier = :Iho # Db cache key
         @defaultprefix = %r{^IHO\s}
         @idtype = "IHO"
       end

data/lib/relaton/index/file_io.rb

@@ -28,11 +28,11 @@ module Relaton
       #   if nil then the fiename is used to read and write file (used to create indes in GH actions)
       # @param [Pubid::Identifier] pubid class for deserialization
       #
-      # `id_keys` is accepted for backward compatibility but no longer used: the
+      # The index format check round-trips each id through `pubid_class`;
       # index format is now validated by round-tripping a sample of ids through
       # the pubid class (see #check_serialization), which understands the pubid
       # v2 (lutaml) `_type` serialization that the old key-allowlist could not.
-      def initialize(dir, url, filename, _id_keys = nil, pubid_class = nil)
+      def initialize(dir, url: nil, filename: nil, pubid_class: nil)
         @dir = dir
         @url = url
         @filename = filename

data/lib/relaton/index/pool.rb

@@ -14,7 +14,6 @@ module Relaton
       # @param [String] type <description>
       # @param [String, nil] url external URL to index, used to fetch index for searching files
       # @param [String, nil] file output file name
-      # @param [Array<Symbol>, nil] id_keys keys to check if index is correct
       # @param [String, nil] pages_url base URL of the Pages site that serves
       #   the machine index (manifest + shards), see Relaton::Index::ShardSource
       #
@@ -24,9 +23,11 @@ module Relaton
         if @pool[type.upcase.to_sym]&.actual?(**args)
           @pool[type.upcase.to_sym]
         else
+          if args.key?(:id_keys)
+            Util.warn "id_keys is deprecated and ignored by Relaton::Index"
+          end
           @pool[type.upcase.to_sym] = Type.new(
-            type, args[:url], args[:file], args[:id_keys], args[:pubid_class],
-            pages_url: args[:pages_url]
+            type, **args.slice(:url, :file, :pubid_class, :pages_url)
           )
         end
       end

data/lib/relaton/index/shard_source.rb

@@ -47,7 +47,7 @@ module Relaton
         @pages_url = pages_url.end_with?("/") ? pages_url : "#{pages_url}/"
         # Only the deserialization helpers are used: this FileIO reads and
         # writes no file.
-        @file_io = FileIO.new(dir, nil, nil, nil, pubid_class)
+        @file_io = FileIO.new(dir, pubid_class: pubid_class)
         @mutex = Mutex.new
         @state = nil
       end

data/lib/relaton/index/type.rb

@@ -10,21 +10,18 @@ module Relaton
       # @param [String, Symbol] type type of index (ISO, IEC, etc.)
       # @param [String, nil] url external URL to index, used to fetch index for searching files
       # @param [String, nil] file output file name
-      # @param [Array<Symbol>] id_keys keys of identifier to be used for sorting index
-      #   format of index file is checked if id_keys all is provided at least in one of the IDs
       # @param [Pubid::Identifier, nil] pubid class for deserialization
       # @param [String, nil] pages_url base URL of the Pages site that serves
       #   the machine index. With it the type reads the index from there, in
       #   memory (see ShardSource), and a parsed query fetches one shard only.
       #
-      def initialize(type, url = nil, file = nil, id_keys = nil, pubid_class = nil, # rubocop:disable Metrics/ParameterLists
-                     pages_url: nil)
+      def initialize(type, url: nil, file: nil, pubid_class: nil, pages_url: nil)
         @file = file
         @dir = type.to_s.downcase
         @pubid_class = pubid_class
         @pages_url = pages_url
         filename = file || Index.config.filename
-        @file_io = FileIO.new @dir, url, filename, id_keys, pubid_class
+        @file_io = FileIO.new @dir, url: url, filename: filename, pubid_class: pubid_class
         @source = new_source
       end