pandorga 1.2.3 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6564a5382e67a496ec1fb1a08c3bd76601f7fe3e49bfcd7c6950e96c7fec84be
-  data.tar.gz: 3a57c483bbd9c36e1db0caa694e996ab6b6b9f72c9fb0db248b02bb419307888
+  metadata.gz: 19d2883dc4b29f8c6b614997004f69d32d2cacfa67ab83ef61544364a7d57cb3
+  data.tar.gz: 73f29c402a3259ec374c2d15746f7a6898d10f24258c11d626e5afe561d6a2e5
 SHA512:
-  metadata.gz: 38e07ea84144b6fe8812369ee5f0282493ce98cea31454ed8a6a6f072c7275024189524e8e863a3be0307ce55f6dc7bac81d6198f5ae202704df67164d0423fb
-  data.tar.gz: 36ce18aedcd108d7d247bd050badf62f64d83000b1d0c97dbc7325f7a03bdea8a7dc0ef15ca38fa595222c0e3efe9e4f5c8ba1668e5c831f6ce3558da793b176
+  metadata.gz: 692b1745fea99d185aaf2ed170a584fb83bf9c870eaa6e03b9567e9d9883930cc136b7e7821cb4746781d87c5131f688bc79f9b0d4cb8aa90208a4d47ef6462f
+  data.tar.gz: e9a2698daffc89e5ee9502a1450dce6e736aad68ca500ed1e37dffa4e5c34ed9709ed0f724888959bee6bd680085d56d7beb7c80504610f2a04683a21d6386a7

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## [1.3.0] — 2026-10-05
+
+### Fixed
+
+- Object-store publish fails fast when `PANDORGA_SITE_ROOT` is unset and the
+  script runs from the pandorga gem (no more silent skip of `content/media`)
+- `pandorga publish` exports `PANDORGA_SITE_ROOT` even when delegating to a
+  site-local `publish-content-to-r2.sh` wrapper
+
+## [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/commands/new.rb

@@ -22,9 +22,9 @@ module Pandorga
 
         source "https://rubygems.org"
 
-        gem "pandorga", "~> 1.2"
+        gem "pandorga", "~> 1.3"
         # Local checkout: gem "pandorga", path: "../pandorga"
-        # GitHub tag: gem "pandorga", github: "alexandrelheinen/pandorga", tag: "v1.2.3"
+        # GitHub tag: gem "pandorga", github: "alexandrelheinen/pandorga", tag: "v1.3.0"
         gem "csv"
         gem "base64"
       RUBY

data/lib/pandorga/commands/publish.rb

@@ -12,8 +12,9 @@ module Pandorga
         root = Pathname.new(argv[0] || Dir.pwd).expand_path
         site_script = root.join("scripts", "content", "publish-content-to-r2.sh")
         if site_script.file? && site_script.expand_path != gem_publish_script
+          env = ENV.to_h.merge("PANDORGA_SITE_ROOT" => root.to_s)
           Dir.chdir(root) do
-            exec("bash", site_script.to_s, *argv[1..])
+            exec(env, "bash", site_script.to_s, *argv[1..])
           end
         end
 

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.3.0"
 end

data/scripts/content/publish-content-to-object-store.sh

@@ -5,7 +5,19 @@
 set -euo pipefail
 
 ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
+
+# When this script lives in an installed (or checked-out) gem, ROOT is the gem
+# tree — not the consumer site. Media sync must use the site root; without it
+# we used to skip content/media silently and leave Studio uploads on GitHub
+# only. Require an explicit site root whenever ROOT looks like the gem.
+if [ -z "${PANDORGA_SITE_ROOT:-}" ] && [ -f "$ROOT/pandorga.gemspec" ]; then
+  echo "error: PANDORGA_SITE_ROOT must be set when publish-content-to-object-store.sh runs from the pandorga gem." >&2
+  echo "hint: export PANDORGA_SITE_ROOT to the Jekyll site root before exec (site wrappers must set this)." >&2
+  exit 1
+fi
+
 SITE_ROOT="${PANDORGA_SITE_ROOT:-$ROOT}"
+SITE_ROOT="$(cd "$SITE_ROOT" && pwd)"
 EXPORT_ROOT="${1:-$SITE_ROOT/_content_json}"
 
 # Prefer S3_* names; fall back to R2_* for Cloudflare R2 callers.
