pandorga 1.6.7 → 1.6.8

data/scripts/test/test-pwa-icons.rb

@@ -0,0 +1,280 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+# PLT-AC-28. The site and Studio launchers share the site stamp. Studio adds
+# one badge. Manifests name maskable icons, and those icons keep their art
+# inside the center 80% circle.
+
+require "jekyll"
+require "json"
+require "pathname"
+require "tmpdir"
+require "zlib"
+
+ROOT = Pathname.new(__dir__).join("..", "..").expand_path
+
+def fail!(message)
+  warn "FAIL test-pwa-icons: #{message}"
+  exit 1
+end
+
+PLATE = [0x5e, 0x5d, 0x59].freeze
+BADGE = [0xb8, 0xb7, 0xae].freeze
+PRIMARY = [0xa4, 0xc8, 0xda].freeze
+
+def read_png(path)
+  data = File.binread(path)
+  fail!("#{path} is not a PNG") unless data.start_with?("\x89PNG\r\n\x1a\n".b)
+
+  pos = 8
+  width = height = nil
+  idat = +"".b
+  while pos + 12 <= data.bytesize
+    length = data[pos, 4].unpack1("N")
+    type = data[pos + 4, 4]
+    chunk = data[pos + 8, length]
+    pos += 12 + length
+    case type
+    when "IHDR"
+      width, height, bit, color, _comp, _filter, interlace = chunk.unpack("NNCCCCC")
+      fail!("#{path} is not 8-bit RGB") unless bit == 8 && color == 2 && interlace == 0
+    when "IDAT"
+      idat << chunk
+    when "IEND"
+      break
+    end
+  end
+  fail!("#{path} has no image") unless width && height && !idat.empty?
+
+  raw = Zlib::Inflate.inflate(idat)
+  stride = width * 3
+  row_start = 0
+  prev = Array.new(stride, 0)
+  pixels = []
+  height.times do
+    filter = raw.getbyte(row_start)
+    row = raw.byteslice(row_start + 1, stride).bytes
+    row_start += stride + 1
+    out = Array.new(stride, 0)
+    stride.times do |i|
+      left = i >= 3 ? out[i - 3] : 0
+      up = prev[i]
+      up_left = i >= 3 ? prev[i - 3] : 0
+      value = row[i]
+      out[i] = case filter
+               when 0 then value
+               when 1 then (value + left) & 255
+               when 2 then (value + up) & 255
+               when 3 then (value + ((left + up) / 2)) & 255
+               when 4
+                 estimate = left + up - up_left
+                 nearest = [[estimate - left, left], [estimate - up, up], [estimate - up_left, up_left]]
+                 nearest.map! { |distance, sample| [distance.abs, sample] }
+                 (value + nearest.min_by(&:first).last) & 255
+               else
+                 fail!("#{path} uses PNG filter #{filter}")
+               end
+    end
+    prev = out
+    width.times { |x| pixels << out[x * 3, 3] }
+  end
+  [width, height, pixels]
+end
+
+def pixel(image, x, y)
+  width, _height, pixels = image
+  pixels[(y * width) + x]
+end
+
+def assert_margin(path, image)
+  width, height, = image
+  band = (width * 0.10).floor
+  samples = [
+    [0, 0],
+    [width - 1, 0],
+    [0, height - 1],
+    [width - 1, height - 1],
+    [band - 1, height / 2],
+    [width - band, height / 2],
+    [width / 2, band - 1],
+    [width / 2, height - band]
+  ]
+  samples.each do |x, y|
+    got = pixel(image, x, y)
+    fail!("#{path} pixel #{x},#{y} is #{got.inspect}, outside the safe zone") unless got == PLATE
+  end
+end
+
+logo = ROOT.join("_includes/theme/site-logo.html").read
+site_svg = ROOT.join("assets/icons/favicon.svg").read
+studio_svg = ROOT.join("assets/icons/studio-logo.svg").read
+%w[0,0 23,0 15,17 0,20 23,0 32,0 32,32 17,21 15,17 0,20 15,17 17,21 32,32 0,32].each do |point|
+  fail!("site stamp lost the point #{point}") unless logo.include?(point) && site_svg.include?(point) && studio_svg.include?(point)
+end
+fail!("Studio icon is still the hexagon") if studio_svg.include?("16,1") || studio_svg.include?("30,9")
+fail!("site icon carries the Studio badge") if site_svg.include?("badge")
+fail!("Studio icon has no badge") unless studio_svg.include?('class="badge"') && studio_svg.include?('x="20.32"')
+fail!("favicon names the owner") if site_svg.match?(/Heinen|Alexandre/i)
+
+shell = ROOT.join("_includes/theme/favicons.html").read
+fail!("shell does not link the site manifest") unless shell.include?('href="/site.webmanifest"')
+studio = ROOT.join("studio/index.html").read
+studio_app = ROOT.join("studio-app/index.html").read
+def ink_bounds(image)
+  width, height, pixels = image
+  min_x, min_y = width, height
+  max_x, max_y = -1, -1
+  height.times do |y|
+    width.times do |x|
+      next if pixels[(y * width) + x] == PLATE
+
+      min_x = x if x < min_x
+      min_y = y if y < min_y
+      max_x = x if x > max_x
+      max_y = y if y > max_y
+    end
+  end
+  [min_x, min_y, max_x, max_y]
+end
+
+def ico_sizes(path)
+  data = File.binread(path)
+  fail!("#{path} is not an ICO") unless data.bytesize >= 6 && data.getbyte(2) == 1
+
+  count = data[4, 2].unpack1("v")
+  count.times.map do |index|
+    entry = data[6 + (index * 16), 2]
+    width = entry.getbyte(0)
+    height = entry.getbyte(1)
+    width = 256 if width.zero?
+    height = 256 if height.zero?
+    [width, height]
+  end
+end
+
+fail!("site and Studio SVGs use different stamp scales") unless site_svg.include?("translate(7.68 7.68) scale(0.52)") &&
+                                                                studio_svg.include?("translate(7.68 7.68) scale(0.52)")
+
+[studio, studio_app].each do |html|
+  fail!("Studio favicon link is missing") unless html.include?('href="/assets/icons/studio-logo.ico"')
+  fail!("Studio does not link its manifest") unless html.include?('href="/studio.webmanifest"')
+  fail!("Studio apple touch icon is the 32px file") if html.include?('apple-touch-icon" href="/assets/icons/studio-logo-32.png"')
+  fail!("Studio apple touch icon is missing") unless html.include?("/assets/icons/studio-apple-touch-icon.png")
+end
+
+def build_manifests(config_yaml)
+  Dir.mktmpdir do |dir|
+    File.write(File.join(dir, "_config.yml"), config_yaml)
+    File.write(File.join(dir, "index.html"), "hello\n")
+    config = Jekyll.configuration(
+      "source" => dir,
+      "destination" => File.join(dir, "_site"),
+      "quiet" => true,
+      "safe" => false
+    )
+    site = Jekyll::Site.new(config)
+    site.reset
+    site.read
+    Pandorga::Jekyll::WebManifestGenerator.new.generate(site)
+    site.pages.select { |page| page.name.end_with?(".webmanifest") }.to_h do |page|
+      fail!("#{page.name} would enter the sitemap") unless page.data["sitemap"] == false
+      [page.name, JSON.parse(page.content)]
+    end
+  end
+end
+
+require_relative "../../lib/pandorga/jekyll/plugins/web_manifest"
+
+named = build_manifests(<<~YAML)
+  title: Fallback Title
+  pandorga:
+    identity:
+      name: Example Person
+      short_name: Example
+YAML
+site = named["site.webmanifest"]
+studio_manifest = named["studio.webmanifest"]
+fail!("manifests were not written") unless site && studio_manifest
+fail!("site name ignored identity") unless site["name"] == "Example Person" && site["short_name"] == "Example"
+fail!("site scope is not the origin root") unless site["id"] == "/" && site["scope"] == "/" && site["start_url"] == "/"
+fail!("Studio is not its own app") unless studio_manifest["id"] == "/studio/" && studio_manifest["scope"] == "/studio/"
+fail!("Studio name changed") unless studio_manifest["name"] == "Studio" && studio_manifest["start_url"] == "/studio/"
+fail!("launcher plate changed") unless site["background_color"] == "#5e5d59" && site["theme_color"] == "#5e5d59"
+
+{
+  "site.webmanifest" => [
+    ["/assets/icons/icon-512.png", "512x512", "any"],
+    ["/assets/icons/icon-maskable-512.png", "512x512", "maskable"],
+    ["/assets/icons/icon-192.png", "192x192", "any"],
+    ["/assets/icons/icon-maskable-192.png", "192x192", "maskable"]
+  ],
+  "studio.webmanifest" => [
+    ["/assets/icons/studio-icon-512.png", "512x512", "any"],
+    ["/assets/icons/studio-maskable-512.png", "512x512", "maskable"],
+    ["/assets/icons/studio-icon-192.png", "192x192", "any"],
+    ["/assets/icons/studio-maskable-192.png", "192x192", "maskable"]
+  ]
+}.each do |name, expected|
+  got = named.fetch(name).fetch("icons").map { |icon| [icon["src"], icon["sizes"], icon["purpose"]] }
+  fail!("#{name} icons are #{got.inspect}") unless got == expected
+end
+
+fallback = build_manifests("title: \"\"\n")
+fail!("empty identity must still name the app") unless fallback["site.webmanifest"]["name"] == "Site"
+
+[
+  ["assets/icons/icon-512.png", "assets/icons/studio-icon-512.png", 512],
+  ["assets/icons/icon-maskable-512.png", "assets/icons/studio-maskable-512.png", 512],
+  ["assets/icons/icon-192.png", "assets/icons/studio-icon-192.png", 192],
+  ["assets/icons/icon-maskable-192.png", "assets/icons/studio-maskable-192.png", 192],
+  ["assets/icons/apple-touch-icon.png", "assets/icons/studio-apple-touch-icon.png", 180],
+  ["assets/icons/favicon-32.png", "assets/icons/studio-logo-32.png", 32],
+  ["assets/icons/icon-32.png", "assets/icons/studio-logo-32.png", 32]
+].each do |site_rel, studio_rel, size|
+  site_image = read_png(ROOT.join(site_rel))
+  studio_image = read_png(ROOT.join(studio_rel))
+  fail!("#{site_rel} is #{site_image[0]}x#{site_image[1]}") unless site_image[0] == size && site_image[1] == size
+  fail!("#{studio_rel} canvas is #{studio_image[0]}x#{studio_image[1]}") unless studio_image[0] == size && studio_image[1] == size
+
+  site_ink = ink_bounds(site_image)
+  studio_ink = ink_bounds(studio_image)
+  fail!("#{studio_rel} art bounds #{studio_ink.inspect} differ from #{site_ink.inspect}") unless site_ink == studio_ink
+
+  min_x, min_y, max_x, max_y = site_ink
+  pad_right = size - 1 - max_x
+  pad_bottom = size - 1 - max_y
+  fail!("#{site_rel} padding is uneven #{site_ink.inspect}") unless min_x == min_y && pad_right == min_x && pad_bottom == min_y
+
+  radius = size * 0.40
+  center = size / 2.0
+  corner = Math.hypot((max_x + 1) - center, (max_y + 1) - center)
+  fail!("#{site_rel} art leaves the safe zone (#{corner} > #{radius})") if corner > radius
+end
+
+site_ico = ico_sizes(ROOT.join("assets/icons/favicon.ico"))
+studio_ico = ico_sizes(ROOT.join("assets/icons/studio-logo.ico"))
+fail!("favicon canvases differ: #{site_ico.inspect} vs #{studio_ico.inspect}") unless site_ico == studio_ico && site_ico == [[16, 16], [32, 32]]
+
+[512, 192].each do |size|
+  site_path = ROOT.join("assets/icons/icon-maskable-#{size}.png")
+  studio_path = ROOT.join("assets/icons/studio-maskable-#{size}.png")
+  site_image = read_png(site_path)
+  studio_image = read_png(studio_path)
+  fail!("site maskable is #{site_image[0]} square") unless site_image[0] == size && site_image[1] == size
+  fail!("Studio maskable is #{studio_image[0]} square") unless studio_image[0] == size && studio_image[1] == size
+  assert_margin(site_path, site_image)
+  assert_margin(studio_path, studio_image)
+
+  mark = (size * 0.24).round + (2.0 / 32 * size * 0.52).round
+  fail!("site stamp is not the pastel triad") unless pixel(site_image, mark, mark) == PRIMARY
+  fail!("Studio stamp is not the pastel triad") unless pixel(studio_image, mark, mark) == PRIMARY
+
+  badge_at = (size * 0.68).round
+  fail!("site icon has the Studio badge") if pixel(site_image, badge_at, badge_at) == BADGE
+  fail!("Studio badge is missing") unless pixel(studio_image, badge_at, badge_at) == BADGE
+
+  differ = site_image[2].zip(studio_image[2]).count { |left, right| left != right }
+  fail!("Studio icon is a different picture (#{differ} pixels)") unless differ.positive? && differ < (size * size * 0.03)
+end
+
+puts "PASS test-pwa-icons"

