relaton 3.0.0.pre.alpha.9 → 3.0.0.pre.alpha.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c1a04ce086b4f13d9ec8c448b4254cd3f4bc0399d0d1b4892e2201f45717f4c
-  data.tar.gz: f5a8286c7313b4f47a131290923ad2d23082cd51fb492f20555d859f38375cfd
+  metadata.gz: 7364dc37a276ca9af4698a8c2dfccca8a38c4b8fe02718d0a48938ae0c50e68e
+  data.tar.gz: 5129ad6ec6692247d87022f7774edc9b8f0bac4cc2668309ffc87302e75af3eb
 SHA512:
-  metadata.gz: 63355667dfc69e951fd03842f8b3769dae41ffce420b4deb21349dac2a035db489b17c808d9c6b8c478f324c15715c1d6cbc7d00422f47f46d649443ea9f3a63
-  data.tar.gz: bbe9885dd3811d1004a2048dd0dd88846ded2075ca21f26fe7b32f5286d63f5a014b83f0fd681bd9db61400f54bc3fabc9ec4998d791bcac578be07cfe290645
+  metadata.gz: 7ac0f564a402d64872ac1261ae71c733e3bffc6b5f0755e846358df24c27ec6cbc1b9b2a7fe4090d7d57d65f384a85d5fffd7a07865307a3bcbb6905070df778
+  data.tar.gz: f2c3876e14d876d5b172e7ecd1b65d3b1a100c2716fce4ee5628984f23ce5c4b5203b847f3a56cc6b222bd0866dca2f87483c92ad2538488781c48fed778d1f6

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.9".freeze
+  VERSION = "3.0.0.pre.alpha.11".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre.alpha.9
+  version: 3.0.0.pre.alpha.11
 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
@@ -468,16 +468,22 @@ dependencies:
   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: 1.4.0.pre.alpha.1
+        version: '4'
   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: 1.4.0.pre.alpha.1
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: rfcxml
   requirement: !ruby/object:Gem::Requirement