relaton 3.0.8 → 3.1.1

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"

data/lib/relaton/evs/processor.rb

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

data/lib/relaton/evs.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 "evs/util"
 require_relative "evs/model/item"

data/lib/relaton/gb/bibliography.rb

@@ -31,7 +31,7 @@ module Relaton
             TScraper.scrape_page ref
           else
             # Scrape sector standard.
-            require "relaton/gb/sec_scraper"
+require_relative "sec_scraper"
             SecScraper.scrape_page ref
           end
         end

data/lib/relaton/gb/processor.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "relaton/core/processor"
+require_relative "../core/processor"
 
 module Relaton
   module Gb

data/lib/relaton/gb.rb

@@ -1,7 +1,7 @@
 require "digest/md5"
 require "mechanize"
-require "relaton/core"
-require "relaton/iso"
+require_relative "core"
+require_relative "iso"
 require "cnccs"
 require_relative "version"
 require_relative "gb/util"

data/lib/relaton/gost/processor.rb

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

data/lib/relaton/gost.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::Gost is the GOST (Russian federal standards — Гостстандарт)
 # flavor of the unified relaton gem. Adds typed Ext fields (urn,

data/lib/relaton/iala/processor.rb

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

data/lib/relaton/iala.rb

@@ -1,7 +1,7 @@
 require "pubid"
-require "relaton/bib"
-require "relaton/index"
-require "relaton/version"
+require_relative "bib"
+require_relative "index"
+require_relative "version"
 
 # Relaton::Iala is the IALA (International Organization for Marine Aids
 # to Navigation) flavor of the unified relaton gem. Adds typed Ext fields

data/lib/relaton/iana/data_fetcher.rb

@@ -1,4 +1,4 @@
-require "relaton/core"
+require_relative "../core"
 require_relative "../iana"
 require_relative "parser"
 

data/lib/relaton/iana/processor.rb

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

data/lib/relaton/iana.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 require "faraday"
-require "relaton/index"
+require_relative "index"
 require "pubid"
-require "relaton/bib"
+require_relative "bib"
 require_relative "version"
 require_relative "iana/util"
 require_relative "iana/item_data"

data/lib/relaton/iec/bibliography.rb

@@ -25,32 +25,30 @@ module Relaton
         end
 
         # @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
+        #   look up (e.g. "IEC 8000", "IEC 80000 (all parts)"), 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
+        # @param opts [Hash] options; `:all_parts` asks for all parts of a
+        #   reference that does not say so itself. The hash is not changed.
         # @return [Relaton::Iec::ItemData, nil]
-        def get(ref, year = nil, opts = {}) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity,Metrics/MethodLength
+        def get(ref, year = nil, opts = {}) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
           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
+            return iev if ref.strip.casecmp?("IEV")
+
+            ref = parse_ref ref
           end
+          # The pubid says whether all parts are asked for (relaton-iec#64):
+          # the option is folded into it, as Core::Processor#cache_key does.
+          ref = ref.to_all_parts if opts[:all_parts] && !ref.all_parts?
+          all_parts = ref.all_parts?
+          pubid = all_parts ? ref.identifiers.first : ref
           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
 
-          ret = iecbib_get(pubid, opts)
+          ret = iecbib_get(pubid, all_parts, opts)
           return nil if ret.nil?
 
           ret = ret.to_most_recent_reference unless pubid.date&.year || opts[:keep_year] ||
@@ -98,17 +96,31 @@ module Relaton
           )
         end
 
-        # @param pubid [Pubid::Iec::Identifier]
+        # The reference as written, else upcased: pubid reads the other
+        # components only in upper case, and `(all parts)` only in lower
+        # case, so the upcase keeps that suffix as pubid spells it.
+        #
+        # @param ref [String]
+        # @return [Pubid::Iec::Identifier]
+        def parse_ref(ref)
+          ::Pubid::Iec::Identifier.parse ref
+        rescue ::Pubid::Errors::Error
+          ::Pubid::Iec::Identifier.parse ref.upcase.sub("(ALL PARTS)", "(all parts)")
+        end
+
+        # @param pubid [Pubid::Iec::Identifier] the document (the inner
+        #   identifier of an all-parts reference)
+        # @param all_parts [Boolean] all parts of the document are asked for
         # @param opts [Hash]
         # @return [Relaton::Iec::ItemData, nil]
