pandorga 2.0.0 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96a7bd991685c2ae92de18f572112e692d02b211e134be12f0838247da013ade
-  data.tar.gz: 3f23ff94186ed6931a4f947efd18858cb16908a7db3c294a0eb9d92e244fc6f6
+  metadata.gz: 138bcb8f0c2e5c6eec6316000865742ac1ebb5c57703beb8db532bfdca64a270
+  data.tar.gz: 9f7fc0e7385d8b542cd6507fe00c0e1110012d4ec7688e277978ecfb611d9034
 SHA512:
-  metadata.gz: 8e924c057f9e70fdbea5e2b5ca40c3499ee18d482ce580ab091ff72e368bd4fc931c5ef7fb4a099155c04328a2ac2d98c93a36d5c3f1c0961e998c3e1a9edeb5
-  data.tar.gz: e8c7c19029b08a5cd20c6f5c109872b40c2d26877ffa8946ae01b6ab5c2d0c53dc6aad0eae0adf65ba23003fca69f18942dc3171e82ce44f7f7513d97c286ec4
+  metadata.gz: 46f7672a6254b39d874c34ba00555a287a94feabbba29d59582cdd2b8436fa874b6c7a3c0ff5070c9bebd83f5cd71144458ed19068c6d553001d8c6d5d9f6e5d
+  data.tar.gz: 95017e5b2b5d9152a41d705fd652546273e812f9f4efa7048792f34b08cf0272478d06680e3e707360425ef22a5329cb758863bcf2250f2a67dfdc31f6f50dee

data/CHANGELOG.md

@@ -2,6 +2,23 @@
 
 ## [Unreleased]
 
+## [2.0.2] — 2026-10-25
+
+### Added
+
+- The home hero summary has its own file, `content/pages/home/summary.md`, editable in Studio as "Hero summary" under Presentation, so the site presentation and the CV page summary can differ. Without the file the hero keeps showing `content/pages/cv/summary.md`; saved empty, the hero shows no summary. The Studio CV summary entry for the public page is now labelled "CV page" (PLT-AC-54).
+
+### Changed
+
+- The object-store publish syncs `collections/`, `data/`, `pages/` and `media/` as parallel jobs, prints each job's log in a fixed order, and uploads `manifest.json` last, only after every job succeeded. Upload, delete and verification semantics are unchanged (PLT-AC-53).
+
+## [2.0.1] — 2026-10-24
+
+### Fixed
+
+- Home article cards set their tags and "Read" on one row, like the featured card, and every card's top rule uses the Articles accent instead of rotating through the palette, which drew the second card in the secondary hue (PLT-AC-52).
+- A home band header whose kicker, title and note are all saved empty is removed with its rule instead of leaving an empty ruled strip; the band keeps an `aria-label` (PLT-AC-52).
+
 ## [2.0.0] — 2026-10-24
 
 ### Added

data/_includes/content-runtime/43-blocks.html

@@ -275,10 +275,14 @@
         html += '<p class="ledger-card-copy font-body">' +
           escapeHtml(f.preview) + '</p>';
       }
-      html += renderTagChips(f.tags, { hrefFor: options.tagHref, limit: options.tagLimit });
+      var chips = renderTagChips(f.tags, { hrefFor: options.tagHref, limit: options.tagLimit });
+      // `tagsInFoot` sets the chips on the call to action's row, as the home
+      // featured card does (PLT-AC-52); otherwise they sit above the foot.
+      if (!options.tagsInFoot) html += chips;
       // The meta strip above already carries the date, so the footer copy is
       // opt-in rather than the default — printing it twice is the common bug.
       var foot = '';
+      if (options.tagsInFoot) foot += chips;
       if (options.showFooterDates) {
         foot += renderCardFooterDates(f.date, f.lastUpdated, locale);
       }

data/_includes/content-runtime/60-fragments.html

@@ -431,6 +431,13 @@
       ['green', 'ochre'].forEach(function (name) {
         band.classList.toggle('page-accent--' + name, accent === name);
       });
