studio-engine 0.85.0 → 0.87.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 940823449254339d163e66fe93eabdab83cc36e25f4b80600ab02c6552e3d624
-  data.tar.gz: 1ce338c5ba90749bbd3a5217c5dba0bd3813b5be96996c15c734cdacdb1b0f0d
+  metadata.gz: e3bc2b4fbaacbbcb3895cdcc95f4caa6421df1cc1cf16c9e53d8bdd5aa19f3a7
+  data.tar.gz: b453a06ef41d2bd56b23a56e2f80bc29f19bd793702dbf23e6b1f7236f0cfb37
 SHA512:
-  metadata.gz: c322848f2708206583cff895faf563e34b85853494172dfd6f859568a771555a5f5b7859c0ac517a361679a282dbe5af1e5aa91b4bdce9a5e5df57c38a4cbf59
-  data.tar.gz: 70c41c33f57623eee5a8fe63aab6ff5c804a3570f055cca12bde70c8ae0919b20c3026de2100518e01ccab75c79f77afcc21674dede4c76ea7d6b1be4b6d5e0f
+  metadata.gz: f88b17d347d21f137b61a91d0e1d0e70c67e3b464e36f1f0de7bb198798c914fd9a09af6a567639cae488ae67aabebdbac811c6a2a55f1ba02f9bdada74bb8bc
+  data.tar.gz: 975c4a433ea0dac45d70a683afc799984ee027c27a33e6cf823467cc545f01dda4575ef6623efd830b4bdf486cb4a29b53cee7e0886b441681a30af3b7f4ff38

data/CHANGELOG.md