-        def iecbib_get(pubid, opts) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
+        def iecbib_get(pubid, all_parts, opts) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
           Util.info "Fetching from Relaton repository ...", key: pubid.to_s
           # pubid 2.x splits multi-level numbers ("61326-2-6") into part +
           # subpart, so all-parts matching must ignore subpart too.
-          exclude = opts[:all_parts] ? %i[year part subpart] : %i[year]
+          exclude = all_parts ? %i[year part subpart] : %i[year]
           result = search(pubid, exclude: exclude) || return
 
-          if opts[:all_parts]
+          if all_parts
             ret = result.to_all_parts(pubid.date&.year&.to_s, opts)
             Util.info "Found: `#{ret&.docidentifier&.first&.content}`", key: pubid.to_s if ret
             return ret

data/lib/relaton/iec/data_fetcher.rb

@@ -1,5 +1,5 @@
 require "yeptris"
-require "relaton/core"
+require_relative "../core"
 require_relative "../iec"
 require_relative "data_parser"
 

data/lib/relaton/iec/processor.rb

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

data/lib/relaton/iec.rb

@@ -3,8 +3,8 @@ require "net/http"
 require "moxml"
 require "pubid"
 require "zip"
-require "relaton/index"
-require "relaton/iso"
+require_relative "index"
+require_relative "iso"
 require_relative "version"
 require_relative "iec/util"
 require_relative "iec/bibliography"

data/lib/relaton/ieee/processor.rb

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

data/lib/relaton/ieee.rb

@@ -2,8 +2,8 @@ require "digest/md5"
 require "faraday"
 require "yaml"
 require "pubid"
-require "relaton/index"
-require "relaton/bib"
+require_relative "index"
+require_relative "bib"
 require_relative "version"
 require_relative "ieee/util"
 require_relative "ieee/bibliography"

data/lib/relaton/ietf/data_fetcher.rb

@@ -2,7 +2,7 @@ require "etc"
 require "parallel"
 require "pubid"
 require "pubid/ietf"
-require "relaton/core"
+require_relative "../core"
 require_relative "../ietf"
 require_relative "bibxml_parser"
 require_relative "rfc/index"

data/lib/relaton/ietf/processor.rb

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

data/lib/relaton/ietf.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 require "net/http"
-require "relaton/index"
-require "relaton/bib"
+require_relative "index"
+require_relative "bib"
 require_relative "version"
 require_relative "ietf/util"
 require_relative "ietf/item_data"

data/lib/relaton/iho/hash_parser_v1.rb

@@ -1,4 +1,4 @@
-require "relaton/bib/hash_parser_v1"
+require_relative "../bib/hash_parser_v1"
 require_relative "../iho"
 
 module Relaton

data/lib/relaton/iho/processor.rb

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

data/lib/relaton/iho.rb

@@ -1,5 +1,5 @@
-require "relaton/bib"
-require "relaton/index"
+require_relative "bib"
+require_relative "index"
 require "pubid"
 require_relative "version"
 require_relative "iho/util"

data/lib/relaton/index.rb

@@ -3,7 +3,7 @@
 require "yaml"
 require "zip"
 require "open-uri"
-require "relaton/logger"
+require_relative "logger"
 
 require_relative "version"
 require_relative "core/request_error"

data/lib/relaton/isbn/processor.rb

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

data/lib/relaton/isbn.rb

@@ -1,5 +1,5 @@
 require "net/http"
-require "relaton/bib"
+require_relative "bib"
 require_relative "version"
 require_relative "isbn/util"
 require_relative "isbn/isbn"

data/lib/relaton/iso/hash_parser_v1.rb

@@ -1,4 +1,4 @@
-require "relaton/bib/hash_parser_v1"
+require_relative "../bib/hash_parser_v1"
 require_relative "../iso"
 
 module Relaton

data/lib/relaton/iso/processor.rb

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

data/lib/relaton/iso.rb

@@ -2,10 +2,10 @@
 
 require "net/http"
 require "pubid"
-require "relaton/index"
+require_relative "index"
 require "isoics"
-require "relaton/bib"
-require "relaton/core"
+require_relative "bib"
+require_relative "core"
 require_relative "version"
 require_relative "iso/util"
 require_relative "iso/item_data"

data/lib/relaton/itu/processor.rb

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

data/lib/relaton/itu.rb