@@ -55,6 +67,7 @@ sync_json_prefix() {
 
 echo "==> Publishing content JSON to bucket: ${S3_BUCKET}"
 echo "==> Endpoint: ${S3_ENDPOINT}"
+echo "==> Site root: ${SITE_ROOT}"
 sync_json_prefix collections
 sync_json_prefix data
 sync_json_prefix pages
@@ -67,12 +80,14 @@ aws s3 cp "$EXPORT_ROOT/manifest.json" "s3://${S3_BUCKET}/manifest.json" \
 
 MEDIA_ROOT="$SITE_ROOT/content/media"
 if [ -d "$MEDIA_ROOT" ]; then
-  echo "==> Sync media/"
+  echo "==> Sync media/ from ${MEDIA_ROOT}"
   aws s3 sync "$MEDIA_ROOT" "s3://${S3_BUCKET}/media" \
     --endpoint-url "$S3_ENDPOINT" \
     --delete \
     --size-only \
     --cache-control "public,max-age=31536000,immutable"
+else
+  echo "==> No content/media at ${MEDIA_ROOT} (skipping media sync)"
 fi
 
 echo "==> Object-store publish complete"

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"

data/scripts/test/test-new.rb

@@ -57,8 +57,8 @@ end
 end
 
 gemfile = DEST.join("Gemfile").read
-unless gemfile.include?('gem "pandorga", "~> 1.2"')
-  warn "FAIL test-new: Gemfile must pin pandorga ~> 1.2\n#{gemfile}"
+unless gemfile.include?('gem "pandorga", "~> 1.3"')
+  warn "FAIL test-new: Gemfile must pin pandorga ~> 1.3\n#{gemfile}"
   exit 1
 end
 unless gemfile.include?("path:") && gemfile.include?("github:")

data/scripts/test/test-publish-site-root.rb

@@ -0,0 +1,40 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+# Refs: media sync must not silently use the gem tree as SITE_ROOT.
+require "open3"
+require "pathname"
+
+ROOT = Pathname.new(__dir__).join("../..").expand_path
+SCRIPT = ROOT.join("scripts/content/publish-content-to-object-store.sh")
+
+def fail!(message)
+  warn "FAIL test-publish-site-root: #{message}"
+  exit 1
+end
+
+fail!("missing #{SCRIPT}") unless SCRIPT.file?
+
+env = ENV.to_h
+env.delete("PANDORGA_SITE_ROOT")
+# Avoid falling through to real credentials if a developer has them set.
+%w[
+  S3_ENDPOINT S3_BUCKET S3_ACCESS_KEY_ID S3_SECRET_ACCESS_KEY
+  R2_ENDPOINT R2_BUCKET R2_ACCESS_KEY_ID R2_SECRET_ACCESS_KEY
+].each { |key| env.delete(key) }
+
+out, status = Open3.capture2e(env, "bash", SCRIPT.to_s)
+fail!("expected exit 1 without PANDORGA_SITE_ROOT, got #{status.exitstatus}") unless status.exitstatus == 1
+fail!("expected PANDORGA_SITE_ROOT error, got:\n#{out}") unless out.include?("PANDORGA_SITE_ROOT must be set")
+
+ok_env = env.merge(
+  "PANDORGA_SITE_ROOT" => ROOT.join("examples/minimal").to_s,
+  "S3_ENDPOINT" => "https://example.invalid",
+  "S3_BUCKET" => "test-bucket",
+  "S3_ACCESS_KEY_ID" => "test",
+  "S3_SECRET_ACCESS_KEY" => "test"
+)
+out2, status2 = Open3.capture2e(ok_env, "bash", SCRIPT.to_s, ROOT.join("examples/minimal/_content_json").to_s)
+fail!("with PANDORGA_SITE_ROOT set, must not fail the site-root guard; got #{status2.exitstatus}:\n#{out2}") if out2.include?("PANDORGA_SITE_ROOT must be set")
+
+puts "PASS test-publish-site-root"

data/scripts/validate.sh

@@ -34,6 +34,7 @@ TESTS=(
   scripts/test/test-dual-template-instances.rb
   scripts/test/test-dual-template-runtime.rb
   scripts/test/test-install-functions.rb
+  scripts/test/test-publish-site-root.rb
   scripts/test/test-no-personal-data.rb
   scripts/test/test-configuration-doc.rb
   scripts/test/test-cv-export-contract.rb

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pandorga
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.3.0
 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
@@ -394,6 +395,7 @@ files:
 - scripts/test/test-new.rb
 - scripts/test/test-no-personal-data.rb
 - scripts/test/test-public-cv-export.rb
+- scripts/test/test-publish-site-root.rb
 - scripts/test/test-r2-config-consistency.rb
 - scripts/test/test-r2-json-sync.rb
 - scripts/test/test-registry-home.rb