abqari 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '035944943314205611728976da674b3459ebe5b38cc7bcf7ac037dac5726dc39'
-  data.tar.gz: ca10d8e3ba566d54f81b6d6ad20779a8252e9eb768e508d5d911a75807e5f2a2
+  metadata.gz: fd411b1e1b18a824d5cee74ee6e557c7135fc973f6fc9edb4f4c806edff7cadf
+  data.tar.gz: bb34137c4de0ffb733d1b911f6e523df2cde7b933d196e07d0e4ca4a4fb91460
 SHA512:
-  metadata.gz: 987bc6ee6e1e9186193f6a35745559a3e5b1c383b634e681df38c94016b45ab766b2d8d0d6215e6bca88c741d95f4ffff70c2e9be904ea1e93b32ee0c9280397
-  data.tar.gz: 94f4ec0a8576c75d6b30b5f7a306dc44bb0cad5fe2312ab075b419efe3b9227f9a02a7676b289fa062ad4d46e7bf470a288f45ad0503d937fd009281de20e5d8
+  metadata.gz: b1c8ea8aa8cad1f13f9dc3eddd81fbbedf891d024b6998f8a1f7aacf7c45c66ce783bea05174d983973c46eac5318372addd0d8b590e29871723f29f1d71a40c
+  data.tar.gz: 2820827176cec3ecaaf08ad2ceb70c15b506435368154e24d2afc7ea544f2fe959613da696e2bb05eb81eff3011d4c37e07081565e1c4fa2ae2e901073b4e5c8

data/CHANGELOG.md

@@ -9,6 +9,35 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 _Nothing yet._
 
+## [1.1.2] — 2026-10-09
+
+### Fixed
+
+- **Changing `fonts:` and re-running `bin/fetch-fonts` didn't reach
+  returning visitors; they kept the old fonts for up to a year.** The
+  head linked the font stylesheet at a fixed `/assets/fonts/fonts.css`,
+  and the generated `_headers` serves all of `/assets/*` with
+  `Cache-Control: public, max-age=31536000, immutable`, so a browser
+  that had cached the old file never asked for it again. The new
+  families fell back to system fonts. It hid because a first visit, a
+  hard reload, and the dev server (which doesn't apply `_headers`) all
+  show the new fonts; only returning visitors on a host that honours
+  `_headers` were stuck. `syntax.css` had the same bug before the CSS
+  bundle.
+
+  `vendor/fonts/fonts.css` now goes through the asset pipeline and is
+  linked as `/assets/fonts/fonts.<hash>.css`, minified in production,
+  so a re-fetch changes the URL. Dev-server rebuilds now re-render
+  every page after a re-fetch, because every head carries the hash.
+  The head no longer emits the link when `fonts:` is set but
+  `bin/fetch-fonts` hasn't run; it used to link a stylesheet that
+  404'd.
+
+  If your site overrides `_head.html.erb`, change its font link to
+  `<%= asset_path('fonts/fonts.css') %>`. The unhashed copy still ships
+  at `/assets/fonts/fonts.css`, so an overridden head keeps working,
+  but it keeps the stale-cache problem.
+
 ## [1.1.1] — 2026-08-11
 
 Bug-fix release, all of it found while building a site against the
@@ -958,7 +987,8 @@ run a real working author / publisher site.
   commonmarker ≥ 2.4 ships precompiled 4.0 binaries, which is what
   the `~> 2.4` floor bought.
 
-[Unreleased]: https://github.com/grantrayner/abqari/compare/v1.1.1...HEAD
+[Unreleased]: https://github.com/grantrayner/abqari/compare/v1.1.2...HEAD
+[1.1.2]: https://github.com/grantrayner/abqari/compare/v1.1.1...v1.1.2
 [1.1.1]: https://github.com/grantrayner/abqari/compare/v1.1.0...v1.1.1
 [1.1.0]: https://github.com/grantrayner/abqari/compare/v1.0.0...v1.1.0
 [1.0.0]: https://github.com/grantrayner/abqari/releases/tag/v1.0.0

data/README.md

@@ -11,7 +11,7 @@ optional overrides), while the engine — layouts, themes, helpers, asset
 pipeline — lives in the dependency. Forking the engine is also
 supported for users who want to own all the code.
 