@@ -1,9 +1,9 @@
 require "mechanize"
 require "pubid"
 require "digest/md5"
-require "relaton/index"
-require "relaton/bib"
-require "relaton/core"
+require_relative "index"
+require_relative "bib"
+require_relative "core"
 require_relative "version"
 require_relative "itu/util"
 require_relative "itu/item_data"

data/lib/relaton/jcgm/processor.rb

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

data/lib/relaton/jcgm.rb

@@ -1,5 +1,5 @@
-require "relaton/bib"
-require "relaton/index"
+require_relative "bib"
+require_relative "index"
 require "pubid"
 require_relative "version"
 require_relative "jcgm/util"

data/lib/relaton/jis/processor.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "relaton/core/processor"
+require_relative "../core/processor"
 
 module Relaton
   module Jis

data/lib/relaton/jis.rb

@@ -3,8 +3,8 @@
 require "net/http"
 require "mechanize"
 require "pubid"
-require "relaton/iso"
-require "relaton/index"
+require_relative "iso"
+require_relative "index"
 require_relative "version"
 require_relative "jis/util"
 require_relative "jis/item"

data/lib/relaton/nist/processor.rb

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

data/lib/relaton/nist.rb

@@ -1,6 +1,6 @@
 require "pubid"
-require "relaton/index"
-require "relaton/bib"
+require_relative "index"
+require_relative "bib"
 require_relative "version"
 require_relative "nist/util"
 require_relative "nist/item_data"

data/lib/relaton/oasis/processor.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "relaton/core/processor"
+require_relative "../core/processor"
 
 module Relaton
   module Oasis

data/lib/relaton/oasis.rb

@@ -5,8 +5,8 @@
 # (The IANA/IHO/IALA/OGC/ECMA 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 "oasis/util"
 require_relative "oasis/item_data"

data/lib/relaton/ogc/processor.rb

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

data/lib/relaton/ogc.rb

@@ -2,8 +2,8 @@
 # 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/iso"
+require_relative "index"
+require_relative "iso"
 require_relative "version"
 require_relative "ogc/util"
 require_relative "ogc/item_data"

data/lib/relaton/oiml/processor.rb

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

data/lib/relaton/oiml.rb

@@ -1,5 +1,5 @@
-require "relaton/bib"
-require "relaton/index"
+require_relative "bib"
+require_relative "index"
 require "pubid"
 require_relative "version"
 require_relative "oiml/util"

data/lib/relaton/omg/processor.rb

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

data/lib/relaton/omg.rb

@@ -1,5 +1,5 @@
 require "moxml"
-require "relaton/bib"
+require_relative "bib"
 require_relative "version"
 require_relative "omg/util"
 require_relative "omg/ext"

data/lib/relaton/plateau/data_fetcher.rb

@@ -1,6 +1,6 @@
 require "yeptris"
 require "json"
-require "relaton/core"
+require_relative "../core"
 require_relative "../plateau"
 require_relative "parser"
 require_relative "handbook_parser"

data/lib/relaton/plateau/processor.rb

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

data/lib/relaton/plateau.rb

@@ -1,8 +1,8 @@
 require "net/http"
 require "uri"
 require "pubid"
-require "relaton/index"
-require "relaton/iso"
+require_relative "index"
+require_relative "iso"
 require_relative "version"
 require_relative "plateau/util"
 # require_relative "plateau/docidentifier"

data/lib/relaton/render/iso690/elements/extent.rb

@@ -23,7 +23,7 @@ module Relaton
             label = @i18n.label(type)
             return "#{label} #{value}" unless label.include?("%")
 
-            label.sub("%", value)
+            label.gsub("%") { value }
           end
 
           def cjk?(label)

data/lib/relaton/render.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+# The rendering surface of the consolidated gem — the `relaton/render`
+# entry the standalone relaton-render gem served as its primary require
+# path. `require "relaton-render"` (the hyphen umbrella in
+# lib/relaton-render.rb) resolves to this same surface: one gem ships
+# both codebases, so both spellings must keep working, and neither may
+# fall through to a still-bundled retired gem.
+require_relative "render/iso690"
+
+module Relaton
+  module Render
+    # A bibliographic item whose style template resolves to nothing: the
+    # single-item API raises, the batch API skips
+    class Unrenderable < StandardError; end
+  end
+end