@@ -4,6 +4,94 @@ The format is [Keep a Changelog](https://keepachangelog.com/en/1.1.0/). This pro
 
 ## Unreleased
 
+## 0.87.0 — 2026-10-04
+
+### Changed
+
+- **The site footer is on by default. An unset `config.site_footer` now renders
+  a footer wherever `studio_site_footer` is called**; before, it rendered
+  nothing. The default footer is built from what the engine already knows: the
+  app's name (the site identity's title, else `config.app_name`), its footer or
+  navbar logo, the © line, and a Privacy Policy and a Terms of Service link for
+  each of the routes named `privacy` and `terms` that the host has (a GET route
+  that needs no arguments; anything else is not linked). It has no address, no
+  map, no phone, no email, no tagline, no social row and no link columns, and
+  names no Leaflet. The rule for where it shows is unchanged. **An app that
+  sets `config.site_footer` to a Hash or a callable renders exactly what it did**,
+  and an app that does not call the helper is unaffected. A callable that
+  answers `nil` still declines the footer for that request.
+
+### Added
+
+- **`config.site_footer = false` turns the footer off.** It is the one opt-out,
+  and it is distinct from unset (`nil`), which is the default footer.
+  `Studio.site_footer_enabled?` and `Studio.site_footer_declared?` read the
+  three states.
+- **`config.site_footer_address`: the location, as one setting.** A Hash of the
+  facts' `address:` keys (`street:`, `city_line:`, `lat:`, `lng:`, and the
+  optional `zoom:` and `directions_url:`) gives the footer its Location band,
+  and its map when both coordinates are present, without writing the facts
+  callable. It applies to the default footer and to an app's own facts that
+  carry no address. An address in the app's own facts wins, whole, and
+  `address: false` there shows none.
+- **docs/NEW_APP_SETUP.md has a Site Footer step (§ 10)**, and its layout ends
+  with `<%= studio_site_footer %>`. The sections after it moved down by one.
+
+### Fixed
+
+- `address: false` in the footer's facts shows no address instead of raising.
+
+## 0.86.0 — 2026-10-03
+
+### Added
+
+- **Footer-only consumers: an app with no ActiveRecord can take the site
+  footer alone, with no workarounds.** When `ActiveRecord::Railtie` is not
+  loaded (`Studio.active_record?` reads false) the engine requires the
+  ActiveSupport core extensions it calls at load time, skips the user-contract
+  check, keeps every `app/` root but `app/helpers` (the two `concerns` roots
+  included) out of eager loading, and answers
+  `studio_engine:install:migrations` with a no-op that exits 0 and writes
+  nothing. A host with ActiveRecord is unchanged. docs/SITE_FOOTER.md, *An app
+  with no database*, has the recipe; rantly can drop its four workarounds
+  (`require "active_support/core_ext/integer/time"`,
+  `Studio.validate_user_contract = false`, its `do_not_eager_load` loop, and its
+  replacement rake task).
+- **docs/SITE_FOOTER.md and docs/BOOKING.md ship in the gem**, so a consumer's
+  citation of them resolves in the installed copy.
+
+### Changed
+
+- **Footer links are painted at full opacity in `--ftr-link-ink`**, which
+  defaults to `--color-text-secondary`, instead of the inherited body colour at
+  78% opacity. On the default theme the links clear WCAG AA on the band in both
+  themes; an app that maps the tokens onto its own palette sets
+  `--color-text-secondary` (or `--ftr-link-ink`) to an ink that clears 4.5:1 on
+  its `--color-surface-alt` (docs/SITE_FOOTER.md, *Colours*). A refused href's
+  label (`.ftr-link-plain`) takes the same ink.
+- **A footer with no address names no Leaflet.** The map's styles and mount
+  script moved from `studio/site_footer/_assets` to a new
+  `studio/site_footer/_map_assets`, rendered only with a map
+  (`studio_footer_map_assets`).
+
+### Fixed
+
+- **`/signup` honours `Studio.auth_methods`, as `/login` already did.** The
+  engine's `registrations/new` rendered Password, Confirm Password and "Sign up
+  with Google" whatever the app configured, while the passwordless
+  `RegistrationsController#create` reads the email alone. It now renders the
+  password form only when `Studio.password_login_available?`, otherwise the
+  email-only form (button "Send sign-in link", wording from
+  `Studio.sign_in_label`) when `:magic_link` is enabled, and the Google button and
+  its divider only with `:google`. The Name field renders only on the password
+  path, the one path that stores it; a passwordless signup discarded the name, so
+  it no longer asks. `#create` now branches on the same predicate the view does
+  (`password_login_available?` rather than `auth_method?(:password)`); for every
+  app that boots, the two agree. A password app renders exactly as before.
+  Consumers that wrote a host `app/views/registrations/new.html.erb` to hide the
+  password fields (McRitchie Industries) may delete it after the bump; the hub
+  and Turf Monster override it for their unified auth card and keep theirs.
+
 ## 0.85.0 — 2026-10-02
 
 ### Changed

data/README.md

@@ -41,7 +41,7 @@ resolved.
 - **Site identity and link previews**: `Studio::SiteIdentity` holds the app's title, description and image, edited at `/admin/link_preview` beside a live unfurl card and read anywhere through `Studio.site_identity`. Every page unfurls with it unless it calls `link_preview image:, title:, description:`, and `Studio::LinkPreviewBots` serves preview fetchers a slim page under iMessage's 1 MiB limit. Adopt with `bin/rails g studio:site_identity`. See [`docs/LINK_PREVIEW.md`](docs/LINK_PREVIEW.md).
 - **Public user page**: `/u/:username` shows a user's avatar and username (nothing else), and unfurls with their avatar, falling back to the site image. Link any username to it with `link_to_user_profile(user)` or `studio_user_profile_path(user)`. Opt in with `config.draw_public_user_routes = true`. See [`docs/PUBLIC_USER_PAGE.md`](docs/PUBLIC_USER_PAGE.md).
 - **Transactional emails**: `Studio::EmailCatalog` — every email an app sends, its type, a live preview, and its banner — plus the shared `/admin/emails` page. Every app inherits the standard emails and their artwork on day one, and can register its own workflows and upload its own banners. See [Transactional emails](#transactional-emails).
-- **Site footer**: `<%= studio_site_footer %>` in the layout renders the public site's footer from `config.site_footer` (brand, social profiles, link columns, an address with a live map, legal links), every part optional. Leaflet is vendored and served by the engine. See [`docs/SITE_FOOTER.md`](docs/SITE_FOOTER.md).
+- **Site footer**: `<%= studio_site_footer %>` in the layout renders the public site's footer. It is on by default: with nothing configured it prints the app's name, logo and the legal links the app has routes for, and no address. `config.site_footer` declares the app's own facts (brand, social profiles, link columns, an address with a live map, legal links), every part optional; `config.site_footer_address` adds a location in one setting; `config.site_footer = false` turns the footer off. Leaflet is vendored and served by the engine. See [`docs/SITE_FOOTER.md`](docs/SITE_FOOTER.md).
 - **Booking**: a simple scheduler on Google Calendar appointment schedules, with or without the footer. With `config.booking_url`, `studio_booking_frame` embeds Google's booking page, `studio_booking_link` opens it in a popup, and `config.draw_booking_routes = true` draws `/schedule` (or name the app's own page with `config.booking_path`). `config.booking_crop` crops the frame to the slot picker at rest, from numbers `bin/booking-crop-measure` reads off the app's own schedule. See [`docs/BOOKING.md`](docs/BOOKING.md).
 
 ## Configuration