data/scripts/test/test-rascunhos-licence.rb

@@ -0,0 +1,43 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+# PLT-AC-27. Below 1024px the Rascunhos licence follows the entries.
+# writing.css had this order. The per-page sheet split stopped loading that
+# file on the blog layout, and `.rascunhos-body { display: block }` put the
+# licence back above the texts. The winning rule lives in rascunhos.css.
+
+require "pathname"
+
+ROOT = Pathname.new(__dir__).join("..", "..").expand_path
+
+def fail!(message)
+  warn "FAIL test-rascunhos-licence: #{message}"
+  exit 1
+end
+
+shell = ROOT.join("_layouts/shell.html").read
+blog = shell[/when "blog".*?assign _ledger = "([^"]+)"/m, 1]
+fail!("blog layout has no ledger list") unless blog
+sheets = blog.split("|")
+rascunhos_at = sheets.index("rascunhos")
+writing_at = sheets.index("writing")
+fail!("blog layout does not load rascunhos.css") unless rascunhos_at
+fail!("blog layout does not load writing.css after rascunhos.css") unless writing_at && writing_at > rascunhos_at
+
+css = ROOT.join("assets/css/ledger/rascunhos.css").read
+block_at = css.index(".rascunhos-body {\n  display: block;")
+rule_at = css.index(".rascunhos-main .rascunhos-body {\n    display: flex;")
+licence_at = css.index(".rascunhos-main .writing-rail-licence {")
+ledger_at = css.index(".rascunhos-main .rascunhos-body>.rascunhos-ledger {")
+hidden_at = css.index(".rascunhos-main .rascunhos-body.hidden {\n  display: none;")
+
+fail!("rascunhos body is no longer display:block at rest") unless block_at
+fail!("mobile column is missing from rascunhos.css") unless rule_at && rule_at > block_at
+fail!("mobile column is not limited to the disclosure width") unless css.index("@media (max-width: 1023px)")&.< rule_at
+fail!("licence has no colophon order") unless licence_at && css[licence_at, 180].include?("order: 2")
+fail!("ledger is not ordered ahead of the licence") unless ledger_at && ledger_at < licence_at && css[ledger_at, 120].include?("order: 1")
+fail!("detail view can no longer hide the listing") unless hidden_at && hidden_at > rule_at
+fail!("rail no longer dissolves so the licence can leave it") unless css.include?(".rascunhos-main .rascunhos-body>.writing-rail:not([hidden])") &&
+  css.include?("display: contents")
+
+puts "PASS test-rascunhos-licence"