+      /* A header left with no text and no link goes with its rule, and the
+       * band keeps a name from its data-home-label (PLT-AC-52). */
+      if (!root.querySelector('[data-content-section-kicker], [data-content-section-title], [data-content-section-note], .home-section-aside')) {
+        var label = band.getAttribute('data-home-label');
+        if (label && !band.hasAttribute('aria-label')) band.setAttribute('aria-label', label);
+        root.remove();
+      }
     }
 
     function yieldToMain() {

data/_includes/home/band-index.html

@@ -2,14 +2,35 @@
   Grouped index band (sources / network / bibliography). Expects `band` with
   kind=index and a pages array from PandorgaRegistry.home_bands.
 {%- endcomment -%}
+{%- comment -%}
+  The band's name when its header is gone: the panels' default titles. A
+  header whose kicker, title and note are all blank in headers.yml is not
+  emitted at all, so no empty ruled strip is left (PLT-AC-52).
+{%- endcomment -%}
+{%- assign _band_label = "" -%}
+{%- for panel in band.pages -%}
+{%- assign _label_page = site.pages | where: "key", panel.key | first -%}
+{%- assign _label = panel.title | default: _label_page.title | default: panel.key -%}
+{%- if _band_label != "" -%}{%- assign _band_label = _band_label | append: ", " -%}{%- endif -%}
+{%- assign _band_label = _band_label | append: _label -%}
+{%- endfor -%}
+{%- assign _hide_banner = false -%}
+{%- if site.data.page_headers -%}
+{%- assign _band_head = site.data.page_headers[band.section_key] -%}
+{%- assign _band_text = _band_head.kicker | append: _band_head.title | append: _band_head.note | strip -%}
+{%- if _band_text == "" -%}{%- assign _hide_banner = true -%}{%- endif -%}
+{%- endif -%}
 <section
   id="home-{{ band.group }}"
   class="home-band home-band--contrast home-band--index"
   data-home-band
   data-home-kind="index"
   data-home-group="{{ band.group }}"
+  data-home-label="{{ _band_label | escape }}"
+  {%- if _hide_banner %} aria-label="{{ _band_label | escape }}"{% endif %}
 >
   <div class="home-band-inner">
+    {%- unless _hide_banner -%}
     <div class="ledger-section-banner" data-content-home-section="{{ band.section_key }}">
       <div class="ledger-section-lead">
         <span class="ledger-kicker" data-content-section-kicker></span>
@@ -17,6 +38,7 @@
         <p class="home-section-note font-body" data-content-section-note></p>
       </div>
     </div>
+    {%- endunless -%}
     <div class="home-index-split">
       {%- for panel in band.pages -%}
       {%- assign _panel_page = site.pages | where: "key", panel.key | first -%}

data/_layouts/home.html

@@ -483,6 +483,7 @@ layout: shell
           locale: locale,
           ctaLabel: 'Read',
           tagHref: articleTagHref,
+          tagsInFoot: true,
           metaParts: [runtime.formatDate(entry.date, locale)]
         });
       }, 'Articles could not be loaded right now.');

data/assets/css/ledger/home.css

