bible270 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8975632aa3e90165634356f25fc0c8cff2909e84b3177a58e192b16ee325b745
-  data.tar.gz: 543aa029054018c26f87d2d1836302ab671de51b70caa7a531ed0011a405f5e6
+  metadata.gz: bcb59bf731c08118644e9303ed749397492c6c7fea523a20cf4eb3c17b84281f
+  data.tar.gz: e1f6b1be1b245e859370ae745eb05f8adf47df953f89ad7cb28c700ad705830c
 SHA512:
-  metadata.gz: c76e854eb6449addef5b1deb2066d70cc6c51e8650817efa7c4fef8efa0d847d0b1e85c75d9faa91dde497495a01c980c674342148326f8c43f146a3321175d4
-  data.tar.gz: 80761d784e504c167954827dbe3e3e8193e571e91eee67b8bd9aa12b7990b9845020f20399c3367f63b41d441107fa15748e6e4199d327ce2588d1976a6227ca
+  metadata.gz: 312efc5cd9bfcb503430d1adc601b21a93658c9d378060182d3453b747d43674a736a83b753accaf0f0d738b0da005656c87490f17a51814800b3798632c09ab
+  data.tar.gz: c45129d6950f6b40f8bb0477b9de95ed9e98bb5ad3c1f9fa36bfb1b44eb5c1b26e337fc9d31e7dc9554115f2c4ecde14427127333bf2287925a0c0a33457b470

data/CHANGELOG.md