data/scripts/validate.sh

@@ -60,6 +60,10 @@ TESTS=(
   scripts/test/test-hydrate-reserve.rb
   scripts/test/test-hero-summary.rb
   scripts/test/test-lighthouse-policy.rb
+  scripts/test/test-home-lists.rb
+  scripts/test/test-home-articles.rb
+  scripts/test/test-rascunhos-licence.rb
+  scripts/test/test-pwa-icons.rb
   scripts/test/test-css-delivery.rb
   scripts/test/test-discovery.rb
 )

data/studio/index.html

@@ -6,7 +6,10 @@
     <meta name="robots" content="noindex" />
     <link rel="icon" href="/assets/icons/studio-logo.svg" type="image/svg+xml" sizes="any" />
     <link rel="icon" href="/assets/icons/studio-logo-32.png" type="image/png" sizes="32x32" />
-    <link rel="apple-touch-icon" href="/assets/icons/studio-logo-32.png" />
+    <link rel="apple-touch-icon" href="/assets/icons/studio-apple-touch-icon.png" sizes="180x180" />
+    <link rel="icon" href="/assets/icons/studio-logo.ico" sizes="16x16 32x32" />
+    <link rel="manifest" href="/studio.webmanifest" />
+    <meta name="theme-color" content="#5e5d59" />
     <title>Studio</title>
     <link rel="preconnect" href="https://fonts.googleapis.com" />
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />

