pandorga 1.12.0 → 1.14.0

data/assets/css/ledger/sources.css

@@ -171,26 +171,34 @@
   display: contents;
 }
 
-/* One geometry for all four. The border is currentColor rather than a fixed
-   token, so each chip outlines itself in whatever ink it is already using and
-   the row stays a family across both palettes. The shared category chip is a
-   filled chip everywhere else on the site; here it outlines like its three
-   neighbors, and its hover still fills — which is how a reader can tell that
-   this one, alone, is a link. */
+/* One geometry for all four. Facets lose their border and get a facet-strength
+   mark in their own ink. The tag chip is the only link and deepens its mark
+   on hover. */
 .source-facets .source-facet,
 .source-facets .ledger-chip,
 .source-facets .lang-pill {
   display: inline-flex;
   align-items: center;
   height: var(--source-facet-height);
-  padding: 0 var(--space-sm);
-  border: 1.5px solid color-mix(in srgb, currentColor 40%, var(--border-ink));
+  padding: 0 calc(var(--space-sm) + 1.5px);
+  border: 0;
   border-radius: var(--radius-card);
-  background: transparent;
   white-space: nowrap;
   font-size: var(--type-label);
 }
 
+.source-facets .ledger-chip {
+  --mark-1: var(--mark-facet-a);
+  --mark-2: var(--mark-facet-b);
+  --mark-3: var(--mark-facet-c);
+}
+
+.source-facets a.ledger-chip:hover {
+  --mark-1: var(--mark-hover-a);
+  --mark-2: var(--mark-hover-b);
+  --mark-3: var(--mark-hover-c);
+}
+
 /* The two chips this page owns. The shared pill and chip bring their own
    type; these match it rather than inventing a second label voice. */
 .source-facet {
@@ -199,12 +207,19 @@
   font-weight: var(--weight-label);
   letter-spacing: 0.03em;
   line-height: 1;
-  color: var(--color-on-surface-variant);
+  --facet-ink: var(--color-on-surface-variant);
+  color: color-mix(in srgb, var(--facet-ink) var(--facet-ink-mix), var(--color-on-surface));
+  --mark-ink: currentColor;
+  --mark-1: var(--mark-facet-a);
+  --mark-2: var(--mark-facet-b);
+  --mark-3: var(--mark-facet-c);
 }
 