@@ -222,7 +222,8 @@
 
 /* No empty min-height. A guessed line count shifts the call to action
    when the summary is shorter or taller than the reserve. The paragraph
-   is in the HTML when content/pages/cv/summary.md exists. */
+   is in the HTML when content/pages/home/summary.md or
+   content/pages/cv/summary.md exists. */
 
 .home-hero-summary p {
   margin: 0 0 var(--space-md);
@@ -763,26 +764,23 @@ html[data-theme="light"] .home-hero-plate {
   display: none;
 }
 
+/* Tags and "Read" share the last row, as on the featured card (PLT-AC-52). */
 .home-card-grid .ledger-card-foot {
-  justify-content: flex-end;
+  justify-content: space-between;
+}
+
+.home-card-grid .ledger-card-foot .ledger-cta {
+  margin-left: auto;
 }
 
-/* A top rule per card, rotating through the palette triad, is what gives the
-   grid its ledger rhythm in the mockup. */
+/* Every card's top rule is the band accent, which `page-accent--<accent>`
+   sets on the section (PLT-AC-52). */
 .home-card-grid .ledger-card {
   border-top-width: 2px;
   border-top-style: solid;
   border-top-color: var(--color-primary);
 }
 
-.home-card-grid .ledger-card:nth-child(2) {
-  border-top-color: var(--color-secondary);
-}
-
-.home-card-grid .ledger-card:nth-child(3) {
-  border-top-color: var(--color-tertiary);
-}
-
 /* ── Rascunhos: dropped sheets ──
    Four compact cards rather than four full-width text rows: the poster is
    visible at every breakpoint now (it used to hide below 640px), each card

data/lib/pandorga/commands/new.rb

@@ -24,7 +24,7 @@ module Pandorga
 
         gem "pandorga", "~> 2.0"
         # Local checkout: gem "pandorga", path: "../pandorga"
-        # GitHub tag: gem "pandorga", github: "alexandrelheinen/pandorga", tag: "v2.0.0"
+        # GitHub tag: gem "pandorga", github: "alexandrelheinen/pandorga", tag: "v2.0.2"
         gem "csv"
         gem "base64"
       RUBY

data/lib/pandorga/hero_summary.rb

@@ -1,12 +1,14 @@
 # frozen_string_literal: true
 
-# Home hero summary from content/pages/cv/summary.md.
+# Home hero summary from content/pages/home/summary.md, falling back to
+# content/pages/cv/summary.md when the hero file is absent (PLT-AC-54).
 # That paragraph is the LCP element. Leaving it empty until JSON arrives
 # makes most of LCP render delay, and a guessed empty box shifts the
 # call to action when the real text replaces it.
 # Refs: PLT-AC-23
 module Pandorga
   module HeroSummary
+    HOME_RELATIVE = "content/pages/home/summary.md"
     RELATIVE = "content/pages/cv/summary.md"
     FALLBACK = '<div id="home-cv-summary" class="home-hero-summary font-body" ' \
                'data-content-fragment="cv/summary" data-content-quiet></div>'
@@ -14,11 +16,24 @@ module Pandorga
     module_function
 
     def markdown(source_root)
+      home = read_body(source_root, HOME_RELATIVE)
+      return home unless home.nil?
+
+      read_body(source_root, RELATIVE).to_s
+    end
+
+    # A hero file saved with a blank body hides the hero summary.
+    def hidden?(source_root)
+      read_body(source_root, HOME_RELATIVE) == ""
+    end
+
+    # The stripped body of a content file, or nil when it is absent.
+    def read_body(source_root, relative)
       root = File.expand_path(source_root.to_s)
-      path = File.expand_path(RELATIVE, root)
+      path = File.expand_path(relative, root)
       prefix = root.end_with?(File::SEPARATOR) ? root : root + File::SEPARATOR
-      return "" unless path.start_with?(prefix)
-      return "" unless File.file?(path)
+      return nil unless path.start_with?(prefix)
+      return nil unless File.file?(path)
 
       strip_front_matter(File.read(path, encoding: "UTF-8")).strip
     end

data/lib/pandorga/jekyll/plugins/hero_summary.rb

@@ -5,10 +5,13 @@ require_relative "../../hero_summary"
 
 module Pandorga
   # Emits the hero summary element. HTML is raw so the paragraph is in the
-  # first response when the markdown file exists.
+  # first response when the markdown file exists. A blank hero file
+  # renders nothing (PLT-AC-54).
   class HeroSummaryTag < Liquid::Tag
     def render(context)
       site = context.registers[:site]
+      return "" if HeroSummary.hidden?(site.source)
+
       HeroSummary.element(HeroSummary.html_for(site))
     end
   end

data/lib/pandorga/version.rb

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

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

@@ -58,36 +58,71 @@ run_ruby() {
 
 sync_json_prefix() {
   local prefix="$1"
-  local src="$EXPORT_ROOT/$prefix"
-  if [ -d "$src" ]; then
-    echo "==> Object store replace sync $prefix/"
-    run_ruby "$ROOT/scripts/content/sync-content-json-to-r2.rb" "$EXPORT_ROOT" "$prefix"
-  fi
+  echo "==> Object store replace sync $prefix/"
+  run_ruby "$ROOT/scripts/content/sync-content-json-to-r2.rb" "$EXPORT_ROOT" "$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
-
-echo "==> Upload manifest.json"
-aws s3 cp "$EXPORT_ROOT/manifest.json" "s3://${S3_BUCKET}/manifest.json" \
-  --endpoint-url "$S3_ENDPOINT" \
-  --cache-control "public,max-age=60" \
-  --content-type "application/json"
-
 MEDIA_ROOT="$SITE_ROOT/content/media"
-if [ -d "$MEDIA_ROOT" ]; then
+
+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"
+}
+
+echo "==> Publishing content JSON to bucket: ${S3_BUCKET}"
+echo "==> Endpoint: ${S3_ENDPOINT}"
+echo "==> Site root: ${SITE_ROOT}"
+
+# The prefixes are disjoint, so their syncs run as parallel jobs (PLT-AC-53).
+# Each job logs to its own file; the logs print in a fixed order afterwards.
+JOB_LOGS="$(mktemp -d)"
+trap 'rm -rf "$JOB_LOGS"' EXIT
+JOB_NAMES=()
+JOB_PIDS=()
+
+start_job() {
+  local name="$1"
+  shift
+  ( "$@" ) > "$JOB_LOGS/$name.log" 2>&1 &
+  JOB_NAMES+=("$name")
+  JOB_PIDS+=("$!")
+}
+
+for prefix in collections data pages; do
+  if [ -d "$EXPORT_ROOT/$prefix" ]; then
+    start_job "$prefix" sync_json_prefix "$prefix"
+  fi
+done
+
+if [ -d "$MEDIA_ROOT" ]; then
+  start_job media sync_media
 else
   echo "==> No content/media at ${MEDIA_ROOT} (skipping media sync)"
 fi
 
+FAILED=()
+for i in "${!JOB_PIDS[@]}"; do
+  if ! wait "${JOB_PIDS[$i]}"; then
+    FAILED+=("${JOB_NAMES[$i]}")
+  fi
+  cat "$JOB_LOGS/${JOB_NAMES[$i]}.log"
+done
+
+if [ "${#FAILED[@]}" -gt 0 ]; then
+  echo "error: object-store sync failed for: ${FAILED[*]}; manifest.json not uploaded." >&2
+  exit 1
+fi
+
+# Readers start from the manifest, so it goes up only after every object it
+# can lead to is in place.
+echo "==> Upload manifest.json"
+aws s3 cp "$EXPORT_ROOT/manifest.json" "s3://${S3_BUCKET}/manifest.json" \
+  --endpoint-url "$S3_ENDPOINT" \
+  --cache-control "public,max-age=60" \
+  --content-type "application/json"
+
 echo "==> Object-store publish complete"

data/scripts/content/sync-content-json-to-r2.rb

@@ -39,7 +39,7 @@ endpoint = ENV["R2_ENDPOINT"].to_s
 bucket = ENV["R2_BUCKET"].to_s
 fail!("R2_ENDPOINT is required") if endpoint.empty?
 fail!("R2_BUCKET is required") if bucket.empty?
-fail!("aws CLI is required") if Open3.capture3("bash", "-lc", "command -v aws").last.exitstatus != 0
+fail!("aws CLI is required") if Open3.capture3("bash", "-c", "command -v aws").last.exitstatus != 0
 
 SRC = EXPORT_ROOT.join(PREFIX)
 fail!("Missing local prefix directory: #{SRC}") unless SRC.directory?

data/scripts/test/test-hero-summary.rb

@@ -33,6 +33,47 @@ Dir.mktmpdir("hero-summary") do |dir|
   fail!("front matter leaked: #{mattered.inspect}") unless mattered == "After the matter."
 end
 
+# PLT-AC-54: the hero has its own file; absent falls back, blank hides.
+Dir.mktmpdir("hero-summary-field") do |dir|
+  cv = File.join(dir, "content/pages/cv")
+  home = File.join(dir, "content/pages/home")
+  FileUtils.mkdir_p([cv, home])
+  File.write(File.join(cv, "summary.md"), "Professional summary.\n")
+
+  fail!("absent hero file must fall back to the CV summary") unless Pandorga::HeroSummary.markdown(dir) == "Professional summary."
+  fail!("absent hero file must not hide the hero summary") if Pandorga::HeroSummary.hidden?(dir)
+
+  File.write(File.join(home, "summary.md"), "What the site holds.\n")
+  own = Pandorga::HeroSummary.markdown(dir)
+  fail!("hero file must win over the CV summary, got #{own.inspect}") unless own == "What the site holds."
+  fail!("a hero file with text must not hide") if Pandorga::HeroSummary.hidden?(dir)
+
+  File.write(File.join(home, "summary.md"), "---\ntitle: Hero\n---\n  \n")
+  fail!("a blank hero file must hide the hero summary") unless Pandorga::HeroSummary.hidden?(dir)
+  fail!("a blank hero file must not fall back to the CV summary") unless Pandorga::HeroSummary.markdown(dir) == ""
+
+  FileUtils.rm_rf(cv)
+  FileUtils.rm_f(File.join(home, "summary.md"))
+  fail!("with neither file the hero must stay a fragment, not hide") if Pandorga::HeroSummary.hidden?(dir)
+end
+
+tag = ROOT.join("lib/pandorga/jekyll/plugins/hero_summary.rb").read
+fail!("hero tag ignores a blank hero file") unless tag.include?("HeroSummary.hidden?")
+
+cv_layout = ROOT.join("_layouts/cv.html").read
+fail!("CV page Summary must keep the cv/summary fragment") unless cv_layout.include?('data-content-fragment="cv/summary"')
+fail!("CV page must not read the hero file") if cv_layout.include?("home/summary")
+
+schema = ROOT.join("studio/schema.yml").read
+hero_entry = schema[/- name: home_summary\n(?:        .*\n)+/]
+fail!("Studio has no Hero summary entry") unless hero_entry
+fail!("Studio Hero summary label") unless hero_entry.include?("label: Hero summary")
+fail!("Studio Hero summary path") unless hero_entry.include?("path: content/pages/home/summary.md")
+fail!("Studio Hero summary is not a markdown body") unless hero_entry.include?("component: markdown_body")
+presentation = schema[/- name: presentation\n.*?(?=\n  - name: )/m]
+fail!("Hero summary is not in the Presentation group") unless presentation&.include?("- name: home_summary")
+fail!("Studio public CV entry is not labelled CV page") unless schema.match?(/- name: cv_summary_public\n\s+label: CV page\n/)
+
 fallback = Pandorga::HeroSummary.element("")
 fail!("missing summary must stay a quiet fragment") unless fallback.include?('data-content-fragment="cv/summary" data-content-quiet')
 fail!("missing summary must not claim to be static") if fallback.include?("data-content-static")

data/scripts/test/test-home-article-cards.rb

@@ -0,0 +1,56 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+# PLT-AC-52. Home article cards keep tags and "Read" on one row, all use the
+# band accent, and a band header whose texts are all empty is removed.
+
+require "pathname"
+
+ROOT = Pathname.new(__dir__).join("..", "..").expand_path
+
+def fail!(message)
+  warn "FAIL test-home-article-cards: #{message}"
+  exit 1
+end
+
+blocks = ROOT.join("_includes/content-runtime/43-blocks.html").read
+home_layout = ROOT.join("_layouts/home.html").read
+css = ROOT.join("assets/css/ledger/home.css").read
+band_index = ROOT.join("_includes/home/band-index.html").read
+fragments = ROOT.join("_includes/content-runtime/60-fragments.html").read
+
+# 1. Foot row.
+card = blocks[/function renderArchiveCard\(.*?\n    \}\n/m] or fail!("renderArchiveCard not found")
+fail!("renderArchiveCard has no tagsInFoot option") unless card.include?("options.tagsInFoot")
+chips_at = card.index("renderTagChips(")
+foot_at = card.index("'<div class=\"ledger-card-foot\">'")
+fail!("tag chips are not built before the foot") unless chips_at && foot_at && chips_at < foot_at
+fail!("chips are not put inside the foot when tagsInFoot") unless card =~ /tagsInFoot[^\n]*\n?[^\n]*foot\s*\+?=\s*chips|foot\s*=\s*\(?options\.tagsInFoot/m
+callers = Dir[ROOT.join("{_layouts,_includes}/**/*.html").to_s].select { |f| File.read(f).include?("tagsInFoot: true") }
+fail!("tagsInFoot must be set by the home layout only, found #{callers.inspect}") unless callers.map { |f| File.basename(f) } == ["home.html"]
+foot_rule = css[/^\.home-card-grid \.ledger-card-foot \{[^}]*\}/m] or fail!("no .home-card-grid .ledger-card-foot rule")
+fail!(".home-card-grid .ledger-card-foot must space-between") unless foot_rule.include?("justify-content: space-between")
+cta_rule = css[/^\.home-card-grid \.ledger-card-foot \.ledger-cta \{[^}]*\}/m]
+fail!(".home-card-grid .ledger-card-foot .ledger-cta must take margin-left: auto") unless cta_rule&.include?("margin-left: auto")
+
+# 2. One accent.
+css.scan(/^([^{}\n]*\.home-card-grid[^{}\n]*)\{([^}]*)\}/m).each do |sel, body|
+  if body =~ /border-top-color:\s*var\(--color-(secondary|tertiary)\)/
+    fail!("#{sel.strip} rotates the card rule to --color-#{$1}")
+  end
+  fail!("#{sel.strip} keys a colour to :nth-child") if sel.include?("nth-child") && body =~ /color/
+end
+base = css[/^\.home-card-grid \.ledger-card \{[^}]*\}/m] or fail!("no .home-card-grid .ledger-card rule")
+fail!("card top rule is not var(--color-primary)") unless base.include?("border-top-color: var(--color-primary)")
+
+# 3. Build time.
+fail!("band-index does not set data-home-label") unless band_index.include?("data-home-label=")
+fail!("band-index does not guard the banner on empty header texts") unless band_index =~ /\{%-?\s*unless _hide_banner\s*-?%\}\s*<div class="ledger-section-banner"/m
+fail!("band-index does not label the section when the banner is hidden") unless band_index =~ /_hide_banner\s*%\}\s*aria-label=/
+
+# 4. Runtime.
+apply = fragments[/function applyHomeSection\(.*?\n    \}\n/m] or fail!("applyHomeSection not found")
+fail!("applyHomeSection does not drop an emptied banner") unless apply.include?("root.remove()") &&
+  apply.include?("home-section-aside") && apply.include?("data-home-label")
+
+puts "PASS test-home-article-cards"