data/studio-app/index.html

@@ -6,7 +6,10 @@
     <meta name="robots" content="noindex" />
     <link rel="icon" href="/assets/icons/studio-logo.svg" type="image/svg+xml" sizes="any" />
     <link rel="icon" href="/assets/icons/studio-logo-32.png" type="image/png" sizes="32x32" />
-    <link rel="apple-touch-icon" href="/assets/icons/studio-logo-32.png" />
+    <link rel="apple-touch-icon" href="/assets/icons/studio-apple-touch-icon.png" sizes="180x180" />
+    <link rel="icon" href="/assets/icons/studio-logo.ico" sizes="16x16 32x32" />
+    <link rel="manifest" href="/studio.webmanifest" />
+    <meta name="theme-color" content="#5e5d59" />
     <title>Studio</title>
     <link rel="preconnect" href="https://fonts.googleapis.com" />
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pandorga
 version: !ruby/object:Gem::Version
-  version: 1.6.7
+  version: 1.6.8
 platform: ruby
 authors:
 - The Pandorga contributors
@@ -227,7 +227,23 @@ files:
 - assets/css/ledger/sources.css
 - assets/css/ledger/writing.css
 - assets/css/tailwind.css
+- assets/icons/apple-touch-icon.png
+- assets/icons/favicon-32.png
+- assets/icons/favicon.ico
+- assets/icons/favicon.svg
+- assets/icons/icon-192.png
+- assets/icons/icon-32.png
+- assets/icons/icon-512.png
+- assets/icons/icon-maskable-192.png
+- assets/icons/icon-maskable-512.png
+- assets/icons/studio-apple-touch-icon.png
+- assets/icons/studio-icon-192.png
+- assets/icons/studio-icon-512.png
+- assets/icons/studio-logo-32.png
+- assets/icons/studio-logo.ico
 - assets/icons/studio-logo.svg
