relaton 3.0.8 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2d44cf8ad434afddc1e4b0b2b4ce979970271e7ce871c48a2bb436e42eccfee
-  data.tar.gz: '07891a8f6deafa0d294519798a4576e7de997d0faead9d02077d9ab840c5d2ab'
+  metadata.gz: 0bdb2921b9e783bd265ac5fa7fdcf74e464624cc817f3a321e4206602ba94fcf
+  data.tar.gz: 5a329642cc5ed894e9008011cb99a7f35c49c9da624b19b87dbf53d12259325f
 SHA512:
-  metadata.gz: 5ca0eb885107187f7881e2fd42e665cebc70b6e9154f3b52cfeb8597037f5543dd9d921cb698a17e86723c86b592cef6bc19979051cc2bff7b4898c981c45840
-  data.tar.gz: ed359c58cb0ef93f972c0a30e8d89aed165841a9b392664241fa15f08d638fbf72a9e50c29994acc4bb5de3a7c0b0394c8bf9d801cf99c217c06b282e75089a3
+  metadata.gz: 9828c92364edaca6d9f56655f8e67aa0de7bdf221a2fdaf03d9fb185a8eb448337dc9f77af028133a390c392c14a273fa31b32e8ab8c00ff1b80813a58efcf9a
+  data.tar.gz: 05a358f667af4b048fb3503d8208c1ff60796b785719da720e1039160c66eaff3c58dc43dbda270d2171197f3636166a32bdc944682435c6d6ed4f63e393a1f8

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

@@ -1,4 +1,4 @@
-require "relaton/core/processor"
+require_relative "../core/processor"
 
 module Relaton
   module ThreeGpp

data/lib/relaton/3gpp.rb

@@ -3,9 +3,9 @@ require "net/http"
 # index code names. Processor#remove_index_file names no pubid class: the
 # delete never reads the index (see lib/relaton/index/CLAUDE.md).
 require "pubid"
-require "relaton/index"
-require "relaton/core"
-require "relaton/bib"
+require_relative "index"
+require_relative "core"
+require_relative "bib"
 require_relative "version"
 require_relative "3gpp/util"
 require_relative "3gpp/item"

data/lib/relaton/adobe/processor.rb

@@ -1,4 +1,4 @@
-require "relaton/core/processor"
+require_relative "../core/processor"
 
 module Relaton
   module Adobe

data/lib/relaton/adobe.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require "relaton/bib"
-require "relaton/index"
+require_relative "bib"
+require_relative "index"
 require "pubid"
-require "relaton/version"
+require_relative "version"
 
 # Relaton::Adobe is the Adobe (font tech notes, character collections,
 # PostScript Language, etc.) flavor of the unified relaton gem. Adds

data/lib/relaton/bib/item_data.rb

@@ -173,13 +173,13 @@ module Relaton
       # ISO 690 rendered reference (the style instance lives in the
       # relaton-models citation module; the engine in relaton-render).
       def to_iso690(lang: "en", script: "Latn")
-        require "relaton/render/iso690"
+require_relative "../render/iso690"
         Render::Iso690::Renderer.render(self, lang: lang, script: script)
       end
 
       # ISO 690 name-and-date in-text citation.
       def to_iso690_citation(lang: "en", script: "Latn", disambiguator: nil)
-        require "relaton/render/iso690"
+require_relative "../render/iso690"
         Render::Iso690::Renderer.citation(
           self, disambiguator: disambiguator, lang: lang, script: script
         )

data/lib/relaton/bib.rb

@@ -1,10 +1,10 @@
-require "relaton/logger"
+require_relative "logger"
 require "forwardable"
 # require "htmlentities"
 require "bibtex"
 require "iso639"
 require "rfcxml"
-require "relaton/core"
+require_relative "core"
 require "yeptris"
 require_relative "version"
 require_relative "bib/util"

data/lib/relaton/bibcollection.rb

@@ -1,4 +1,4 @@
-require "relaton/element_finder"
+require_relative "element_finder"
 
 module Relaton
   class Bibcollection

data/lib/relaton/bipm/processor.rb

@@ -1,4 +1,4 @@
-require "relaton/core/processor"
+require_relative "../core/processor"
 
 module Relaton
   module Bipm

data/lib/relaton/bipm.rb

@@ -1,8 +1,8 @@
 require "zip"
 require "fileutils"