data/scripts/test/test-parallel-content-publish.rb

@@ -0,0 +1,171 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+# PLT-AC-53: the object-store publish runs its prefix syncs in parallel and
+# uploads manifest.json last, only when every job succeeded. Uses a stateful
+# fake `aws` on PATH; no credentials or network.
+
+$stdout.sync = true
+$stderr.sync = true
+
+require "fileutils"
+require "json"
+require "open3"
+require "pathname"
+require "tmpdir"
+
+ROOT = Pathname.new(__dir__).join("../..").expand_path
+SCRIPT = ROOT.join("scripts/content/publish-content-to-object-store.sh")
+SYNC = ROOT.join("scripts/content/sync-content-json-to-r2.rb")
+
+def fail!(message)
+  warn "FAIL test-parallel-content-publish: #{message}"
+  exit 1
+end
+
+def check!(condition, message)
+  fail!(message) unless condition
+end
+
+# The fake keeps bucket objects under $FAKE_AWS_BUCKET_DIR and appends one
+# JSON line per call ({argv, start, end}) to $FAKE_AWS_LOG. Listing sleeps so
+# overlapping prefix syncs are observable. FAKE_AWS_FAIL_PREFIX makes the
+# listing of that prefix fail.
+FAKE_AWS = <<~'RUBY'
+  #!/usr/bin/env ruby
+  require "digest"
+  require "fileutils"
+  require "json"
+  bucket_dir = ENV.fetch("FAKE_AWS_BUCKET_DIR")
+  start = Process.clock_gettime(Process::CLOCK_REALTIME)
+  args = ARGV.dup
+  status = 0
+  key_of = ->(url) { url.sub(%r{\As3://[^/]+/?}, "") }
+  opt = ->(name) { (i = args.index(name)) ? args[i + 1] : nil }
+  case args[0, 2]
+  when %w[s3api list-objects-v2]
+    prefix = opt.call("--prefix").to_s
+    sleep 0.4
+    if (bad = ENV["FAKE_AWS_FAIL_PREFIX"].to_s) != "" && prefix == "#{bad}/"
+      warn "fake aws: listing #{prefix} failed"
+      status = 1
+    else
+      contents = Dir.glob(File.join(bucket_dir, "**", "*")).select { |f| File.file?(f) }.map do |f|
+        key = f.delete_prefix("#{bucket_dir}/")
+        next unless key.start_with?(prefix)
+        { "Key" => key, "ETag" => "\"#{Digest::MD5.file(f).hexdigest}\"" }
+      end.compact
+      puts JSON.generate({ "Contents" => contents, "IsTruncated" => false })
+    end
+  when %w[s3 cp]
+    dest = File.join(bucket_dir, key_of.call(args[3]))
+    FileUtils.mkdir_p(File.dirname(dest))
+    FileUtils.cp(args[2], dest)
+  when %w[s3 rm]
+    FileUtils.rm_f(File.join(bucket_dir, key_of.call(args[2])))
+  when %w[s3 sync]
+    src = args[2]
+    prefix = key_of.call(args[3])
+    local = Dir.glob(File.join(src, "**", "*")).select { |f| File.file?(f) }.map { |f| f.delete_prefix("#{src}/") }
+    local.each do |rel|
+      dest = File.join(bucket_dir, prefix, rel)
+      FileUtils.mkdir_p(File.dirname(dest))
+      FileUtils.cp(File.join(src, rel), dest)
+    end
+    if args.include?("--delete")
+      Dir.glob(File.join(bucket_dir, prefix, "**", "*")).select { |f| File.file?(f) }.each do |f|
+        FileUtils.rm_f(f) unless local.include?(f.delete_prefix("#{File.join(bucket_dir, prefix)}/"))
+      end
+    end
+  else
+    warn "fake aws: unsupported #{args.inspect}"
+    status = 2
+  end
+  finish = Process.clock_gettime(Process::CLOCK_REALTIME)
+  File.open(ENV.fetch("FAKE_AWS_LOG"), "a") { |io| io.puts(JSON.generate({ "argv" => args, "start" => start, "end" => finish })) }
+  exit status
+RUBY
+
+check!(SCRIPT.file?, "missing #{SCRIPT}")
+check!(!File.read(SYNC).include?("bash\", \"-lc\""),
+       "sync-content-json-to-r2.rb must check for aws on its own PATH, not a login shell's")
+
+def write(path, body)
+  FileUtils.mkdir_p(File.dirname(path))
+  File.write(path, body)
+end
+
+def run_publish(tmp, fail_prefix: nil)
+  site = File.join(tmp, "site")
+  export = File.join(site, "_content_json")
+  bucket = File.join(tmp, "bucket")
+  bin = File.join(tmp, "bin")
+  log = File.join(tmp, "aws.log")
+  FileUtils.rm_rf([bucket, log])
+  write(File.join(export, "collections/articles/a.json"), %({"a":1}\n))
+  write(File.join(export, "data/b.json"), %({"b":1}\n))
+  write(File.join(export, "pages/c.json"), %({"c":1}\n))
+  write(File.join(export, "manifest.json"), %({"version":1}\n))
+  write(File.join(site, "content/media/images/x.png"), "png")
+  write(File.join(bucket, "collections/articles/stale.json"), "{}")
+  write(File.join(bucket, "media/old.png"), "old")
+  write(File.join(bin, "aws"), FAKE_AWS)
+  FileUtils.chmod(0o755, File.join(bin, "aws"))
+
+  env = ENV.to_h.reject { |k, _| k.start_with?("S3_", "R2_", "AWS_") }.merge(
+    "PATH" => "#{bin}:#{ENV.fetch('PATH')}",
+    "PANDORGA_SITE_ROOT" => site,
+    "S3_ENDPOINT" => "https://example.invalid",
+    "S3_BUCKET" => "test-bucket",
+    "S3_ACCESS_KEY_ID" => "test",
+    "S3_SECRET_ACCESS_KEY" => "test",
+    "FAKE_AWS_BUCKET_DIR" => bucket,
+    "FAKE_AWS_LOG" => log
+  )
+  env["FAKE_AWS_FAIL_PREFIX"] = fail_prefix if fail_prefix
+  out, status = Open3.capture2e(env, "bash", SCRIPT.to_s, export)
+  calls = File.file?(log) ? File.readlines(log).map { |l| JSON.parse(l) } : []
+  [out, status, calls, bucket]
+end
+
+Dir.mktmpdir("pandorga-parallel-publish") do |tmp|
+  out, status, calls, bucket = run_publish(tmp)
+  check!(status.success?, "publish failed (#{status.exitstatus}):\n#{out}")
+
+  objects = Dir.glob(File.join(bucket, "**", "*")).select { |f| File.file?(f) }
+               .map { |f| f.delete_prefix("#{bucket}/") }.sort
+  expected = %w[collections/articles/a.json data/b.json manifest.json media/images/x.png pages/c.json]
+  check!(objects == expected, "bucket objects #{objects.inspect}, expected #{expected.inspect}")
+
+  first_list = %w[collections data pages].to_h do |prefix|
+    call = calls.find { |c| c["argv"][0, 2] == %w[s3api list-objects-v2] && c["argv"].include?("#{prefix}/") }
+    check!(call, "no listing of #{prefix}/ in #{calls.map { |c| c['argv'].first(2) }.inspect}")
+    [prefix, call]
+  end
+  latest_start = first_list.values.map { |c| c["start"] }.max
+  earliest_end = first_list.values.map { |c| c["end"] }.min
+  check!(latest_start < earliest_end,
+         "collections/, data/ and pages/ syncs did not overlap; they must run in parallel")
+
+  manifest = calls.select { |c| c["argv"][0, 2] == %w[s3 cp] && c["argv"][3].to_s.end_with?("/manifest.json") }
+  check!(manifest.length == 1, "expected one manifest upload, got #{manifest.length}")
+  others = calls - manifest
+  check!(others.all? { |c| c["end"] <= manifest.first["start"] },
+         "manifest.json must be uploaded after every other call ended")
+
+  order = ["R2 replace sync collections/", "R2 replace sync data/", "R2 replace sync pages/",
+           "==> Sync media/", "==> Upload manifest.json", "==> Object-store publish complete"]
+  positions = order.map { |marker| out.index(marker) }
+  check!(positions.none?(&:nil?), "missing log markers #{order.zip(positions).select { |_, p| p.nil? }.map(&:first)}:\n#{out}")
+  check!(positions == positions.sort, "job logs must print in the fixed order #{order.inspect}:\n#{out}")
+
+  out, status, calls, = run_publish(tmp, fail_prefix: "data")
+  check!(!status.success?, "publish must fail when a prefix sync fails:\n#{out}")
+  check!(out.include?("listing data/ failed") || out.include?("list-objects-v2 failed for data/"),
+         "the failed job's log must be printed:\n#{out}")
+  check!(out.include?("data"), "the failure must name the failed job")
+  check!(calls.none? { |c| c["argv"][0, 2] == %w[s3 cp] && c["argv"][3].to_s.end_with?("/manifest.json") },
+         "manifest.json must not be uploaded when a job failed")
+end
+
+puts "PASS test-parallel-content-publish"

data/scripts/validate.sh

@@ -77,6 +77,8 @@ TESTS=(
   scripts/test/test-timeline-pan.rb
   scripts/test/test-v3-layout.rb
   scripts/test/test-studio-section-texts.rb
+  scripts/test/test-home-article-cards.rb
+  scripts/test/test-parallel-content-publish.rb
 )
 
 failed=0

data/studio/schema.yml

@@ -823,7 +823,7 @@ content:
     type: group
     items:
       - name: cv_summary_public
-        label: Public
+        label: CV page
         type: file
         path: content/pages/cv/summary.md
         format: raw
@@ -862,6 +862,16 @@ content:
           - name: body
             component: markdown_body
 
+      - name: home_summary
+        label: Hero summary
+        type: file
+        path: content/pages/home/summary.md
+        format: raw
+        description: "Home hero paragraph. Without this file the hero shows the CV page summary; saved empty, the hero shows none."
+        fields:
+          - name: body
+            component: markdown_body
+
       - name: cv_ai_practice
         label: AI practice
         type: file

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pandorga
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.2
 platform: ruby
 authors:
 - The Pandorga contributors
@@ -439,6 +439,7 @@ files:
 - scripts/test/test-hero-portraits.rb
 - scripts/test/test-hero-summary.rb
 - scripts/test/test-highlighter-pills.rb
+- scripts/test/test-home-article-cards.rb
 - scripts/test/test-home-articles.rb
 - scripts/test/test-home-band-art.rb
 - scripts/test/test-home-band-intro.rb
@@ -453,6 +454,7 @@ files:
 - scripts/test/test-math-row-breaks.rb
 - scripts/test/test-new.rb
 - scripts/test/test-no-personal-data.rb
+- scripts/test/test-parallel-content-publish.rb
 - scripts/test/test-poster-srcset.mjs
 - scripts/test/test-public-cv-export.rb
 - scripts/test/test-publish-site-root.rb