wordmark 0.21.0 → 0.23.0

data/lib/wordmark/engine.rb

@@ -2,52 +2,46 @@
 require 'rails'
 
 module Wordmark
-  # Hooks the gem into a host app: serves its files, its error pages and its helpers.
+  # Hooks the gem into a host app: serves its files, its error pages and its helpers. The easy
+  # design system's stylesheets, scripts, fonts and icons are under `app/assets`, which the
+  # host's asset pipeline reads as its own: `stylesheet_link_tag "easy/tokens"`.
   class Engine < ::Rails::Engine
     # The folders the design site publishes, served from this gem at the same paths so a
-    # page on an app and a page on the site link one file — this version's copy under its
-    # own prefix among them. Each keeps its slash: `Rack::Static` matches on `start_with?`,
-    # and `/page` would swallow `/pages` itself.
-    PREFIXES = %W[/css/ /js/ /theme/ /font/ /logo/ /favicon/ /page/ /v#{VERSION}/].freeze
+    # page on an app and a page on the site link one file. Each keeps its slash:
+    # `Rack::Static` matches on `start_with?`, and `/page` would swallow `/pages` itself.
+    PREFIXES = %w[/css/ /js/ /theme/ /font/ /logo/ /favicon/ /page/].freeze
 
-    # An unversioned file is asked for again on every full load and answered `304 Not
-    # Modified` while it stands, since its URL never changes between versions. A font, whose
-    # name carries a hash of its bytes, and anything under this version's prefix never change
-    # at all, so a browser may keep them for good.
+    # A file is asked for again on every full load and answered `304 Not Modified` while it
+    # stands, since its URL never changes between versions. A font, whose name carries a hash
+    # of its bytes, never changes at all, so a browser may keep it for good.
     HEADERS = [
       [:all, { 'cache-control' => 'no-cache' }],
       ['/font/', { 'cache-control' => 'public, max-age=31536000, immutable' }],
-      ['/v', { 'cache-control' => 'public, max-age=31536000, immutable' }],
     ].freeze
 
-    # What a file is kept for while the gem is being worked on: not at all, since the
-    # version's copy is rewritten under the same name until it is released, and a browser
-    # told to keep it for a year would show yesterday's stylesheet on today's page.
-    DEVELOPMENT_HEADERS = HEADERS.first 1
-
     # Before `Rails::Rack::Logger`, so fetching a stylesheet writes no `Started GET` line, and
     # cascading, so a host route under one of these prefixes still answers.
     initializer 'wordmark.assets' do |app|
-      headers = Rails.env.development? ? DEVELOPMENT_HEADERS : HEADERS
       app.middleware.insert_before Rails::Rack::Logger, Rack::Static,
                                    urls: PREFIXES, root: Engine.root.join('public').to_s,
-                                   header_rules: headers, cascade: true
-    end
-
-    # The branded error pages, read by status from `public/page` the way Rails reads a host's
-    # own `public/`, unless the host has already named an app of its own.
-    initializer 'wordmark.exceptions' do |app|
-      app.config.exceptions_app ||=
-        ActionDispatch::PublicExceptions.new Engine.root.join('public/page').to_s
+                                   header_rules: HEADERS, cascade: true
     end
 
-    # The page a host shows while it is down, at the path Heroku and a reader expect.
-    initializer 'wordmark.down' do |app|
-      app.middleware.insert_before Rails::Rack::Logger, Down
+    # The same page for 400, 404, 422 and 500 on every app (Wordmark::ErrorsController), unless
+    # the host has already named an exceptions app of its own, and the page it shows while it
+    # is down at the path Heroku and a reader expect.
+    initializer 'wordmark.errors' do |app|
+      app.config.exceptions_app ||= app.routes
+      app.routes.prepend do
+        %w[400 404 422 500].each do |status|
+          get status, to: 'wordmark/errors#show', defaults: { status: status.to_i }
+        end
+        get 'down.html', to: 'wordmark/errors#down', format: false
+      end
     end
 
     initializer 'wordmark.helpers' do
-      ActiveSupport.on_load(:action_view) { include Wordmark::Helpers }
+      ActiveSupport.on_load(:action_view) { include Wordmark::Helpers, Wordmark::EasyHelper }
     end
   end
 end

data/lib/wordmark/helpers/heads.rb

@@ -8,8 +8,8 @@ module Wordmark
 
       # The stylesheet and the script every page needs, and the icons `app` is known by —
       # this app unless said, since a page a customer reads may wear the house's mark rather
-      # than the app's. Both files at this version's own path, which never changes and so is
-      # kept for a year. A page refresh Turbo is sent morphs the page in place and keeps the
+      # than the app's. Both files at a path no release changes, asked for again on every
+      # full load. A page refresh Turbo is sent morphs the page in place and keeps the
       # scroll, so an answer landing in a thread leaves the reader where they were.
       def easyfaa_head_tags(app = Wordmark.app)
         safe_join [
@@ -33,12 +33,12 @@ module Wordmark
         ], INDENT
       end
 
-      # The house's own two files, for a page that already links bh's. At this version's own
-      # path, which never changes and so is kept for a year.
+      # The house's own two files, for a page that already links bh's. At the same
+      # path in every release, so a browser asks again on a full load and is answered 304.
       def easyfaa_tags
         safe_join [
-          tag.link(rel: 'stylesheet', href: "/v#{VERSION}/css/easyfaa.css"),
-          tag.script('', type: 'module', src: "/v#{VERSION}/js/easyfaa.js"),
+          tag.link(rel: 'stylesheet', href: '/css/easyfaa.css'),
+          tag.script('', type: 'module', src: '/js/easyfaa.js'),
         ], INDENT
       end
 

data/lib/wordmark/marks.rb

@@ -4,13 +4,23 @@ module Wordmark
   # and reaches IBM Plex Sans's ascender. Every drawing is a different shape inside its 512
   # grid, so equal sizes never align; these do. The house's own is the one exception: 0.8em
   # and dropped 0.16em, so the horizon centres on the lowercase rather than standing on it.
+  # A wide, short mark (blackbox, dataplate, wordmark) is held to about 50px, or
+  # reaching the ascender would make it twice as wide as its neighbours.
   MARKS = {
-    autopilot: [46.36, 5.42],
+    blackbox: [50.00, 8.40],
     cube: [38.96, 1.72],
+    data: [41.71, 3.10],
+    dataplate: [50.00, 8.40],
     design: [50.47, 8.94],
+    drive: [41.84, 2.45],
     easyfaa: [38.4, 7.68],
-    fountain: [39.54, 2.01],
-    goldrush: [49.50, 11.02],
-    houston: [39.73, 2.11],
+    hangar: [41.71, 3.10],
+    lens: [45.02, 4.75],
+    mirroring: [38.86, 1.67],
+    refinery: [43.30, 3.21],
+    rollaway: [40.24, 1.73],
+    stockroom: [38.86, 1.67],
+    tower: [38.86, 1.67],
+    wordmark: [50.00, 12.40],
   }.freeze
 end

data/lib/wordmark/version.rb

@@ -1,4 +1,4 @@
 module Wordmark
   # Version of the gem, read by the gemspec and by hosts checking compatibility.
-  VERSION = '0.21.0'
+  VERSION = '0.23.0'
 end

data/lib/wordmark.rb

@@ -1,15 +1,20 @@
 require 'bh'
+require 'active_support/core_ext/module/attribute_accessors'
 require_relative 'wordmark/version'
 require_relative 'wordmark/marks'
 require_relative 'wordmark/copy'
-require_relative 'wordmark/down'
 require_relative 'wordmark/helpers'
 require_relative 'wordmark/engine'
 
-# easyfaa's front end: the stylesheet and script every page loads — bh's Bootstrap 6
-# with the house's own layer over it — the marks every app is known by, and the helpers that
-# draw a head, a logo or a signup page the same way everywhere.
+# easyFAA's front end: the easy design system every app's pages are drawn with (its layout,
+# stylesheets, scripts, fonts, icons and partials), the error pages every app shows, the marks
+# every app is known by, and the helpers that draw them the same way everywhere.
 module Wordmark
+  # The site an error page names, in its title, its one link and the maintenance message, as
+  # `[name, url]` for the request: an app that is not easyFAA's own names itself,
+  # `Wordmark.site = ->(request) { ['easyAnnual', 'https://easyannual.com/'] }`.
+  mattr_accessor :site, default: ->(_request) { ['easyFAA', 'https://easyfaa.com/'] }
+
   # The form every easyfaa page is written with, which is bh's: the house dresses no
   # field differently, so this name and `Bh::FormBuilder` are one builder.
   FormBuilder = Bh::FormBuilder
@@ -19,8 +24,8 @@ module Wordmark
   Message = Bh::Message
 
   # Which of the family this host is, read off the Rails application's own name — the
-  # `Goldrush` of `Goldrush::Application` — and the house itself for any app not in `MARKS`.
-  # What a tab wears, what a logo says and whose page answers `/down.html`.
+  # `Tower` of `Tower::Application` — and the house itself for any app not in `MARKS`.
+  # What a tab wears and what a logo says.
   def self.app
     name = Rails.application.class.module_parent_name.downcase.to_sym
     MARKS.key?(name) ? name : :easyfaa

data/public/_headers

@@ -1,11 +1,11 @@
 # A page on another origin loads the script as a module and the stylesheet's font across
-# origins, both of which the browser refuses without this. Cloudflare Pages adds no CORS.
+# origins, both of which the browser refuses without this. Cloudflare adds no CORS.
 /*
   Access-Control-Allow-Origin: *
 
 # An unversioned file follows the latest release, so a browser asks for it again on every
-# load and is answered 304 while it stands. Pages would otherwise let one be kept for four
-# hours, and a page drawn against a new bundle would run the old one until they were up.
+# load and is answered 304 while it stands, so a page drawn against a new bundle never runs
+# the old one.
 /css/*
   Cache-Control: public, max-age=0, must-revalidate
 /js/*
@@ -17,12 +17,8 @@
 /page/*
   Cache-Control: public, max-age=0, must-revalidate
 
-# A versioned copy never changes, so a browser may keep it for a year and the edge for good.
-/v*
-  Cache-Control: public, max-age=31536000, immutable
-
 # A font's name carries a hash of its bytes, so a browser may keep it for good; everything
-# else keeps Pages' default, which is to revalidate on every load and answer 304 while it
+# else keeps Cloudflare's default, which is to revalidate on every load and answer 304 while it
 # stands, so the URL of a file never has to change between versions.
 /font/*
   Cache-Control: public, max-age=31536000, immutable