@@ -4,17 +4,43 @@ All notable changes to bible270. Format follows [Keep a Changelog](https://keepa
 
 ## Unreleased Changes
 
+### Changed
+
+- simplify day completion to one continuous server-confirmed dove flight from the lower center, eliminating the stagger between a pre-submit animation and the Turbo or HTML response
+
+**[Full Changelog](https://github.com/avonderluft/bible270/compare/v1.4.0...main)**
+
+## [1.4.0] - 2026-09-02
+
 ### Added
 
 - mark a newly completed day with a brief, translucent dove animation that begins immediately on the final checkoff in JavaScript-capable browsers and remains available after Turbo or HTML-fallback responses; it respects reduced-motion preferences, replaces the final generic success message, and never blocks interaction
 
+### Changed
+
+- refine the completion animation to 1.6 seconds with smoother easing, limit checkoff transitions to relevant visual properties, and make reduced-motion transitions effectively instantaneous
+
 ### Fixed
 
-- correct Day 27's New Testament reading to include Matthew 26:75
-- silently recover all Turbo interactions from stale sessions, retry once with a fresh CSRF token, and reload rather than submit with a known-stale token if refreshing fails
 - keep repeated or concurrent explicit checkoffs idempotent instead of raising a duplicate-validation Rails 422 error
 
-**[Full Changelog](https://github.com/avonderluft/bible270/compare/v1.3.0...main)**
+**[Full Changelog](https://github.com/avonderluft/bible270/compare/v1.3.2...v1.4.0)**
+
+## [1.3.2] - 2026-09-02
+
+### Fixed
+
+- silently recover all Turbo interactions from stale sessions, retry once with a fresh CSRF token, and reload rather than submit with a known-stale token if refreshing fails
+
+**[Full Changelog](https://github.com/avonderluft/bible270/compare/v1.3.1...v1.3.2)**
+
+## [1.3.1] - 2026-09-01
+
+### Fixed
+
+- correct Day 27's New Testament reading to include Matthew 26:75
+
+**[Full Changelog](https://github.com/avonderluft/bible270/compare/v1.3.0...v1.3.1)**
 
 ## [1.3.0] - 2026-08-29
 
@@ -596,6 +622,9 @@ This is the initial public release.
 
 * Email sign-in requires working Action Mailer delivery in the host application. Set `config.mailer_from`; delivery is inline by default, or set `email_sign_in_deliver_later` when a queue backend is available.
 
+[1.4.0]: https://github.com/avonderluft/bible270/releases/tag/v1.4.0
+[1.3.2]: https://github.com/avonderluft/bible270/releases/tag/v1.3.2
+[1.3.1]: https://github.com/avonderluft/bible270/releases/tag/v1.3.1
 [1.3.0]: https://github.com/avonderluft/bible270/releases/tag/v1.3.0
 [1.2.0]: https://github.com/avonderluft/bible270/releases/tag/v1.2.0
 [1.1.7]: https://github.com/avonderluft/bible270/releases/tag/v1.1.7

data/app/controllers/bible270/admin_controller.rb

@@ -20,12 +20,15 @@ module Bible270
     # ---- enrolment --------------------------------------------------------
 
     def update_enrollment
-      if params[:state] == 'closed'
+      case params[:state]
+      when 'closed'
         Setting.close_enrollment!
         redirect_to admin_path, notice: 'Closed to new readers. Existing readers can still sign in.'
-      else
+      when 'open'
         Setting.open_enrollment!
         redirect_to admin_path, notice: 'Open to new readers.'
+      else
+        redirect_to admin_path, alert: 'Choose whether enrollment is open or closed. Nothing was changed.'
       end
     end
 
@@ -122,12 +125,23 @@ module Bible270
       recipients = Reader.where.not(email: [nil, '']).order(:id)
       return redirect_to(admin_path, alert: 'Nobody has an email address.') if recipients.empty?
 
+      recipient_count = recipients.count
       sent = deliver_broadcast(recipients, subject, body)
+      later = Bible270.config.registration_notice_deliver_later
+
+      if sent.zero?
+        action = later ? 'queued' : 'sent'
+        return redirect_to admin_path, alert: "The message could not be #{action} to any readers."
+      end
+
       Setting.write(LAST_BROADCAST_AT, Time.current.iso8601)
       Setting.write(LAST_BROADCAST_SUBJECT, subject)
 
-      redirect_to admin_path,
-                  notice: "Sent to #{sent} #{'reader'.pluralize(sent)}."
+      action = later ? 'Queued for' : 'Sent to'
+      failures = recipient_count - sent
+      notice = "#{action} #{sent} #{'reader'.pluralize(sent)}."
+      notice += " #{failures} #{'reader'.pluralize(failures)} could not be #{later ? 'queued' : 'sent'}." if failures.positive?
+      redirect_to admin_path, notice: notice
     end
 
     def update_bible_version
@@ -169,9 +183,14 @@ module Bible270
           redirect_to admin_reader_path(@reader),
                       alert: "Couldn't read #{params[:start_date].inspect} as a date."
         end
-      elsif params[:day].present? && @reader.restart_on!(day: params[:day])
-        redirect_to admin_reader_path(@reader),
-                    notice: "#{@reader.display_name} is now on day #{params[:day]}."
+      elsif params[:day].present?
+        day = strict_integer(params[:day], 1..Plan::DAYS)
+        if day && @reader.restart_on!(day: day)
+          redirect_to admin_reader_path(@reader),
+                      notice: "#{@reader.display_name} is now on day #{day}."
+        else
+          redirect_to admin_reader_path(@reader), alert: 'Give a start date or a day between 1 and 270.'
+        end
       else
         redirect_to admin_reader_path(@reader), alert: 'Give a start date or a day between 1 and 270.'
       end
@@ -181,12 +200,15 @@ module Bible270
     # themselves on their own profile.
     def update_profile
       problems = []
-      if (params[:first_name].present? || params[:last_name].present?) && !@reader.update_names(params[:first_name],
-                                                                                                params[:last_name])
-        problems << 'both a first and last name'
-      end
-      if params[:avatar].present? && !@reader.attach_avatar(params[:avatar])
-        problems << (@reader.errors[:avatar].first || 'a valid image')
+      @reader.transaction do
+        if (params[:first_name].present? || params[:last_name].present?) && !@reader.update_names(params[:first_name],
+                                                                                                  params[:last_name])
+          problems << 'both a first and last name'
+        end
+        if problems.empty? && params[:avatar].present? && !@reader.attach_avatar(params[:avatar])
+          problems << (@reader.errors[:avatar].first || 'a valid image')
+        end
+        raise ActiveRecord::Rollback if problems.any?
       end
 
       if problems.empty?
@@ -220,22 +242,24 @@ module Bible270
     end
 
     def complete_through
-      day = params[:day].to_i
-      if @reader.mark_through!(day)
-        redirect_to admin_reader_path(@reader),
-                    notice: day.zero? ? 'All check-offs cleared.' : "Marked days 1-#{day} complete."
-      else
-        redirect_to admin_reader_path(@reader), alert: 'Give a day between 0 and 270.'
+      day = strict_integer(params[:day], 0..Plan::DAYS)
+      unless day
+        return redirect_to admin_reader_path(@reader), alert: 'Give a day between 0 and 270.'
       end
+
+      @reader.mark_through!(day)
+      redirect_to admin_reader_path(@reader),
+                  notice: day.zero? ? 'All check-offs cleared.' : "Marked days 1-#{day} complete."
     end
 
     def toggle_day
-      day = params[:day].to_i
-      if @reader.toggle_day!(day)
-        redirect_to admin_reader_path(@reader, anchor: "day-#{day}")
-      else
-        redirect_to admin_reader_path(@reader), alert: 'That day is outside the plan.'
+      day = strict_integer(params[:day], 1..Plan::DAYS)
+      unless day
+        return redirect_to admin_reader_path(@reader), alert: 'That day is outside the plan.'
       end
+
+      @reader.toggle_day!(day)
+      redirect_to admin_reader_path(@reader, anchor: "day-#{day}")
     end
 
     # Failures are counted rather than raised: one bad address must not stop the
@@ -282,16 +306,25 @@ module Bible270
 
     def load_comment
       @comment = Comment.find_by(id: params[:id])
-      redirect_to(admin_comments_path, alert: 'Reflection not found.') if @comment.nil?
+      return if @comment
+
+      redirect_to admin_comments_path, alert: 'Reflection not found.'
     end
 
     def redirect_back_to_comments(notice)
-      redirect_to(params[:return_to].presence || admin_comments_path, notice: notice)
+      redirect_to(url_from(params[:return_to]) || admin_comments_path, notice: notice)
     end
 
     def load_reader
       @reader = Reader.find_by(id: params[:id])
-      redirect_to(admin_path, alert: 'Reader not found.') if @reader.nil?
+      return if @reader
+
+      redirect_to admin_path, alert: 'Reader not found.'
+    end
+
+    def strict_integer(value, range)
+      integer = Integer(value.to_s, 10, exception: false)
+      integer if range.cover?(integer)
     end
   end
 end

data/app/views/bible270/days/show.html.erb

@@ -34,4 +34,3 @@
 </div>
 
 <%= render "bible270/shared/interaction_ui" %>
-<%= render "bible270/shared/day_completion_effect", day: @day %>

data/app/views/bible270/shared/_interaction_ui.html.erb

@@ -201,6 +201,9 @@
       }
     });
     document.addEventListener("turbo:load", reset);
+    document.addEventListener("animationend", (event) => {
+      if (event.target.matches("[data-b270-completion-dove]")) event.target.remove();
+    });
 
     window.Bible270InteractionUI = { reset };
     reset();

data/app/views/bible270/shared/_styles.html.erb

@@ -147,14 +147,14 @@
   .b270-day-complete strong{font-family:"Spectral",serif;font-size:16px}
   .b270-day-complete span{font-size:12px;color:var(--muted)}
   .b270 .b270-day-complete .b270-btn{flex:none;margin:0 0 0 auto}
-  .b270-completion-dove{position:fixed;z-index:1000;top:var(--b270-dove-origin-y,72vh);left:var(--b270-dove-origin-x,50vw);
+  .b270-completion-dove{position:fixed;z-index:1000;top:72vh;left:50vw;
                         width:min(75vw,97.5vh);height:auto;overflow:visible;pointer-events:none;opacity:0;
                         filter:drop-shadow(0 0 8px rgba(255,255,255,1)) drop-shadow(0 0 24px rgba(255,252,220,1)) drop-shadow(0 0 52px rgba(225,191,92,.82));
                         will-change:top,left,transform,opacity;animation:b270-dove-flight 1.6s cubic-bezier(.18,.72,.28,1) both}
   .b270-dove-silhouette{fill:url(#b270-dove-light);stroke:none}
   @keyframes b270-dove-flight{
-    0%{top:var(--b270-dove-origin-y,72vh);left:var(--b270-dove-origin-x,50vw);opacity:.22;visibility:visible;transform:translate(-50%,-50%) scale(.02) rotate(-8deg)}
-    8%{top:calc(var(--b270-dove-origin-y,72vh) - 10px);left:var(--b270-dove-origin-x,50vw);opacity:.78;transform:translate(-50%,-50%) scale(.08) rotate(-5deg)}
+    0%{top:72vh;left:50vw;opacity:.22;visibility:visible;transform:translate(-50%,-50%) scale(.02) rotate(-8deg)}
+    8%{top:calc(72vh - 10px);left:50vw;opacity:.78;transform:translate(-50%,-50%) scale(.08) rotate(-5deg)}
     64%{top:38vh;left:52vw;opacity:.92;transform:translate(-50%,-50%) scale(1) rotate(4deg)}
     99%{visibility:visible}
     100%{top:-25vh;left:115vw;opacity:0;visibility:hidden;transform:translate(-50%,-50%) scale(1.55) rotate(12deg)}

data/lib/bible270/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Bible270
-  VERSION = '1.4.0'
+  VERSION = '1.4.1'
 end

data/lib/generators/bible270/install/install_generator.rb

@@ -18,10 +18,12 @@ module Bible270
     #     --mailer-from=no-reply@example.org
     #
     class InstallGenerator < Rails::Generators::Base
-      MOUNT_LINE        = 'mount Bible270::Engine, at: Bible270.config.mount_at'
-      DEFAULT_MOUNT     = '/daily-bread'
-      DEFAULT_PROVIDERS = 'github'
-      KNOWN_PROVIDERS   = {
+      MOUNT_LINE          = 'mount Bible270::Engine, at: Bible270.config.mount_at'
+      MOUNT_LINE_PATTERN  = %r{^\s*mount\s*\(?\s*Bible270::Engine\b}
+      PROVIDER_IDENTIFIER = %r{\A[a-z][a-z0-9_]*\z}
+      DEFAULT_MOUNT       = '/daily-bread'
+      DEFAULT_PROVIDERS   = 'github'
+      KNOWN_PROVIDERS = {
         'github' => 'omniauth-github',
         'google_oauth2' => 'omniauth-google-oauth2',
         'facebook' => 'omniauth-facebook',
@@ -97,18 +99,23 @@ module Bible270
       def add_strategy_gems
         return if @providers.empty?
 
-        missing = @providers.filter_map { |p| KNOWN_PROVIDERS[p] }.reject { |g| gemfile_has?(g) }
-        unknown = @providers.reject { |p| KNOWN_PROVIDERS.key?(p) }
+        missing = @providers.filter_map { |provider| KNOWN_PROVIDERS[provider] }
+          .reject { |gem_name| gemfile_has?(gem_name) }
+        @unknown_providers = @providers.reject { |provider| KNOWN_PROVIDERS.key?(provider) }
+        @strategy_gems_added = missing.any?
 
         missing.each { |name| gem name }
 
-        return if unknown.empty?
+        return if @unknown_providers.empty?
 
-        say "  Unrecognised provider(s): #{unknown.join(', ')}. Add their strategy gems yourself.", :yellow
+        identifiers = @unknown_providers.map { |provider| provider.to_sym.inspect }.join(', ')
+        say "  Unrecognised provider(s): #{@unknown_providers.join(', ')}.", :yellow
+        say "  Add an OmniAuth strategy gem that registers #{identifiers} to the Gemfile, then run bundle install.",
+            :yellow
       end
 
       def install_bundle
-        return if @providers.empty?
+        return unless @strategy_gems_added
 
         @bundled = decide(:bundle, 'Run bundle install now (needed before the app can boot)?', true)
         run 'bundle install' if @bundled
@@ -121,7 +128,16 @@ module Bible270
       # rather than assuming a fresh app has it.
 
       def ensure_active_storage
-        return if skip_rails_commands?
+        if skip_rails_commands?
+          @active_storage = if !active_storage_enabled?
+                              :unavailable
+                            elsif active_storage_installed?
+                              :present
+                            else
+                              :pending
+                            end
+          return
+        end
 
         unless active_storage_enabled?
           @active_storage = :unavailable
@@ -153,11 +169,15 @@ module Bible270
       # Migrations run before the initializers are written, so a problem in the
       # generated config can never block the database work.
       def copy_migrations
-        return if skip_rails_commands?
+        if skip_rails_commands?
+          @migrations_copied = false
+          return
+        end
 
         say ''
         say 'Copying migrations into db/migrate', :yellow
         rails_command 'bible270:install:migrations'
+        @migrations_copied = true
       end
 
       def run_migrations
@@ -191,7 +211,11 @@ module Bible270
 
       def add_route
         if routes_mounted?
-          say "  config/routes.rb already mounts Bible270::Engine — left as is.#{cms_order_hint}", :yellow
+          if move_mount_above_catch_all
+            say '  config/routes.rb already mounted Bible270::Engine; moved it above the catch-all route.', :yellow
+          else
+            say "  config/routes.rb already mounts Bible270::Engine — left as is.#{cms_order_hint}", :yellow
+          end
           return
         end
 
@@ -202,7 +226,9 @@ module Bible270
         # across files, an unusual layout, a missing file). Verify rather than
         # assume, since a silent miss leaves the plan unreachable.
         if routes_mounted?
-          say "  Mounted in config/routes.rb.#{cms_order_hint}", :green
+          moved = move_mount_above_catch_all
+          detail = moved ? ' Mounted above the catch-all route.' : cms_order_hint
+          say "  Mounted in config/routes.rb.#{detail}", :green
         else
           @route_failed = true
           say '  Could not edit config/routes.rb automatically.', :red
@@ -220,7 +246,7 @@ module Bible270
         say "  Plan mounted at   #{@mount_at}"
         say "  Sign-in           #{auth_summary}"
         say "  Initializers      #{initializer_summary}"
-        say "  Migrations        #{@migrated ? 'copied and run' : 'copied (not yet run)'}"
+        say "  Migrations        #{migration_summary}"
         say "  Picture uploads   #{active_storage_summary}"
         say ''
 
@@ -241,16 +267,13 @@ module Bible270
       # bin/rails call fail ("Could not find ... in locally installed gems"), so
       # don't even try.
       def skip_rails_commands?
-        return false unless @providers.any? && @bundled == false
+        return false unless @strategy_gems_added && @bundled == false
         return true if @warned_unbundled
 
         @warned_unbundled = true
         say ''
         say '  Gemfile changed but not bundled, so bin/rails cannot run yet.', :yellow
-        say '  Skipping the migration steps — run these once you have bundled:', :yellow
-        say '    bundle install'
-        say '    bin/rails bible270:install:migrations'
-        say '    bin/rails db:migrate'
+        say '  Skipping Active Storage and migration commands until bundle install succeeds.', :yellow
         true
       end
 
@@ -320,10 +343,10 @@ module Bible270
 
       def ask_mailer_from
         default = "no-reply@#{app_domain}"
-        address = prompt('From: address for sign-in emails?', default)
+        address = options[:mailer_from] || prompt('From: address for sign-in emails?', default)
 
         until valid_email?(address)
-          say "  '#{address}' doesn't look like an email address.", :red
+          say "  #{address.inspect} doesn't look like an email address.", :red
           address = prompt('From: address for sign-in emails?', default)
         end
         address
@@ -352,7 +375,15 @@ module Bible270
       end
 
       def parse_providers(value)
-        value.to_s.split(',').map { |p| p.strip.downcase.tr('-', '_') }.reject(&:empty?).uniq
+        providers = value.to_s.split(',').map { |provider| provider.strip.downcase.tr('-', '_') }
+          .reject(&:empty?).uniq
+        invalid = providers.grep_v(PROVIDER_IDENTIFIER)
+        if invalid.any?
+          say "  Ignoring unsafe provider identifier(s): #{invalid.join(', ')}.", :red
+          say '  Provider names must start with a letter and contain only lowercase letters, numbers, and underscores.',
+              :red
+        end
+        providers - invalid
       end
 
       def app_domain
@@ -363,7 +394,11 @@ module Bible270
       end
 
       def providers_literal
-        @providers.map { |p| ":#{p}" }.join(', ')
+        @providers.map { |provider| provider.to_sym.inspect }.join(', ')
+      end
+
+      def ruby_literal(value)
+        value.to_s.dump
       end
 
       def auth_path_prefix
@@ -382,15 +417,40 @@ module Bible270
         path = File.join(destination_root, 'config', 'routes.rb')
         return '' unless File.exist?(path)
 
-        body = File.read(path)
-        return '' unless body.match?(%r{comfy_route|match\s+['"]\*|get\s+['"]\*})
+        lines = File.readlines(path)
+        mount_index = lines.index { |line| line.match?(MOUNT_LINE_PATTERN) }
+        catch_all_index = catch_all_route_index(lines)
+        return '' unless catch_all_index && (!mount_index || mount_index > catch_all_index)
 
-        ' Check the mount line sits ABOVE any catch-all route.'
+        ' Move the mount line ABOVE the catch-all route.'
+      end
+
+      def move_mount_above_catch_all
+        path = File.join(destination_root, 'config', 'routes.rb')
+        lines = File.readlines(path)
+        mount_index = lines.index { |line| line.match?(MOUNT_LINE_PATTERN) }
+        catch_all_index = catch_all_route_index(lines)
+        return false unless mount_index && catch_all_index && mount_index > catch_all_index
+
+        mount_line = lines.delete_at(mount_index)
+        lines.insert(catch_all_index, mount_line)
+        File.write(path, lines.join)
+        true
+      rescue StandardError
+        false
+      end
+
+      def catch_all_route_index(lines)
+        lines.index do |line|
+          code = line.sub(%r{#.*\z}, '')
+          code.match?(%r{\bcomfy_route\s+:cms\b.*\bpath:\s*['"]/['"]}) ||
+            code.match?(%r{\b(?:get|match)\s*\(?\s*['"]\*})
+        end
       end
 
       def routes_mounted?
         path = File.join(destination_root, 'config', 'routes.rb')
-        File.exist?(path) && File.read(path).include?('Bible270::Engine')
+        File.exist?(path) && File.foreach(path).any? { |line| line.match?(MOUNT_LINE_PATTERN) }
       end
 
       def report_auth_choice
@@ -434,17 +494,30 @@ module Bible270
         body.include?('path_prefix') && !body.include?('Bible270.config.auth_path_prefix')
       end
 
+      def migration_summary
+        if @migrations_copied
+          @migrated ? 'copied and run' : 'copied (not yet run)'
+        else
+          'not copied (not run)'
+        end
+      end
+
       def active_storage_summary
         case @active_storage
         when :installed then 'Active Storage installed'
         when :present then 'Active Storage already present'
         when :declined then 'off — Active Storage not installed'
         when :unavailable then 'off — Active Storage not enabled in this app'
+        when :pending then 'not installed — waiting for bundle install'
         else 'unchanged'
         end
       end
 
       def outstanding_steps
+        route_and_initializer_steps + installation_steps + provider_setup_steps + mailer_steps
+      end
+
+      def route_and_initializer_steps
         steps = []
         steps << "Add to config/routes.rb: #{MOUNT_LINE}" if @route_failed
         if @providers.any? && !initializer_present?('omniauth.rb')
@@ -453,22 +526,36 @@ module Bible270
         if stale_omniauth_prefix?
           steps << "config/initializers/omniauth.rb sets its own path_prefix — make it 'Bible270.config.auth_path_prefix'"
         end
-        steps << 'bundle install' if @providers.any? && !@bundled
-        steps << 'bin/rails bible270:install:migrations' if skip_rails_commands?
+        steps
+      end
+
+      def installation_steps
+        steps = []
+        steps << 'bundle install' if @strategy_gems_added && !@bundled
+        steps << unknown_provider_gem_step if @unknown_providers&.any?
+        steps << 'bin/rails active_storage:install' if @active_storage == :pending
+        steps << 'bin/rails bible270:install:migrations' unless @migrations_copied
         steps << 'bin/rails db:migrate' unless @migrated
         if @active_storage == :declined
           steps << 'bin/rails active_storage:install && bin/rails db:migrate — for picture uploads'
         end
+        steps
+      end
 
-        if @providers.any?
-          steps << 'Set each provider\'s client id/secret in credentials or ENV'
-          @providers.each { |p| steps << "Register callback URL: https://YOUR-HOST#{auth_path_prefix}/#{p}/callback" }
-        end
+      def unknown_provider_gem_step
+        providers = @unknown_providers.map { |provider| provider.to_sym.inspect }.join(', ')
+        "Add an OmniAuth strategy gem registering #{providers} to Gemfile, then run bundle install"
+      end
 
-        if @email
-          steps << 'Confirm Action Mailer can deliver mail in this environment'
-        end
-        steps
+      def provider_setup_steps
+        return [] if @providers.empty?
+
+        ['Set each provider\'s client id/secret in credentials or ENV'] +
+          @providers.map { |provider| "Register callback URL: https://YOUR-HOST#{auth_path_prefix}/#{provider}/callback" }
+      end
+
+      def mailer_steps
+        @email ? ['Confirm Action Mailer can deliver mail in this environment'] : []
       end
 
       # ---- file bodies ------------------------------------------------------
@@ -489,7 +576,7 @@ module Bible270
             # Change this one value to move the plan. config/routes.rb and
             # config/initializers/omniauth.rb both read it, so nothing else needs editing
             # (but do update the callback URLs registered with each OAuth provider).
-            config.mount_at = '#{@mount_at}'
+            config.mount_at = #{ruby_literal(@mount_at)}
 
             config.app_name = 'Daily Bread'
             config.tagline  = 'A 270-day journey through Scripture'
@@ -532,7 +619,7 @@ module Bible270
             # Passwordless email sign-in: a one-time link, no password, no third-party
             # account. This is what lets anyone take part. Needs Action Mailer delivery.
             config.email_sign_in = true
-            config.mailer_from   = '#{@mailer_from}'
+            config.mailer_from   = #{ruby_literal(@mailer_from)}
             config.email_sign_in_ask_name = true
             # config.email_sign_in_ttl = 20 * 60             # link lifetime, seconds
             # config.email_sign_in_max_per_window = 5        # per address, per window
@@ -607,11 +694,12 @@ module Bible270
       end
 
       def provider_line(provider)
+        provider_symbol = provider.to_sym.inspect
         env = provider.upcase
         <<~RUBY.chomp
-          provider :#{provider},
-                   Rails.application.credentials.dig(:#{provider}, :client_id) || ENV.fetch('#{env}_CLIENT_ID', nil),
-                   Rails.application.credentials.dig(:#{provider}, :client_secret) || ENV.fetch('#{env}_CLIENT_SECRET', nil)
+          provider #{provider_symbol},
+                   Rails.application.credentials.dig(#{provider_symbol}, :client_id) || ENV.fetch(#{ruby_literal("#{env}_CLIENT_ID")}, nil),
+                   Rails.application.credentials.dig(#{provider_symbol}, :client_secret) || ENV.fetch(#{ruby_literal("#{env}_CLIENT_SECRET")}, nil)
         RUBY
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bible270
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Andrew vonderLuft
@@ -139,7 +139,6 @@ files:
 - app/views/bible270/shared/_comment_drafts.html.erb
 - app/views/bible270/shared/_comment_notification_choices.html.erb
 - app/views/bible270/shared/_day_completion_dove.html.erb
-- app/views/bible270/shared/_day_completion_effect.html.erb
 - app/views/bible270/shared/_day_index.html.erb
 - app/views/bible270/shared/_footer.html.erb
 - app/views/bible270/shared/_grid_legend.html.erb

data/app/views/bible270/shared/_day_completion_effect.html.erb

@@ -1,67 +0,0 @@
-<%# locals: (day:) %>
-<template data-b270-completion-dove-template data-b270-day="<%= day %>">
-  <%= render "bible270/shared/day_completion_dove", day: day %>
-</template>
-<script nonce="<%= content_security_policy_nonce %>">
-  (() => {
-    if (window.Bible270DayCompletionEffect) return;
-
-    function willCompleteDay(form) {
-      const desiredState = form.querySelector("input[name='checked']");
-      if (!desiredState || desiredState.value !== "1") return false;
-
-      const unfinished = Array.from(
-        document.querySelectorAll("form[data-b270-checkoff='true'] input[name='checked'][value='1']")
-      );
-      return unfinished.length === 1 && unfinished[0].form === form;
-    }
-
-    function startDove(day) {
-      if (document.querySelector("[data-b270-completion-dove][data-b270-immediate]")) return;
-
-      const template = document.querySelector("[data-b270-completion-dove-template]");
-      if (!template || template.dataset.b270Day !== day) return;
-
-      const dove = template.content.querySelector("[data-b270-completion-dove]").cloneNode(true);
-      dove.dataset.b270Immediate = "true";
-      document.body.append(dove);
-    }
-
-    function removeServerDuplicate() {
-      const immediate = document.querySelector("[data-b270-completion-dove][data-b270-immediate]");
-      if (!immediate) return;
-
-      document.querySelectorAll("[data-b270-completion-dove]").forEach((dove) => {
-        if (dove !== immediate) dove.remove();
-      });
-    }
-
-    document.addEventListener("submit", (event) => {
-      const form = event.target.closest("form[data-b270-checkoff='true']");
-      const check = form && form.querySelector(".b270-check");
-      if (!check) return;
-
-      const bounds = check.getBoundingClientRect();
-      document.documentElement.style.setProperty(
-        "--b270-dove-origin-x",
-        `${bounds.left + bounds.width / 2}px`
-      );
-      document.documentElement.style.setProperty(
-        "--b270-dove-origin-y",
-        `${bounds.top + bounds.height / 2}px`
-      );
-
-      if (willCompleteDay(form)) startDove(form.action.match(/\/day\/(\d+)/)?.[1] || "");
-    });
-
-    document.addEventListener("animationend", (event) => {
-      if (event.target.matches("[data-b270-completion-dove]")) event.target.remove();
-    });
-
-    new MutationObserver(removeServerDuplicate).observe(document.documentElement, {
-      childList: true,
-      subtree: true
-    });
-    window.Bible270DayCompletionEffect = true;
-  })();
-</script>