relaton 3.0.0.pre.alpha.8 → 3.0.0.pre.alpha.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3fafde9870593aca737727dcb4cf8cb142da74d255be4e855eed22bda4bd0f1b
-  data.tar.gz: 60986309859651e6e1baa05635a1ebfb2fec313f908a5508c14a59ded9ec3f8f
+  metadata.gz: 06cb72b9e56ded3fc4232372142ac4d11ab23537c3dedf84bd560236c0f835fd
+  data.tar.gz: 92191f7fde44fb7c133c5c079b26e74f0f645b45005d9abae2a7b54fc58f49a9
 SHA512:
-  metadata.gz: 2b075475ad0321b604674b8459c60ddc1e7ef10a1a0186e70042348c0d9d5bbe58166cb419548f8d98438040702ffd532204716a261bedaedf20888a5d6c08cf
-  data.tar.gz: 8b2b003b3b99918b96a42c622607feae3087e2778730a2d31dc94ebe9b51abea23a3f6fbdb254fc72a2daeeae47877feb4edb998d70aa6d0d46c86881db2812c
+  metadata.gz: d569654f1591a6e7b28d420166a514acef378fd4aaa4755943bad90ee732362fcd079eb6032a685e58cc5ca5319915388c6db7aefe9a894b787157fae14f1cdf
+  data.tar.gz: d3b0e9f6489398563296216cf27c7cb31b761d800fb74fbebd187684b4aded1c16acdfffab3cdc8f83eb71d49722815f7493349789ce067d2f1fb5dea67bb94a

data/lib/relaton/db/cache.rb

@@ -3,6 +3,7 @@ require "digest"
 require "json"
 require "date"
 require "lutaml/store"
+require "nokogiri"
 require_relative "cache_entry"
 
 module Relaton
@@ -52,6 +53,7 @@ module Relaton
         archive_old_layout
         open_stores
         check_versions
+        import_old_layout
       end
 
       # Move the cache to another directory.
@@ -308,6 +310,41 @@ module Relaton
         Util.info "cache #{dir}: the old cache is moved to #{bak}"
       end
 
+      # Entries the file-per-key layout cached are imported into the v2
+      # stores once, so upgrading does not silently refetch them (relaton#240).
+      # A key the v2 cache already holds keeps its fresher entry; not-found
+      # and redirection entries are not imported (a negative lookup costs one
+      # fetch, and redirects were dropped from the v2 model).
+      def import_old_layout
+        bak = "#{dir}-v1.bak"
+        marker = File.join(dir, LAYOUT, ".v1-imported")
+        return if File.exist?(marker) || !Dir.exist?(bak)
+
+        imported = 0
+        Dir.glob("#{bak}/**/*.xml").each do |f|
+          value = File.read(f, encoding: "utf-8")
+          key = old_layout_key(f.delete_prefix("#{bak}/"), value) or next
+          next if lookup(key)
+
+          self[key] = value
+          imported += 1
+        end
+        FileUtils.touch marker
+        Util.info "cache #{dir}: imported #{imported} entries from #{bak}"
+      end
+
+      # The wrapped string key of an old-layout document: its own primary
+      # docidentifier under its flavor prefix, resolved through the same
+      # `wrapped_key` path a string cache read takes.
+      def old_layout_key(path, value)
+        flavor = path.split("/").first or return
+        doc = Nokogiri::XML(value)
+        id = doc.root&.at("./docidentifier[@primary = 'true']") ||
+          doc.root&.at("./docidentifier") or return
+
+        "#{flavor.upcase}(#{id.text.strip})"
+      end
+
       # Drop the rows and documents of a flavor whose grammar changed since
       # they were written.
       def check_versions

data/lib/relaton/version.rb

@@ -1,3 +1,3 @@
 module Relaton
-  VERSION = "3.0.0.pre.alpha.8".freeze
+  VERSION = "3.0.0.pre.alpha.10".freeze
 end

data/lib/relaton.rb

@@ -7,16 +7,16 @@
 require "relaton/version"
 require "moxml"
 
-# YAML through yeptris (Psych-compatible drop-in; stdlib Psych is kept
-# as Yeptris::Psych::ORIGINAL). Must load before any YAML/Psych use.
-# yeptris 0.5 moved the exclusive drop-in rebind to yeptris/psych/drop_in
-# — plain yeptris/psych only defines the namespace and leaves stdlib
-# Psych in place (yeptris-ruby#95, bug 3).
-# Load stdlib Psych first: the drop-in keeps it as Yeptris::Psych::ORIGINAL,
-# and a later plain require "psych" against the rebound constant is a
-# superclass mismatch (yeptris-ruby#95, bug 3 follow-on).
-require "psych"
-require "yeptris/psych/drop_in"
+# YAML through stdlib Psych. The former yeptris drop-in rebind
+# (require "yeptris/psych/drop_in") replaced ::Psych for the WHOLE
+# host process: every gem that later loaded YAML — glossarist/iev's
+# ISO 639 table, metanorma-cli's collections, anything psych-lenient
+# — silently changed engine, and yeptris 0.6.28.4 diverges from psych
+# (block-scalar headers at column 1, permitted_classes ignored; see
+# yeptris-ruby#258). A library must never rebind global constants;
+# the namespaced Yeptris::Psych API remains the opt-in path for hosts
+# that want it.
+require "yaml"
 
 module Relaton
   autoload :Logger, "relaton/logger"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre.alpha.8
+  version: 3.0.0.pre.alpha.10
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-10-03 00:00:00.000000000 Z
+date: 2026-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable