pandorga 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6564a5382e67a496ec1fb1a08c3bd76601f7fe3e49bfcd7c6950e96c7fec84be
-  data.tar.gz: 3a57c483bbd9c36e1db0caa694e996ab6b6b9f72c9fb0db248b02bb419307888
+  metadata.gz: 98b663b167e42b55b5f034061a064fcb22cc0612e5583644ee44f1c61557415d
+  data.tar.gz: 07cbe585377ae6dac96af92aafc61982405cfa9f7f91ed22ead923a010749f02
 SHA512:
-  metadata.gz: 38e07ea84144b6fe8812369ee5f0282493ce98cea31454ed8a6a6f072c7275024189524e8e863a3be0307ce55f6dc7bac81d6198f5ae202704df67164d0423fb
-  data.tar.gz: 36ce18aedcd108d7d247bd050badf62f64d83000b1d0c97dbc7325f7a03bdea8a7dc0ef15ca38fa595222c0e3efe9e4f5c8ba1668e5c831f6ce3558da793b176
+  metadata.gz: f03e0020239a68af75151157c549d9b6c24a4ad88dd385817be87ca7ffedae4830c29d7ee0f5f0dfec3462971645d25174629ef825dde027b60ed0a45847f499
+  data.tar.gz: 3ebd0d3083bc31b0791e212f153ae796919cba639ad8b7ffcc805fdbab974274e53744b8f0bb0f2de7b75e35ecba222fb5e253fa3b9a78bc1e2a39b9409b17ce

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [1.2.4] — 2026-10-05
+
+### Fixed
+
+- An omitted `pandorga.content.backend` keeps a configured `base_url` or legacy `content_api_base_url` as an object-store origin. `static` remains the default only when no public URL is set, and an explicit `backend: static` still wins.
+
 ## [1.2.3] — 2026-10-05
 
 ### Changed

data/lib/pandorga/registry/schema.yml

@@ -26,10 +26,11 @@ content:
   title: "`pandorga.content`"
   intro: |
     Legacy `content_api_base_url` still works as a fallback for `base_url`.
+    When `backend` is omitted, a non-empty `base_url` or `content_api_base_url` selects `object_store`. With no origin, the default is `static`. An explicit `backend: static` still serves JSON from `_site` and clears the public URL at build time.
   keys:
     backend:
       type: "`static` \\| `r2` \\| `object_store` \\| `s3`"
-      notes: "`static` serves JSON from `_site`. The others use `base_url` as the public object-store origin"
+      notes: "`static` serves JSON from `_site`. The others use `base_url` as the public object-store origin. Omitted plus a public URL selects `object_store`"
     base_url:
       type: string
       notes: Public content origin when backend is not `static`

data/lib/pandorga/registry.rb

@@ -256,9 +256,14 @@ module PandorgaRegistry
 
   def content_backend(config)
     raw = config.dig("pandorga", "content", "backend").to_s.strip
-    return "static" if raw.empty?
+    return raw unless raw.empty?
 
-    raw
+    # A public origin is the pre-registry signal that JSON lives on an object
+    # store. Static is the default only when no origin is configured; an
+    # explicit `backend: static` still wins and the build clears the URL.
+    return "object_store" unless content_base_url(config).empty?
+
+    "static"
   end
 
   def content_base_url(config)

data/lib/pandorga/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Pandorga
-  VERSION = "1.2.3"
+  VERSION = "1.2.4"
 end

data/scripts/test/test-content-backend.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+# An omitted backend must not discard a configured public origin.
+# Explicit static still serves JSON from _site.
+require "pathname"
+
+ROOT = Pathname.new(__dir__).join("../..").expand_path
+$LOAD_PATH.unshift(ROOT.join("lib").to_s)
+require "pandorga/registry"
+
+def check!(condition, message)
+  return if condition
+
+  warn "FAIL test-content-backend: #{message}"
+  exit 1
+end
+
+url = "https://pub-example.r2.dev"
+
+check!(PandorgaRegistry.content_backend({}) == "static",
+       "no origin must stay static")
+check!(PandorgaRegistry.static_backend?({}),
+       "static_backend? must be true when no origin is set")
+
+legacy = { "content_api_base_url" => url }
+check!(PandorgaRegistry.content_backend(legacy) == "object_store",
+       "legacy content_api_base_url must select object_store, got #{PandorgaRegistry.content_backend(legacy).inspect}")
+check!(PandorgaRegistry.object_store_backend?(legacy),
+       "object_store_backend? must be true for a legacy URL")
+check!(PandorgaRegistry.content_base_url(legacy) == url,
+       "legacy URL must remain the public origin")
+
+base_only = { "pandorga" => { "content" => { "base_url" => "#{url}/" } } }
+check!(PandorgaRegistry.content_backend(base_only) == "object_store",
+       "base_url without backend must select object_store")
+check!(PandorgaRegistry.content_base_url(base_only) == url,
+       "base_url must be stripped of a trailing slash")
+
+explicit_static = {
+  "content_api_base_url" => url,
+  "pandorga" => { "content" => { "backend" => "static" } }
+}
+check!(PandorgaRegistry.content_backend(explicit_static) == "static",
+       "explicit static must win over a leftover URL")
+
+explicit_r2 = { "pandorga" => { "content" => { "backend" => "r2", "base_url" => url } } }
+check!(PandorgaRegistry.content_backend(explicit_r2) == "r2",
+       "explicit r2 must be preserved")
+
+puts "PASS test-content-backend"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pandorga
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors:
 - The Pandorga contributors
@@ -365,6 +365,7 @@ files:
 - scripts/test/test-cdn-pins.rb
 - scripts/test/test-cloudflare-watch-paths-doc.rb
 - scripts/test/test-configuration-doc.rb
+- scripts/test/test-content-backend.rb
 - scripts/test/test-content-detail-urls.rb
 - scripts/test/test-content-keys.rb
 - scripts/test/test-content-license.rb