-require "relaton/bib"
-require "relaton/index"
-require "relaton/core"
+require_relative "bib"
+require_relative "index"
+require_relative "core"
 require "pubid"
 require_relative "version"
 require_relative "bipm/util"

data/lib/relaton/bsi/processor.rb

@@ -1,4 +1,4 @@
-require "relaton/core/processor"
+require_relative "../core/processor"
 
 module Relaton::Bsi
   class Processor < Relaton::Core::Processor

data/lib/relaton/bsi.rb

@@ -1,4 +1,4 @@
-require "relaton/iso"
+require_relative "iso"
 require_relative "version"
 require_relative "bsi/util"
 require_relative "bsi/item_data"

data/lib/relaton/calconnect/data_fetcher.rb

@@ -2,8 +2,8 @@ require "yeptris"
 # frozen_string_literal:true
 
 require "mechanize"
-require "relaton/core"
-require "relaton/index"
+require_relative "../core"
+require_relative "../index"
 # The flavor top-level, for INDEXFILE and ::Pubid::Calconnect::Identifier.
 # `relaton-data-calconnect`'s crawler requires THIS file and nothing else, so
 # without it `#index` NameErrors on the very first document. (The ECMA form;

data/lib/relaton/calconnect/model/item.rb

@@ -1,4 +1,4 @@
-require "relaton/bib"
+require_relative "../../bib"
 require_relative "../item_data"
 require_relative "../docidentifier"
 require_relative "ext"

data/lib/relaton/calconnect/processor.rb

@@ -1,4 +1,4 @@
-require "relaton/core/processor"
+require_relative "../core/processor"
 
 module Relaton::Calconnect
   class Processor < Relaton::Core::Processor

data/lib/relaton/calconnect.rb

@@ -3,8 +3,8 @@
 # (The ECMA/IANA/IHO/OGC form; spec/relaton/lazy_loading_spec.rb guards that
 # this file is not itself loaded when a Db is built.)
 require "pubid"
-require "relaton/index"
-require "relaton/core"
+require_relative "index"
+require_relative "core"
 require_relative "version"
 require_relative "calconnect/model/item"
 require_relative "calconnect/util"

data/lib/relaton/ccsds/data/fetcher.rb

@@ -1,7 +1,7 @@
 require "yeptris"
 require "json"
 require "mechanize"
-require "relaton/index"
+require_relative "../../index"
 require "pubid"
 require_relative "../../ccsds"
 require_relative "parser"

data/lib/relaton/ccsds/model/item.rb

@@ -1,4 +1,4 @@
-require "relaton/bib"
+require_relative "../../bib"
 require_relative "../item_data"
 require_relative "docidentifier"
 require_relative "ext"

data/lib/relaton/ccsds/processor.rb

@@ -1,4 +1,4 @@
-require "relaton/core/processor"
+require_relative "../core/processor"
 
 module Relaton
   module Ccsds

data/lib/relaton/ccsds/util.rb

@@ -1,4 +1,4 @@
-require "relaton/bib/util"
+require_relative "../bib/util"
 
 module Relaton
   module Ccsds

data/lib/relaton/ccsds.rb

@@ -3,7 +3,7 @@
 # require "mechanize"
 # require "relaton/core"
 # require "relaton/bib"
-require "relaton/index"
+require_relative "index"
 require "pubid"
 require_relative "version"
 # require_relative "ccsds/processor"

data/lib/relaton/cen/processor.rb

@@ -1,4 +1,4 @@
-require "relaton/core/processor"
+require_relative "../core/processor"
 
 module Relaton
   module Cen

data/lib/relaton/cen.rb

@@ -2,10 +2,10 @@
 
 require "digest/md5"
 require "mechanize"
-require "relaton/core"
+require_relative "core"
 require "isoics"
 require "pubid"
-require "relaton/bib"
+require_relative "bib"
 require_relative "version"
 require_relative "cen/util"
 require_relative "cen/model/item"

data/lib/relaton/cie/data_fetcher.rb

@@ -5,9 +5,9 @@ require "fileutils"
 require "ferrum"
 require "moxml"
 require "pubid"
-require "relaton/index"
-require "relaton/bib"
-require "relaton/core/data_fetcher"
+require_relative "../index"
+require_relative "../bib"
+require_relative "../core/data_fetcher"
 require_relative "../cie"
 
 module Relaton

data/lib/relaton/cie/processor.rb

@@ -1,4 +1,4 @@
-require "relaton/core/processor"
+require_relative "../core/processor"
 
 module Relaton
   module Cie