@@ -73,6 +73,14 @@ Studio.configure do |config|
 end
 ```
 
+`auth_methods` draws both auth pages. `/login` and `/signup` render the password
+form only when `:password` is enabled and the User has `authenticate`
+(`Studio.password_login_available?`); otherwise they render the email-only
+sign-in-link form when `:magic_link` is enabled, and the Google button only with
+`:google`. A passwordless signup stores nothing from the form: it mails a link,
+and using the link creates the account. So `registration_params`' `:name` shows a
+Name field only on a password app.
+
 ### Local log rotation (automatic — nothing to configure)
 
 The engine caps the host app's **development** log at 16 MB and its **test** log

data/app/controllers/registrations_controller.rb

@@ -12,7 +12,9 @@ class RegistrationsController < ApplicationController
     # straight from a signup POST would skip proof of email ownership, so we
     # treat "sign up" as a magic-link request — the create-or-login link (which
     # only fires after the recipient clicks it) does the account creation.
-    unless Studio.auth_method?(:password)
+    # Gated on the same predicate registrations/new renders the password form on,
+    # so the form a visitor sees is always the form this action reads.
+    unless Studio.password_login_available?
       email = (params.dig(:user, :email) || params[:email]).to_s.strip.downcase
       if email.match?(URI::MailTo::EMAIL_REGEXP)
         token = issue_magic_link(email, nil)

data/app/helpers/studio/site_footer_helper.rb

@@ -10,15 +10,18 @@ module Studio
   #   <%= studio_booking_popup %>           the dialog those links open
   #   <%= studio_footer_map %>              the map alone, e.g. on a contact page
   #
-  # Every one of them renders NOTHING when its configuration is absent
-  # (Studio.site_footer, Studio.booking_url), so a layout or a shared view can
-  # call them before an app has declared anything.
+  # THE FOOTER IS ON BY DEFAULT: with Studio.site_footer unset, the layout line
+  # renders the default footer (the site name, the logo, and the legal links the
+  # host has routes for), and `config.site_footer = false` turns it off. The
+  # booking helpers render NOTHING without Studio.booking_url, and the map
+  # nothing without an address, so a layout or a shared view can call any of
+  # them before an app has declared anything.
   #
   # Prefixed names for the reason Studio::GeoHelper gives: every helper module is
   # included into every view.
   module SiteFooterHelper
-    # The resolved facts (Studio::SiteFooter.resolve), or nil. Resolved once per
-    # request.
+    # The resolved facts (Studio::SiteFooter.resolve): the app's own, else the
+    # default footer's. nil when the footer is off. Resolved once per request.
     #
     # A callable that RAISES must not take every page down with it, because the
     # footer is in the layout. In production the error is logged once per process
@@ -41,7 +44,7 @@ module Studio
     # Where the footer shows: Studio.site_footer_visible, asked of this view. By
     # default that is every page for a visitor and, for a signed-in viewer, only
     # the controllers in Studio.site_footer_controllers (plus the booking page).
-    # Always false for an app that declared no footer.
+    # Always false for an app that turned the footer off.
     def studio_show_site_footer?
       return false if studio_site_footer_facts.nil?
 
@@ -155,6 +158,15 @@ module Studio
       render "studio/site_footer/assets"
     end
 
+    # The map's styles and mount script, once per page. Only the map partial
+    # asks, so a page with no map names no Leaflet.
+    def studio_footer_map_assets
+      return if @_studio_footer_map_assets_rendered
+
+      @_studio_footer_map_assets_rendered = true
+      render "studio/site_footer/map_assets"
+    end
+
     def studio_booking_assets
       return if @_studio_booking_assets_rendered
 

data/app/views/registrations/new.html.erb

@@ -3,6 +3,15 @@
   words = Studio.app_name.split
   last_word = words.pop
   prefix = words.join(" ")
+  # /signup renders from the app's configured auth_methods, exactly as /login does
+  # (sessions/new.html.erb): the PASSWORD form only when passwords are available
+  # (Studio.password_login_available?), otherwise the passwordless email form when
+  # :magic_link is enabled, and the Google button only when :google is. The passwordless
+  # POST (RegistrationsController#create) reads the email alone and mails a sign-in link,
+  # so that form asks for no password and no name: neither would be stored.
+  password_signup = Studio.password_login_available?
+  email_signup = password_signup || Studio.auth_method?(:magic_link)
+  ask_name = password_signup && Studio.registration_params.include?(:name)
 %>
 
 <div class="min-h-[70vh] flex items-center justify-center">
@@ -24,51 +33,65 @@
         </div>
       <% end %>
 
-      <%= form_with model: @user, url: signup_path, method: :post do |f| %>
-        <% if Studio.registration_params.include?(:name) %>
+      <% if email_signup %>
+        <%= form_with model: @user, url: signup_path, method: :post do |f| %>
+          <% if ask_name %>
+            <div class="mb-5">
+              <label for="user_name" class="block text-sm text-secondary mb-2 font-medium">Name</label>
+              <%= f.text_field :name, id: "user_name", autofocus: true,
+                class: "input-field",
+                placeholder: "Your name" %>
+            </div>
+          <% end %>
+
           <div class="mb-5">
-            <label for="user_name" class="block text-sm text-secondary mb-2 font-medium">Name</label>
-            <%= f.text_field :name, id: "user_name", autofocus: true,
+            <label for="user_email" class="block text-sm text-secondary mb-2 font-medium">Email</label>
+            <%= f.email_field :email, id: "user_email", autofocus: !ask_name,
               class: "input-field",
-              placeholder: "Your name" %>
+              placeholder: "you@example.com" %>
           </div>
-        <% end %>
 
-        <div class="mb-5">
-          <label for="user_email" class="block text-sm text-secondary mb-2 font-medium">Email</label>
-          <%= f.email_field :email, id: "user_email", autofocus: !Studio.registration_params.include?(:name),
-            class: "input-field",
-            placeholder: "you@example.com" %>
-        </div>
+          <% if password_signup %>
+            <div class="mb-5">
+              <label for="user_password" class="block text-sm text-secondary mb-2 font-medium">Password</label>
+              <%= f.password_field :password, id: "user_password",
+                class: "input-field",
+                placeholder: "Choose a password" %>
+            </div>
 
-        <div class="mb-5">
-          <label for="user_password" class="block text-sm text-secondary mb-2 font-medium">Password</label>
-          <%= f.password_field :password, id: "user_password",
-            class: "input-field",
-            placeholder: "Choose a password" %>
-        </div>
+            <div class="mb-6">
+              <label for="user_password_confirmation" class="block text-sm text-secondary mb-2 font-medium">Confirm Password</label>
+              <%= f.password_field :password_confirmation, id: "user_password_confirmation",
+                class: "input-field",
+                placeholder: "Confirm your password" %>
+            </div>
 
-        <div class="mb-6">
-          <label for="user_password_confirmation" class="block text-sm text-secondary mb-2 font-medium">Confirm Password</label>
-          <%= f.password_field :password_confirmation, id: "user_password_confirmation",
-            class: "input-field",
-            placeholder: "Confirm your password" %>
-        </div>
+            <button type="submit" class="btn btn-primary btn-lg w-full">
+              Sign Up
+            </button>
+          <% else %>
+            <button type="submit" class="btn btn-primary btn-lg w-full">
+              Send <%= Studio::AuthLabels.link_noun(Studio.sign_in_label) %>
+            </button>
 
-        <button type="submit" class="btn btn-primary btn-lg w-full">
-          Sign Up
-        </button>
+            <p class="text-center text-secondary text-sm mt-4">We will email you a link that signs you in and creates your account.</p>
+          <% end %>
+        <% end %>
       <% end %>
 
-      <div class="relative my-6">
-        <div class="absolute inset-0 flex items-center"><div class="w-full border-t border-subtle"></div></div>
-        <div class="relative flex justify-center text-sm"><span class="bg-surface px-3 text-secondary">or</span></div>
-      </div>
+      <% if Studio.auth_method?(:google) %>
+        <% if email_signup %>
+          <div class="relative my-6">
+            <div class="absolute inset-0 flex items-center"><div class="w-full border-t border-subtle"></div></div>
+            <div class="relative flex justify-center text-sm"><span class="bg-surface px-3 text-secondary">or</span></div>
+          </div>
+        <% end %>
 
-      <%= button_to "/auth/google_oauth2", method: :post, data: { turbo: false },
-        class: "btn btn-google btn-lg w-full gap-3" do %>
-        <%= render "components/google_logo" %>
-        Sign up with Google
+        <%= button_to "/auth/google_oauth2", method: :post, data: { turbo: false },
+          class: "btn btn-google btn-lg w-full gap-3" do %>
+          <%= render "components/google_logo" %>
+          Sign up with Google
+        <% end %>
       <% end %>
 
       <p class="text-center text-secondary text-sm mt-6">

data/app/views/studio/site_footer/_assets.html.erb

@@ -1,26 +1,44 @@
-<%# The site footer's styles and its map mount. Rendered once per page, by
-    `studio_site_footer_assets` (the footer and the map partial both ask).
+<%# The site footer's styles. Rendered once per page, by
+    `studio_site_footer_assets`.
 
     SCOPED CSS, NOT UTILITIES. Everything the footer needs to lay out is here,
     reading the theme's custom properties with a fallback beside each, so it
-    renders the same in an app whose Tailwind build has never seen these views. %>
+    renders the same in an app whose Tailwind build has never seen these views.
+
+    NOTHING OF THE MAP. Its styles and its mount script are
+    studio/site_footer/_map_assets, which only studio/site_footer/_map renders,
+    so a footer with no address names no Leaflet anywhere on the page. %>
 <style>
   .ftr { --ftr-primary: var(--color-primary, #8b5cf6); --ftr-primary-rgb: var(--color-primary-500-rgb, 139 92 246);
     --ftr-line: var(--color-border, rgb(127 127 127 / .25)); --ftr-ink: var(--color-text, inherit);
+    --ftr-link-ink: var(--color-text-secondary, currentColor);
     background: var(--color-surface-alt, transparent); color: var(--color-text-body, inherit);
     border-top: 1px solid var(--ftr-line); }
-  .ftr a { transition: color .15s ease, opacity .15s ease; }
+  .ftr a { transition: color .15s ease; }
   .ftr-wrap { max-width: 72rem; margin-inline: auto; padding-inline: 1rem; }
-  .ftr-link { color: inherit; opacity: .78; text-decoration: none; }
+  /* LINK INK. A link is painted in --ftr-link-ink at FULL opacity, never the
+     inherited body colour faded: that read 4.5:1 or better only where the body
+     ink happened to be dark enough, and failed in light mode for a consumer
+     whose body ink is light. The default is the engine's --color-text-secondary,
+     which ThemeResolver derives to clear WCAG AA 4.5:1 on every surface in both
+     themes (--color-surface-alt, this band's background, among them). An app
+     that maps the theme tokens onto its own palette sets --color-text-secondary
+     to an ink that clears 4.5:1 on its --color-surface-alt, or sets
+     --ftr-link-ink on .ftr directly (docs/SITE_FOOTER.md, "Colours").
+     test/lib/site_footer_link_contrast_test.rb measures it. */
+  .ftr-link { color: var(--ftr-link-ink); text-decoration: none; }
   /* A label that is an address (an email address, a URL) stays on one line: a browser
      would otherwise wrap it after a hyphen or a slash. Its track is at least as
      wide as it is (the grid below), and the tracks beside it give way. It is
      broken only on a screen narrower than any phone, where no layout holds it. */
   .ftr-link-solid { white-space: nowrap; }
   @media (max-width: 299px) { .ftr-link-solid { white-space: normal; overflow-wrap: anywhere; } }
-  .ftr-link-disabled { opacity: .38; cursor: not-allowed; }
-  .ftr-link-plain { opacity: .78; }
-  .ftr-link:hover, .ftr-link:focus-visible { opacity: 1; color: var(--ftr-primary); }
+  /* A refused href renders its label as text, in the link ink. */
+  .ftr-link-plain { color: var(--ftr-link-ink); }
+  /* A disabled label ("Coming soon") is faded on purpose: WCAG exempts an
+     inactive control from the contrast minimum. */
+  .ftr-link-disabled { color: var(--ftr-link-ink); opacity: .38; cursor: not-allowed; }
+  .ftr-link:hover, .ftr-link:focus-visible { color: var(--ftr-primary); }
 
   /* Brand, then the link columns (.ftr-col), on a grid with explicit tracks.
        below 768px: the brand across the top, the link columns two to a row
@@ -78,155 +96,5 @@
   /* With no map between them, a rule separates the legal line from what is above. */
   .ftr-legal-ruled { border-top: 1px solid var(--ftr-line); }
 
-  /* The map. isolation keeps Leaflet's internal z-indexes (up to 1000) under
-     the pinned navbar and every modal. It reads the same properties outside
-     the footer, where .ftr has not set them. */
-  .ftr-map { position: relative; isolation: isolate; overflow: hidden;
-    background: rgb(var(--ftr-primary-rgb, var(--color-primary-500-rgb, 139 92 246)) / .08); }
-  /* One keyless basemap for both themes: in dark mode the light tiles are
-     inverted and pulled toward the site's violet rather than swapped. */
-  .dark .ftr-map .leaflet-tile-pane { filter: invert(1) hue-rotate(205deg) saturate(.55) brightness(.9) contrast(.92); }
-  .ftr-map-wide { width: 100%; height: clamp(16rem, 26vw, 26rem);
-    border-block: 1px solid var(--ftr-line, var(--color-border, rgb(127 127 127 / .25))); }
-  .ftr-map-fallback { position: absolute; inset: 0; display: flex; align-items: center; justify-content: center;
-    padding: 1rem; text-align: center; font-size: .85rem; color: inherit; }
-  /* Leaflet puts .leaflet-container on the [data-footer-map] element ITSELF, so
-     this is a compound selector, not a descendant one. It keeps the tint behind
-     the tiles (Leaflet's own is #ddd) and the page's font in the controls. */
-  .ftr-map.leaflet-container { background: rgb(var(--ftr-primary-rgb, var(--color-primary-500-rgb, 139 92 246)) / .08); font: inherit; }
-  .ftr-map .leaflet-control-attribution { font-size: 9px; background: rgb(0 0 0 / .45); color: #ddd; }
-  .ftr-map .leaflet-control-attribution a { color: #fff; }
-  .ftr-map .leaflet-bar a { background: var(--color-surface, #fff); color: var(--color-text, #111); border-color: rgb(127 127 127 / .3); }
-  .ftr-pin { position: relative; width: 18px; height: 18px; }
-  .ftr-pin::before, .ftr-pin::after { content: ""; position: absolute; inset: 0; border-radius: 9999px;
-    background: var(--ftr-primary, var(--color-primary, #8b5cf6)); }
-  .ftr-pin::before { animation: ftr-ping 2.2s cubic-bezier(0, 0, .2, 1) infinite; opacity: .6; }
-  .ftr-pin::after { border: 3px solid #fff; box-shadow: 0 2px 8px rgb(0 0 0 / .45); }
-  @keyframes ftr-ping { 75%, 100% { transform: scale(3.2); opacity: 0; } }
-  @media (prefers-reduced-motion: reduce) { .ftr-pin::before { animation: none; } .ftr a, .ftr-social { transition: none; } }
+  @media (prefers-reduced-motion: reduce) { .ftr a, .ftr-social { transition: none; } }
 </style>
-
-<script>
-  // Mounts a Leaflet map on every [data-footer-map]. Leaflet (script and
-  // stylesheet) is fetched once, on demand, from the URLs the element carries,
-  // so a page with no map pays nothing for it. The basemap follows the site
-  // theme in CSS (see .dark .leaflet-tile-pane above). Tiles are OpenStreetMap's
-  // keyless ones; a basemap that needs an API key does not belong in a gem.
-  //
-  // NOTHING STARTS BEFORE THE WINDOW'S `load`, AND NOTHING UNTIL THE MAP IS NEAR
-  // THE VIEWPORT. The tiles are a third party's, and a request that starts
-  // before `load` holds that event open for as long as the third party takes to
-  // answer. The map is also at the bottom of every public page, where most
-  // visits never reach: those pay for neither Leaflet nor a single tile.
-  //
-  // THE GUARD IS THE ENGINE'S OWN NAME, AND THE ELEMENTS ARE THE ENGINE'S OWN. An
-  // app that still renders a local footer script (mcritchie-studio, until it
-  // adopts this one) guards it with the unprefixed name and marks its map
-  // [data-footer-map] too. Sharing either would let whichever script ran first
-  // in a Turbo session stand the other down and then fail on its elements: that
-  // app's map carries no data-leaflet-js, so there is nothing here to fetch.
-  (function () {
-    if (window.__studioFooterMapsArmed) return;
-    window.__studioFooterMapsArmed = true;
-
-    var TILES = 'https://tile.openstreetmap.org/{z}/{x}/{y}.png';
-    var ATTRIBUTION = '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a>';
-    var maps = [];
-    var loading = null;
-
-    // Checked on every mount, not once: a page visit that rebuilds the head
-    // must not leave a mounted map without its stylesheet.
-    function ensureStylesheet(href) {
-      if (!href || document.querySelector('link[data-studio-leaflet]')) return;
-      var link = document.createElement('link');
-      link.rel = 'stylesheet';
-      link.href = href;
-      link.setAttribute('data-studio-leaflet', '');
-      document.head.appendChild(link);
-    }
-
-    function loadLeaflet(src) {
-      if (window.L) return Promise.resolve();
-      if (loading) return loading;
-      loading = new Promise(function (resolve, reject) {
-        var s = document.createElement('script');
-        s.src = src;
-        s.onload = resolve;
-        // A failed fetch must not be remembered: the next visit tries again.
-        s.onerror = function () { loading = null; s.remove(); reject(new Error('leaflet failed to load')); };
-        document.head.appendChild(s);
-      });
-      return loading;
-    }
-
-    function mount(el) {
-      if (el.__footerMap) return;
-      var at = [parseFloat(el.dataset.lat), parseFloat(el.dataset.lng)];
-      if (isNaN(at[0]) || isNaN(at[1])) return;
-      // NO ONE-FINGER DRAG ON A TOUCH DEVICE. The map runs edge to edge, so on a
-      // phone a swipe that starts on it would pan the map instead of scrolling
-      // the page, and there is no gutter to scroll by. With dragging off Leaflet
-      // leaves touch-action at pan-x pan-y: one finger scrolls the page, and a
-      // pinch still zooms the map (touchZoom stays on, and moves it under the
-      // fingers). The zoom buttons and the directions link do the rest.
-      var map = L.map(el, { center: at, zoom: parseInt(el.dataset.zoom, 10) || 15,
-                            scrollWheelZoom: false, attributionControl: true,
-                            dragging: !L.Browser.mobile, touchZoom: true,
-                            zoomControl: el.dataset.controls !== 'false' });
-      map.attributionControl.setPrefix(false);
-      L.tileLayer(TILES, { attribution: ATTRIBUTION, maxZoom: 19 }).addTo(map);
-      L.marker(at, { icon: L.divIcon({ className: '', html: '<div class="ftr-pin"></div>', iconSize: [18, 18], iconAnchor: [9, 9] }),
-                     keyboard: false }).addTo(map);
-      // Page scroll stays page scroll until the visitor commits to the map.
-      map.on('click', function () { map.scrollWheelZoom.enable(); });
-      map.on('mouseout', function () { map.scrollWheelZoom.disable(); });
-      var fallback = el.querySelector('.ftr-map-fallback');
-      if (fallback) { el.__footerFallback = fallback; fallback.remove(); }
-      el.__footerMap = map;
-      maps.push(el);
-    }
-
-    function fetchAndMount(el) {
-      ensureStylesheet(el.dataset.leafletCss);
-      loadLeaflet(el.dataset.leafletJs)
-        .then(function () { if (el.isConnected) mount(el); })
-        .catch(function () { /* the fallback link stays */ });
-    }
-
-    // One observer per map: it fires once, when the map comes within 400px of
-    // the viewport, and is then dropped.
-    function watch(el) {
-      if (el.__footerMap || el.__footerWatch) return;
-      if (typeof IntersectionObserver !== 'function') { fetchAndMount(el); return; }
-      var watcher = new IntersectionObserver(function (entries) {
-        if (!entries.some(function (entry) { return entry.isIntersecting; })) return;
-        watcher.disconnect();
-        el.__footerWatch = null;
-        fetchAndMount(el);
-      }, { rootMargin: '400px' });
-      el.__footerWatch = watcher;
-      watcher.observe(el);
-    }
-
-    function armAll() { document.querySelectorAll('[data-footer-map][data-leaflet-js]').forEach(watch); }
-
-    function armAfterLoad() {
-      if (document.readyState === 'complete') armAll();
-      else window.addEventListener('load', armAll, { once: true });
-    }
-
-    // A cached Turbo snapshot would restore Leaflet's DOM without its state, so
-    // the map is taken down and its fallback link put back before the snapshot.
-    document.addEventListener('turbo:before-cache', function () {
-      maps.forEach(function (el) {
-        var fallback = el.__footerFallback;
-        el.__footerMap.remove();
-        el.__footerMap = null;
-        if (fallback && !el.querySelector('.ftr-map-fallback')) el.appendChild(fallback);
-      });
-      maps = [];
-    });
-    document.addEventListener('turbo:load', armAfterLoad);
-    armAfterLoad();
-  })();
-</script>

data/app/views/studio/site_footer/_map.html.erb

@@ -1,12 +1,12 @@
 <%# One live map of an address. Leaflet mounts on this element (see
-    studio/site_footer/_assets, which this partial pulls in); until it does, and
-    if it never does, the link inside is the whole map: an address that opens
-    directions. `classes` and `style` size and shape it.
+    studio/site_footer/_map_assets, which this partial and nothing else pulls
+    in); until it does, and if it never does, the link inside is the whole map:
+    an address that opens directions. `classes` and `style` size and shape it.
 
     Leaflet's two files ride the engine's asset pipeline (studio/leaflet.js,
     studio/leaflet.css). Their URLs travel on the element, so the script fetches
     them only on a page that has a map. %>
-<%= studio_site_footer_assets %>
+<%= studio_footer_map_assets %>
 <div class="ftr-map <%= local_assigns[:classes] %>"
      <% if local_assigns[:style].present? %>style="<%= style %>"<% end %>
      data-footer-map