-/* flag-icons sizes from the em, so the flag's own font-size is its height. */
+/* flag-icons sizes from the em, so the flag's own font-size is its height.
+   The country chip gets no mark because the flag is its own shape. */
 .source-facet--country {
   padding-inline: 0.35rem;
+  background: none;
 }
 
 .source-facet--country .fi {
@@ -323,5 +338,5 @@ html[data-theme="light"] .source-card {
 /* The medium chip and the card edge read the same custom property, so they
    cannot drift apart: one colour, stated once, shown twice. */
 .source-facet--medium {
-  color: var(--source-accent);
+  --facet-ink: var(--source-accent);
 }

data/assets/css/ledger/writing.css

@@ -207,16 +207,20 @@
   border-top: 1px solid var(--border-gentle-divider);
 }
 
+/* Solid mark: opaque under the label, fades only in the trailing padding;
+   hover fills solid. */
 .writing-index .writing-lead-foot .writing-lead-cta {
   margin-left: auto;
   padding: 0.35rem var(--space-md);
-  background: var(--color-primary);
+  background: linear-gradient(104deg, transparent 0.9%, var(--color-primary) 2.4%, var(--color-primary) calc(100% - 0.8rem), color-mix(in srgb, var(--color-primary) 40%, transparent) 100%);
+  -webkit-box-decoration-break: clone;
+  box-decoration-break: clone;
   color: var(--color-on-primary);
   font-weight: var(--weight-label);
 }
 
 .writing-index .writing-lead-cta:hover {
-  background: color-mix(in srgb, var(--color-primary) 85%, var(--color-on-surface));
+  background: var(--color-primary);
   color: var(--color-on-primary);
   text-decoration: none;
 }
@@ -613,11 +617,10 @@ html[data-theme="light"] .writing-index .writing-lead-media .ledger-poster {
 }
 
 .writing-rail .listing-filter-chip {
+  align-self: flex-start;
   justify-content: flex-start;
-  padding: 0.4rem 0.5rem;
-  background: none;
+  padding: 0.4rem 0.5rem 0.4rem calc(0.5rem + 2px);
   border: 0;
-  border-left: 2px solid transparent;
   color: var(--color-on-surface-variant);
   font-family: var(--font-label);
   font-size: var(--type-label-lg);
@@ -628,20 +631,12 @@ html[data-theme="light"] .writing-index .writing-lead-media .ledger-poster {
 }
 
 .writing-rail .listing-filter-chip:hover {
-  background: var(--color-surface-high);
-  border-left-color: var(--color-outline-variant);
   color: var(--color-on-surface);
 }
 
-/* The active state is carried by the page accent, the tinted fill and the rule
-   on the left edge. Cabin (label role) can take real weight; colour still does
-   the selected cue so the rail stays quiet. `--color-primary` follows
-   `.page-accent--*` (green on Articles, ochre on Rascunhos), so the same rail
-   markup does not stay locked to secondary. */
+/* Active filter chip uses the shared highlighter mark without a left border rule or tinted fill. */
 .writing-rail .listing-filter-chip.is-active {
-  background: color-mix(in srgb, var(--color-primary) 8%, transparent);
-  border-left-color: var(--color-primary);
-  color: var(--color-primary);
+  color: var(--color-on-surface);
 }
 
 /* ── Licence ──

data/lib/pandorga/cli.rb

@@ -7,6 +7,7 @@ require_relative "commands/publish"
 require_relative "commands/install_functions"
 require_relative "commands/studio_schema"
 require_relative "commands/new"
+require_relative "commands/thumbnails"
 
 module Pandorga
   # Dispatch for `exe/pandorga`.
@@ -18,7 +19,8 @@ module Pandorga
       "serve" => Commands::Serve,
       "publish" => Commands::Publish,
       "install-functions" => Commands::InstallFunctions,
-      "studio-schema" => Commands::StudioSchema
+      "studio-schema" => Commands::StudioSchema,
+      "thumbnails" => Commands::Thumbnails
     }.freeze
 
     module_function
@@ -52,6 +54,7 @@ module Pandorga
           pandorga new PATH               Scaffold a site from the minimal example
           pandorga doctor                 Check site config and environment
           pandorga export [src] [dest]    Export content collections to JSON
+          pandorga thumbnails [root]      Write 16:9 width variants for project thumbnails
           pandorga serve                  Local Jekyll serve with JSON re-export
           pandorga publish                Sync content JSON to R2
           pandorga install-functions      Copy functions/ and studio/ into site root

data/lib/pandorga/commands/new.rb

@@ -24,7 +24,7 @@ module Pandorga
 
         gem "pandorga", "~> 1.3"
         # Local checkout: gem "pandorga", path: "../pandorga"
-        # GitHub tag: gem "pandorga", github: "alexandrelheinen/pandorga", tag: "v1.12.0"
+        # GitHub tag: gem "pandorga", github: "alexandrelheinen/pandorga", tag: "v1.14.0"
         gem "csv"
         gem "base64"
       RUBY

data/lib/pandorga/commands/thumbnails.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require "pathname"
+require_relative "../thumbnail_variants"
+
+module Pandorga
+  module Commands
+    # Generate 16:9 center-cropped width variants for local project thumbnails.
+    # Refs: PLT-AC-44
+    class Thumbnails
+      def run(argv)
+        site_root = Pathname.new(argv[0] || Dir.pwd).expand_path
+        summary = Pandorga::ThumbnailVariants.generate(site_root)
+        puts "pandorga thumbnails: #{summary[:written]} written, #{summary[:skipped]} skipped (#{summary[:sources]} sources in #{site_root})"
+        0
+      end
+    end
+  end
+end

data/lib/pandorga/thumbnail_variants.rb

@@ -0,0 +1,267 @@
+# frozen_string_literal: true
+
+require "date"
+require "fileutils"
+require "open3"
+require "pathname"
+require "set"
+require "time"
+require "yaml"
+
+require_relative "registry"
+
+module Pandorga
+  # Generates 16:9 center-cropped width variants for local project thumbnails
+  # and computes their srcset strings.
+  # Refs: PLT-AC-44
+  module ThumbnailVariants
+    WIDTHS = [480, 960, 1440].freeze
+    IMAGE_EXTENSIONS = %w[.jpg .jpeg .png .webp].freeze
+    QUALITY = 82
+
+    module_function
+
+    def generate(site_root)
+      root = Pathname.new(site_root).expand_path
+      content_root = resolve_content_root(root)
+      sources = project_thumbnail_sources(root, content_root)
+
+      summary = { sources: sources.length, written: 0, skipped: 0, failed: 0 }
+      return summary if sources.empty?
+
+      bins = resolve_imagemagick
+      unless bins
+        warn "warning: ImageMagick (magick or convert) not found; skipping project thumbnail variants"
+        return summary
+      end
+
+      sources.each do |src|
+        src_width = identify_width(bins[:identify], src)
+        unless src_width && src_width.positive?
+          # An unreadable image keeps its original and must not stop the export.
+          warn "warning: cannot read #{src}; skipping its thumbnail variants"
+          summary[:failed] += 1
+          next
+        end
+
+        stem = src.basename(src.extname).to_s
+        variants_dir = src.dirname.join("variants")
+        src_mtime = src.mtime
+
+        WIDTHS.each do |width|
+          if width > src_width
+            summary[:skipped] += 1
+            next
+          end
+
+          dest = variants_dir.join("#{stem}-#{width}.jpg")
+          if dest.file? && dest.mtime >= src_mtime
+            summary[:skipped] += 1
+            next
+          end
+
+          begin
+            write_variant(bins[:convert], src, dest, width)
+            summary[:written] += 1
+          rescue StandardError => e
+            warn "warning: #{e.message.lines.first.to_s.strip}; keeping the original only"
+            summary[:failed] += 1
+          end
+        end
+      end
+
+      summary
+    end
+
+    def srcset_for(site_root, thumbnail_path)
+      media_rel = normalize_local_media_path(thumbnail_path)
+      return nil unless media_rel
+
+      ext = File.extname(media_rel).downcase
+      return nil unless IMAGE_EXTENSIONS.include?(ext)
+
+      root = Pathname.new(site_root).expand_path
+      content_root = resolve_content_root(root)
+      src = content_root.join(media_rel.delete_prefix("/"))
+      return nil unless src.file?
+
+      stem = src.basename(src.extname).to_s
+      variants_dir = src.dirname.join("variants")
+      return nil unless variants_dir.directory?
+
+      url_dir = File.dirname(media_rel)
+      parts = WIDTHS.filter_map do |width|
+        variant = variants_dir.join("#{stem}-#{width}.jpg")
+        next unless variant.file?
+
+        "#{url_dir}/variants/#{stem}-#{width}.jpg #{width}w"
+      end
+      return nil if parts.empty?
+
+      parts.join(", ")
+    end
+
+    def resolve_content_root(root)
+      candidate = root.join("content")
+      return candidate if candidate.directory?
+      return root if root.join("collections").directory? || root.join("media").directory?
+
+      candidate
+    end
+
+    def project_collections(root)
+      config_path = root.join("_config.yml")
+      config = if config_path.file?
+                 YAML.safe_load(config_path.read, permitted_classes: [Date, Time], aliases: true) || {}
+               else
+                 {}
+               end
+      pages = PandorgaRegistry.pages(config)
+      names = pages.filter_map do |page|
+        next unless page.is_a?(Hash) && page["template"].to_s == "portfolio"
+
+        col = page["collection"].to_s.strip
+        col = page.dig("collections", "projects").to_s.strip if col.empty? && page["collections"].is_a?(Hash)
+        col unless col.empty?
+      end.uniq
+      names.empty? ? ["projects"] : names
+    rescue StandardError
+      ["projects"]
+    end
+
+    def project_thumbnail_sources(root, content_root)
+      seen = Set.new
+      sources = []
+
+      project_collections(root).each do |collection|
+        dir = content_root.join("collections", collection)
+        next unless dir.directory?
+
+        dir.glob("**/*.{md,markdown}").sort.each do |md_path|
+          fm = read_front_matter(md_path)
+          next if fm["published"] == false && ENV["CONTENT_EXPORT_INCLUDE_UNPUBLISHED"] != "1"
+
+          media_rel = normalize_local_media_path(fm["thumbnail"])
+          next unless media_rel
+          next unless IMAGE_EXTENSIONS.include?(File.extname(media_rel).downcase)
+
+          src = content_root.join(media_rel.delete_prefix("/"))
+          next unless src.file?
+
+          key = src.expand_path.to_s
+          next if seen.include?(key)
+
+          seen << key
+          sources << src
+        end
+      end
+
+      sources
+    end
+
+    def normalize_local_media_path(path)
+      value = path.to_s.strip
+      return nil if value.empty?
+      return nil if value.match?(%r{\Ahttps?://}i)
+
+      if value.start_with?("/content/media/")
+        "/media/#{value.delete_prefix("/content/media/")}"
+      elsif value.start_with?("content/media/")
+        "/media/#{value.delete_prefix("content/media/")}"
+      elsif value.start_with?("/media/")
+        value
+      elsif value.start_with?("media/")
+        "/#{value}"
+      end
+    end
+
+    def read_front_matter(path)
+      text = path.read.sub(/\A\xEF\xBB\xBF/, "")
+      return {} unless text.start_with?("---\n") || text.start_with?("---\r\n")
+
+      parts = text.split(/^---\s*$\r?\n?/, 3)
+      return {} unless parts.length == 3
+
+      YAML.safe_load(parts[1], permitted_classes: [Date, Time], aliases: true) || {}
+    rescue StandardError
+      {}
+    end
+
+    def resolve_imagemagick
+      override = ENV["PANDORGA_IMAGEMAGICK"].to_s.strip
+      unless override.empty?
+        return nil unless executable_available?(override)
+
+        return {
+          convert: [override],
+          identify: File.basename(override) == "magick" ? [override, "identify"] : [ resolve_companion_identify(override) ]
+        }
+      end
+
+      if executable_available?("magick")
+        { convert: ["magick"], identify: ["magick", "identify"] }
+      elsif executable_available?("convert") && executable_available?("identify")
+        { convert: ["convert"], identify: ["identify"] }
+      end
+    end
+
+    def resolve_companion_identify(convert_bin)
+      sibling = File.join(File.dirname(convert_bin), "identify")
+      return sibling if File.executable?(sibling) && !File.directory?(sibling)
+
+      "identify"
+    end
+
+    def executable_available?(bin)
+      return false if bin.to_s.empty?
+
+      if bin.include?("/")
+        File.executable?(bin) && !File.directory?(bin)
+      else
+        ENV.fetch("PATH", "").split(File::PATH_SEPARATOR).any? do |dir|
+          next false if dir.empty?
+
+          candidate = File.join(dir, bin)
+          File.executable?(candidate) && !File.directory?(candidate)
+        end
+      end
+    end
+
+    def identify_width(identify_cmd, src)
+      cmd = [*identify_cmd, "-ping", "-format", "%w", "#{src}[0]"]
+      out, _err, status = Open3.capture3(*cmd)
+      return nil unless status.success?
+
+      out.to_s.strip.to_i
+    rescue StandardError
+      nil
+    end
+
+    def write_variant(convert_cmd, src, dest, width)
+      height = (width * 9) / 16
+      FileUtils.mkdir_p(dest.dirname)
+      tmp = dest.dirname.join(".#{dest.basename}.tmp-#{Process.pid}")
+      cmd = [
+        *convert_cmd,
+        "#{src}[0]",
+        "-auto-orient",
+        "-resize", "#{width}x#{height}^",
+        "-gravity", "center",
+        "-extent", "#{width}x#{height}",
+        "-strip",
+        "-interlace", "JPEG",
+        "-sampling-factor", "4:2:0",
+        "-quality", QUALITY.to_s,
+        "jpeg:#{tmp}"
+      ]
+      out, err, status = Open3.capture3(*cmd)
+      unless status.success? && tmp.file?
+        FileUtils.rm_f(tmp)
+        raise "ImageMagick failed for #{src} (#{width}w): #{out}\n#{err}"
+      end
+      File.rename(tmp.to_s, dest.to_s)
+    ensure
+      FileUtils.rm_f(tmp) if tmp && tmp.exist?
+    end
+  end
+end

data/lib/pandorga/version.rb

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

data/lib/pandorga.rb

@@ -14,6 +14,7 @@ module Pandorga
 end
 
 require_relative "pandorga/registry"
+require_relative "pandorga/thumbnail_variants"
 
 # Jekyll loads this file as a plugin when `plugins: [pandorga]`.
 require_relative "pandorga/jekyll" if defined?(Jekyll)

data/scripts/content/export-content-json.rb

@@ -21,6 +21,7 @@ require_relative "../lib/content_license"
 require_relative "../lib/writing_index_contract"
 require_relative "band_art"
 require_relative "hero_portraits"
+require_relative "../../lib/pandorga/thumbnail_variants"
 
 REPO_ROOT = Pathname.new(ENV.fetch("PANDORGA_SITE_ROOT", Dir.pwd)).expand_path
 CONTENT_ROOT = Pathname.new(ARGV[0] || "content").expand_path
@@ -121,6 +122,16 @@ def rewrite_media_references(text)
   rewrite_media_attribute_paths(rewrite_markdown_media_paths(text))
 end
 
+def rewrite_srcset_media_urls(srcset)
+  return nil unless srcset.is_a?(String) && !srcset.strip.empty?
+
+  srcset.split(",").map do |candidate|
+    url, descriptor = candidate.strip.split(/\s+/, 2)
+    resolved = resolve_media_url(url)
+    descriptor ? "#{resolved} #{descriptor}" : resolved
+  end.join(", ")
+end
+
 def rewrite_front_matter_media!(front_matter)
   return front_matter unless front_matter.is_a?(Hash)
 
@@ -360,6 +371,11 @@ def export_markdown_tree(source_dir, output_dir, type)
     end
 
     apply_git_chronology!(front_matter, repo_relative_path, type)
+    if type == "project"
+      raw_srcset = Pandorga::ThumbnailVariants.srcset_for(REPO_ROOT, front_matter["thumbnail"])
+      rewritten_srcset = rewrite_srcset_media_urls(raw_srcset)
+      front_matter["thumbnail_srcset"] = rewritten_srcset if rewritten_srcset
+    end
     rewrite_front_matter_media!(front_matter)
 
     if ContentKeys::KEYED_TYPES.include?(type)
@@ -594,7 +610,7 @@ def writing_index_entry_from_export(payload, content_root, collection)
   end
 
   legacy = File.basename(source_path, File.extname(source_path))
-  {
+  entry = {
     "slug" => slug,
     "key" => key,
     "title" => title,
@@ -630,6 +646,9 @@ def writing_index_entry_from_export(payload, content_root, collection)
       "path_segment" => slug
     )
   }
+  exported_srcset = payload.dig("front_matter", "thumbnail_srcset").to_s
+  entry["thumbnail_srcset"] = exported_srcset unless exported_srcset.empty?
+  entry
 end
 
 def export_derived_data(content_root, output_root)
@@ -710,6 +729,8 @@ def export_collection_trees
   trees
 end
 
+Pandorga::ThumbnailVariants.generate(REPO_ROOT)
+
 files = export_collection_trees
 files["page_fragments"] = export_page_fragments(CONTENT_ROOT.join("pages"), OUTPUT_ROOT.join("pages"))
 files["page_headers"] = export_page_headers(CONTENT_ROOT, OUTPUT_ROOT) << export_hero_portraits(CONTENT_ROOT, OUTPUT_ROOT)