data/lib/relaton/cie.rb

@@ -1,8 +1,8 @@
 require "moxml"
 # require "parslet"
 require "pubid"
-require "relaton/index"
-require "relaton/bib"
+require_relative "index"
+require_relative "bib"
 # require "relaton_bib/name_parser"
 require_relative "version"
 require_relative "cie/authors_parser"

data/lib/relaton/cli/base_convertor.rb

@@ -1,7 +1,7 @@
 require "fileutils"
-require "relaton/bibdata"
-require "relaton/bibcollection"
-require "relaton/cli/xml_to_html_renderer"
+require_relative "../bibdata"
+require_relative "../bibcollection"
+require_relative "xml_to_html_renderer"
 
 module Relaton
   module Cli

data/lib/relaton/cli/command.rb

@@ -2,13 +2,13 @@ require "date"
 require "tmpdir"
 require "shellwords"
 require "pubid"
-require "relaton/cli/relaton_file"
-require "relaton/cli/xml_convertor"
-require "relaton/cli/yaml_convertor"
-require "relaton/cli/data_fetcher"
-require "relaton/cli/index_site_generator"
-require "relaton/cli/subcommand_collection"
-require "relaton/cli/subcommand_db"
+require_relative "relaton_file"
+require_relative "xml_convertor"
+require_relative "yaml_convertor"
+require_relative "data_fetcher"
+require_relative "index_site_generator"
+require_relative "subcommand_collection"
+require_relative "subcommand_db"
 require "fcntl"
 
 module Relaton
@@ -34,6 +34,12 @@ module Relaton
         Relaton::Cli.version
       end
 
+      desc "types", "List the supported flavors (--type values of relaton fetch)"
+
+      def types
+        puts registered_types.sort.join(", ")
+      end
+
       desc "fetch CODE", "Fetch Relaton XML for Standard identifier CODE"
       option :type, aliases: :t,
                     desc: "Type of standard to get bibliographic entry for"
@@ -230,8 +236,8 @@ module Relaton
                  elsif options[:format] == "citation"
                    # The paths that exist in every published relaton-render;
                    # the gem's conventional "relaton/render" entry is newer.
-                   require "relaton/render/general"
-                   require "relaton/render/iso690"
+require_relative "../render/general"
+require_relative "../render/iso690"
                    Relaton::Render::General
                      .new(style: options[:style] || "author-date")
                      .render(item, embedded: true)

data/lib/relaton/cli/index_site_generator.rb

@@ -5,11 +5,11 @@ require "digest"
 require "pathname"
 require "fileutils"
 require "liquid"
-require "relaton/cli/frontend_assets"
-require "relaton/index"
+require_relative "frontend_assets"
+require_relative "../index"
 require "zip"
 require "pubid"
-require "relaton/cli/index_item_normalizer"
+require_relative "index_item_normalizer"
 
 module Relaton
   module Cli
@@ -288,8 +288,11 @@ module Relaton
             # "#{index}.zip" without knowing the flavor's INDEXFILE.
             "index" => @index_name,
             # What the index actually contains, not what was scanned: rows
-            # whose id could not be resolved at all are dropped.
-            "count" => indexed_rows.size,
+            # whose id could not be resolved at all are dropped, and an
+            # (id, file) pair a primary row already carries is collapsed
+            # (see #monolith_rows) — the count is what a consumer fetching
+            # "#{index}.zip" gets.
+            "count" => monolith_rows.size,
             "shards" => shard_count,
             "key" => key_strategy,
             "algorithm" => "crc32",
@@ -304,6 +307,31 @@ module Relaton
           { "r" => row.rendered, "file" => row.file, "id" => row.id_hash }
         end
 
+        # The rows the monolith carries: indexed_rows with redundant
+        # (id, file) pairs collapsed. A derived row whose (id, file) a
+        # primary row already carries is the same document in the same file
+        # under another spelling — the parse's canonical render beside the
+        # docid as written (the IHO faces where the record stores `P-5 2020`
+        # and pubid renders `P-5 Vol. 2020`; the 2026-11-04 relaton-data-iho
+        # deploy published 142 of those pairs, and the monolith consumer's
+        # key table rejected the flavor wholesale). The site keeps such rows
+        # — searching the canonical spelling should find the document — but
+        # the monolith that Relaton::Index consumers read is {id:, file:}
+        # only, so a second copy is a pure duplicate. First in
+        # indexed_rows' (key, rendered) order wins, so the collapse stays
+        # deterministic.
+        def monolith_rows
+          @monolith_rows ||= begin
+            seen = {}
+            indexed_rows.reject do |row|
+              seen_key = [row.id_hash, row.file]
+              dup = seen[seen_key]
+              seen[seen_key] = true
+              dup
+            end
+          end
+        end
+
         # The rows actually written, in deterministic (key, rendered) order.
         #
         # Carries only rows whose id resolved: the consumer