+- assets/icons/studio-maskable-192.png
+- assets/icons/studio-maskable-512.png
 - assets/tailwind-play.js
 - examples/full/Gemfile
 - examples/full/_config.yml
@@ -300,12 +316,14 @@ files:
 - lib/pandorga/jekyll/plugins/lib/writing_entry.rb
 - lib/pandorga/jekyll/plugins/local_detail_rewrites.rb
 - lib/pandorga/jekyll/plugins/timeline.rb
+- lib/pandorga/jekyll/plugins/web_manifest.rb
 - lib/pandorga/jekyll/plugins/writing_slug_limits.rb
 - lib/pandorga/object_store_env.rb
 - lib/pandorga/registry.rb
 - lib/pandorga/registry/schema.yml
 - lib/pandorga/version.rb
 - scripts/cdn-allowlist.json
+- scripts/check_home_lists.mjs
 - scripts/content/backfill-content-keys.rb
 - scripts/content/band_art.rb
 - scripts/content/export-content-json.rb
@@ -326,6 +344,7 @@ files:
 - scripts/lighthouse_server.py
 - scripts/pdf/md-to-pdf.mjs
 - scripts/pdf/md-to-pdf.sh
+- scripts/render-pwa-icons.py
 - scripts/tailwind/build.sh
 - scripts/tailwind/input.css
 - scripts/tailwind/tailwind.config.js
@@ -409,7 +428,9 @@ files:
 - scripts/test/test-hero-portraits.mjs
 - scripts/test/test-hero-portraits.rb
 - scripts/test/test-hero-summary.rb
+- scripts/test/test-home-articles.rb
 - scripts/test/test-home-band-art.rb
+- scripts/test/test-home-lists.rb
 - scripts/test/test-hydrate-reserve.rb
 - scripts/test/test-install-functions.rb
 - scripts/test/test-language-export.rb
@@ -422,8 +443,10 @@ files:
 - scripts/test/test-no-personal-data.rb
 - scripts/test/test-public-cv-export.rb
 - scripts/test/test-publish-site-root.rb
+- scripts/test/test-pwa-icons.rb
 - scripts/test/test-r2-config-consistency.rb
 - scripts/test/test-r2-json-sync.rb
+- scripts/test/test-rascunhos-licence.rb
 - scripts/test/test-registry-home.rb
 - scripts/test/test-runtime-js-syntax.rb
 - scripts/test/test-shell-a11y.rb