-> **Status:** v1.1.1 — see
+> **Status:** v1.1.2 — see
 > [CHANGELOG.md](https://github.com/grantrayner/abqari/blob/main/CHANGELOG.md).
 > Distributed via RubyGems (`gem install abqari`) and as a Bundler
 > path/git source. The API follows [semver](https://semver.org/) from
@@ -174,7 +174,7 @@ Test that it worked:
 abqari version
 ```
 
-You should see a version number, e.g. `abqari 1.1.1`. If you get
+You should see a version number, e.g. `abqari 1.1.2`. If you get
 `command not found`, see [Troubleshooting](#troubleshooting) below.
 
 ### Step 3 — Create your first site
@@ -470,7 +470,7 @@ end
 Or — pin to a git ref while tracking pre-release work:
 
 ```ruby
-gem 'abqari', git: 'https://github.com/grantrayner/abqari.git', tag: 'v1.1.1'
+gem 'abqari', git: 'https://github.com/grantrayner/abqari.git', tag: 'v1.1.2'
 ```
 
 Install the libvips C library once (hard dep for the image pipeline):
@@ -1629,7 +1629,9 @@ Then run once:
 bin/fetch-fonts
 ```
 
-Abqari downloads the woff2 files to `vendor/fonts/`, generates a `fonts.css` with rewritten URLs, and serves everything from `/assets/fonts/` at build time. The head partial conditionally includes the link tag whenever `fonts:` is configured.
+Abqari downloads the woff2 files to `vendor/fonts/`, generates a `fonts.css` with rewritten URLs, and serves everything from `/assets/fonts/` at build time. The stylesheet is fingerprinted like any other asset (`/assets/fonts/fonts.<hash>.css`), so changing `fonts:` and re-running `bin/fetch-fonts` busts the immutable cache. The head partial links it whenever `fonts:` is configured and the fetch has run.
+
+If you override the head partial, link the stylesheet with `<%= asset_path('fonts/fonts.css') %>`. An unhashed copy still ships at `/assets/fonts/fonts.css`, but `_headers` caches it for a year, so returning visitors won't see font changes.
 
 ## Icons
 
@@ -2550,7 +2552,7 @@ taking a feature release. To track a fork or an unreleased branch
 instead, swap the line for a git source:
 
 ```ruby
-gem 'abqari', git: 'https://github.com/grantrayner/abqari.git', tag: 'v1.1.1'
+gem 'abqari', git: 'https://github.com/grantrayner/abqari.git', tag: 'v1.1.2'
 ```
 
 The cadence: read [CHANGELOG.md](https://github.com/grantrayner/abqari/blob/main/CHANGELOG.md) before each upgrade,

data/app/views/partials/_head.html.erb

@@ -367,8 +367,12 @@
   <% Array(site.config['fonts_preload']).each do |path| %>
   <link rel="preload" href="<%= sanitized_url(path) %>" as="font" type="font/woff2" crossorigin>
   <% end %>
-  <% if Array(site.config['fonts']).any? %>
-  <link rel="stylesheet" href="/assets/fonts/fonts.css">
+  <%# Fingerprinted, never the fixed `/assets/fonts/fonts.css` — that
+      URL is cached `immutable`, so a re-fetch never reached returning
+      visitors. No link until `bin/fetch-fonts` has run. %>
+  <% fonts_css = Array(site.config['fonts']).any? && optional_asset_path('fonts/fonts.css') %>
+  <% if fonts_css %>
+  <link rel="stylesheet" href="<%= fonts_css %>">
   <% end %>
   <%# Render-blocking CSS ships as ONE fingerprinted bundle (syntax +
       _common + theme app.css + site.css, same cascade order as the

data/lib/abqari/asset_pipeline.rb

@@ -8,6 +8,7 @@ module Abqari
     OUTPUT_SUBDIR = 'assets'
     HASH_LENGTH = 10
     BUNDLE_LOGICAL = 'css/bundle.css'
+    FONTS_LOGICAL = 'fonts/fonts.css'
     # A theme name is a directory name under themes/ and nothing more.
     # The strict pattern is load-bearing: the name is joined into
     # filesystem paths in several places (here, ArtifactWriter,
@@ -55,6 +56,7 @@ module Abqari
       [engine_app_assets, site_app_assets].uniq.each do |dir|
         process_dir(dir) if dir && Dir.exist?(dir)
       end
+      process_font_stylesheet
       build_css_bundle
     end
 
@@ -172,6 +174,22 @@ module Abqari
       @paths[logical] = "/#{OUTPUT_SUBDIR}/#{fingerprinted}"
     end
 
+    # The `bin/fetch-fonts` stylesheet gets a content hash like any
+    # other asset. At its old fixed URL it sat under the `/assets/*
+    # immutable` cache rule, so a site that changed `fonts:` and
+    # re-fetched kept serving returning visitors the old `@font-face`
+    # rules for a year. Its woff2 `url()`s are root-absolute, so the
+    # renamed file still resolves them. ArtifactWriter#copy_fonts keeps
+    # shipping the unhashed copy for sites that override the head.
+    def process_font_stylesheet
+      source = File.join(@site.site_root, 'vendor', 'fonts', 'fonts.css')
+      return unless File.file?(source)
+      return if @site.external_symlink?(source)
+
+      write_asset(FONTS_LOGICAL, processed_content(source, FONTS_LOGICAL))
+      @sources[FONTS_LOGICAL] = source
+    end
+
     def processed_content(entry, logical)
       raw = File.binread(entry)
       kind = MINIFY_KINDS[File.extname(logical)]

data/lib/abqari/renderer.rb

@@ -48,13 +48,17 @@ module Abqari
     # `compute_shared_deps_mtime` time so we only walk the active
     # theme's directory, not every theme that happens to ship with
     # the gem.
+    #
+    # `vendor/fonts/fonts.css` is here because every page's head links
+    # it by content hash; a re-fetch must re-render them all.
     GLOBAL_DEP_GLOBS = [
       'app/views/partials/**/*',
       'app/icons/**/*',
       'app/assets/**/*',
       'lib/**/*',
       'config/**/*',
-      'data/**/*'
+      'data/**/*',
+      'vendor/fonts/fonts.css'
     ].freeze
 
     # The renderer only needs the frontmatter block (no body), but

data/lib/abqari/version.rb

@@ -14,5 +14,5 @@
 #
 # Keep this file dependency-free.
 module Abqari
-  VERSION = '1.1.1'
+  VERSION = '1.1.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: abqari
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Grant Rayner