@@ -383,7 +411,7 @@ module Relaton
         def write_monolith(path)
           File.open(path, "w:utf-8") do |f|
             f << "---\n"
-            indexed_rows.each do |row|
+            monolith_rows.each do |row|
               f << "- :id:\n"
               yaml_nested(f, row.id_hash, "    ")
               f << "  :file: #{yaml_scalar(row.file)}\n"

data/lib/relaton/cli/relaton_file.rb

@@ -119,8 +119,8 @@ module Relaton
           if (bib = xml.at("//bibdata"))
             bib = nokogiri_document(bib.to_xml)
           elsif (rfc = xml.at("//rfc"))
-            require "relaton/ietf"
-            require "relaton/ietf/bibxml_parser"
+require_relative "../ietf"
+require_relative "../ietf/bibxml_parser"
             ietf = Relaton::Ietf::BibXMLParser.parse_rfc rfc.to_xml
             bib = nokogiri_document(ietf.to_xml(bibdata: true))
           else
@@ -147,8 +147,8 @@ module Relaton
         xml_files.flatten.reduce([]) do |mem, xml|
           doc = nokogiri_document(xml[:content])
           if (rfc = doc.at("/rfc"))
-            require "relaton/ietf"
-            require "relaton/ietf/bibxml_parser"
+require_relative "../ietf"
+require_relative "../ietf/bibxml_parser"
             ietf = Relaton::Ietf::BibXMLParser.parse_rfc rfc.to_xml
             d = nokogiri_document ietf.to_xml(bibdata: true)
             mem << bibdata_instance(d, xml[:file])

data/lib/relaton/cli/subcommand_collection.rb

@@ -1,5 +1,5 @@
 require "pubid"
-require "relaton/cli/full_text_search"
+require_relative "full_text_search"
 
 module Relaton
   module Cli

data/lib/relaton/cli/xml_convertor.rb

@@ -1,5 +1,5 @@
 require "nokogiri"
-require "relaton/cli/base_convertor"
+require_relative "base_convertor"
 
 module Relaton
   module Cli

data/lib/relaton/cli/yaml_convertor.rb

@@ -1,6 +1,6 @@
 require "yaml"
-require "relaton/cli/base_convertor"
-require "relaton/bib"
+require_relative "base_convertor"
+require_relative "../bib"
 
 module Relaton
   module Cli

data/lib/relaton/cli.rb

@@ -1,7 +1,6 @@
 require "fileutils"
 require "thor"
 require "thor/hollaback"
-require_relative "cli/version"
 require_relative "cli/util"
 require_relative "cli/command"
 
@@ -41,17 +40,8 @@ module Relaton
 
     class << self
       def version
-        require "relaton/bib"
-        registry = Relaton::Db::Registry.instance
-        # Every flavor now ships inside the single `relaton` gem, so they all
-        # report Relaton::VERSION rather than a separate gem version.
-        puts "CLI => #{Relaton::Cli::VERSION}"
+        # One gem, one version.
         puts "relaton => #{Relaton::VERSION}"
-        puts "relaton-bib => #{Relaton::VERSION}"
-        registry.processors.each_key do |k|
-          name = k.to_s.sub("_", "-")
-          puts "#{name} => #{Relaton::VERSION}"
-        end
       end
 
       def start(arguments)

data/lib/relaton/core/processor.rb

@@ -69,7 +69,7 @@ module Relaton
         pubid_class&.parse(ref)
       rescue ArgumentError, ::Pubid::Errors::Error
         # relaton-bib carries the log facade; core specs load without it.
-        require "relaton/bib"
+require_relative "../bib"
         Relaton::Bib::Util.info "does not parse as this flavor's pubid; " \
                                 "passing the reference to the flavor as " \
                                 "written", "relaton-db", key: ref

data/lib/relaton/core.rb

@@ -1,4 +1,4 @@
-require "relaton/logger"
+require_relative "logger"
 
 module Relaton
   # Registered here as well as in the root entry: flavor files and their

data/lib/relaton/db/registry.rb

@@ -13,7 +13,7 @@ module Relaton
         relaton/oasis relaton/doi relaton/jis relaton/xsf
         relaton/ccsds relaton/etsi relaton/isbn relaton/plateau
         relaton/oiml relaton/jcgm relaton/easc relaton/gost relaton/adobe
-        relaton/iala relaton/evs
+        relaton/iala relaton/evs relaton/sae
       ].freeze
 
       include Singleton

data/lib/relaton/db.rb

@@ -1,4 +1,4 @@
-require "relaton/bib"
+require_relative "bib"
 require "yaml"
 require "net/http"
 require "moxml"

data/lib/relaton/doi/parser.rb

@@ -731,7 +731,8 @@ module Relaton
       #
       def parse_relation # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
         rels = included_in_relation
-        @src["relation"].each_with_object(rels) do |(k, v), a|
+        # Crossref leaves the key out of some records (SAE standards).
+        (@src["relation"] || {}).each_with_object(rels) do |(k, v), a|
           type, desc = relation_type k
           Array(v).each do |r|
             rel_item = Crossref.get_by_id r["id"]

data/lib/relaton/doi/processor.rb

@@ -1,4 +1,4 @@
-require "relaton/core/processor"
+require_relative "../core/processor"
 
 module Relaton
   module Doi

data/lib/relaton/doi.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require "relaton/bipm"
-require "relaton/ietf"
-require "relaton/ieee"
-require "relaton/nist"
+require_relative "bipm"
+require_relative "ietf"
+require_relative "ieee"
+require_relative "nist"
 require_relative "version"
 require_relative "doi/util"
 require_relative "doi/parser"

data/lib/relaton/easc/processor.rb

@@ -1,4 +1,4 @@
-require "relaton/core/processor"
+require_relative "../core/processor"
 
 module Relaton
   module Easc

data/lib/relaton/easc.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require "relaton/bib"
-require "relaton/index"
-require "relaton/version"
+require_relative "bib"
+require_relative "index"
+require_relative "version"
 require "pubid"
 
 # Relaton::Easc is the EASC (Евразийский экономический совет /

data/lib/relaton/ecma/data_fetcher.rb

@@ -2,7 +2,7 @@
 
 require "English"
 require "mechanize"
-require "relaton/core"
+require_relative "../core"
 require_relative "../ecma"
 require_relative "parser_common"
 require_relative "page_fetcher"

data/lib/relaton/ecma/processor.rb

@@ -1,4 +1,4 @@
-require "relaton/core/processor"
+require_relative "../core/processor"
 
 module Relaton
   module Ecma

data/lib/relaton/ecma.rb

@@ -3,8 +3,8 @@
 # (The IANA/IHO/IALA/OGC form; spec/relaton/lazy_loading_spec.rb guards that
 # this file is not itself loaded when a Db is built.)
 require "pubid"
-require "relaton/index"
-require "relaton/bib"
+require_relative "index"
+require_relative "bib"
 require_relative "version"
 require_relative "ecma/util"
 require_relative "ecma/item_data"

data/lib/relaton/etsi/data_fetcher.rb

@@ -1,8 +1,8 @@
 require "yeptris"
 require "date"
 require "mechanize"
-require "relaton/core"
-require "relaton/index"
+require_relative "../core"
+require_relative "../index"
 require_relative "../etsi"
 require_relative "data_parser"
 

data/lib/relaton/etsi/item.rb

@@ -1,4 +1,4 @@
-require "relaton/bib"
+require_relative "../bib"
 require_relative "item_data"
 require_relative "ext"
 require_relative "status"

data/lib/relaton/etsi/processor.rb

@@ -1,4 +1,4 @@
-require "relaton/core/processor"
+require_relative "../core/processor"
 
 module Relaton
   module Etsi
@@ -54,7 +54,7 @@ module Relaton
       # @return [String]
       def grammar_hash
         require "digest/md5" # not loaded by etsi.rb; needed on the cold path
-        require "relaton/version"
+require_relative "../version"
         Digest::MD5.hexdigest Relaton::VERSION
       end
 

data/lib/relaton/etsi.rb

@@ -3,7 +3,7 @@
 require "net/http"
 require "mechanize"
 require "pubid"
-require "relaton/index"
+require_relative "index"
 require_relative "version"
 # require_relative "relaton_etsi/pubid"
 require_relative "etsi/bibitem"