bible270 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57c5245aba9c3d25d04ad67878802fc5d7ad712750dac55e85083e5d45080947
-  data.tar.gz: c9405dc4ac8ab2cb41d20d7c9a2f4ed4018fe814a7054f98494220da4468df47
+  metadata.gz: 7d1cc4a6173e82beae097bc870026ba3ae1ae0869a32f77efab2ea12fa1dbe2b
+  data.tar.gz: be16d337547c10478a9160bc9a7b229d1994f37305c0d68801564549a2c1bb78
 SHA512:
-  metadata.gz: b3a226ef874707b703845e48c496deb6b037b7714db29323241d337dcdd248e0c95fb2fe545171dd467790aa78b99bd8e304f010cca2b94e79dc659336445588
-  data.tar.gz: 8bcaf063952c4d82fff0d88ee06838bc599085eaaa37d69498aa3f7da0ce844ee81d05f7b4a08c7095d9835e013cfd2454057f88bb1d8bfc3fc8f2f2a7704533
+  metadata.gz: 16dafcc090a16f119b5ca9db84c362116c44375ef5e729ca8a915cbe0b6421fb0772847372392624cdaef22d45a39d52e1f33426b1d4ca082dd3d7cc16ad547f
+  data.tar.gz: c24039c41a16d88e2cfc6f400f6054ab552c8a2fb3669260e3dee1eaddf2fbcbb0745f8acd4693a7875f6c2c4b8a7b42d87978c5869cde0fb5e40ee16bdeae8f

data/CHANGELOG.md

@@ -1,16 +1,31 @@
 # Changelog
 
-All notable changes to bible270. Format follows [Keep a Changelog](https://keepachangelog.com/en/1.1.0/);
-this project uses [Semantic Versioning](https://semver.org/spec/v2.0.0.html), treating pre-1.0 minor bumps as the place breaking changes may land.
+All notable changes to bible270. Format follows [Keep a Changelog](https://keepachangelog.com/en/1.1.0/); this project uses [Semantic Versioning](https://semver.org/spec/v2.0.0.html), treating pre-1.0 minor bumps as the place breaking changes may land.
 
 ## Unreleased Changes
 
 See the changes since the last release:
 
-**[Full Changelog](https://github.com/avonderluft/bible270/compare/v0.11.0...main)**
+**[Full Changelog](https://github.com/avonderluft/bible270/compare/v0.12.0...main)**
+
+## [0.12.0] — 2026-07-29
+
+**[Full Changelog](https://github.com/avonderluft/bible270/compare/v0.11.0...v0.12.0)** 
+
+### Added
+
+- Readers can select their preferred Bible translation in profile edit view
+- Scripture links show bible version in parens
+
+### Changed
+
+- Top menu shows 'Progress' in place of user display name
+- Dependabot gem updates to minitest and rubocop
 
 ## [0.11.0] — 2026-07-28
- 
+
+**[Full Changelog](https://github.com/avonderluft/bible270/compare/v0.10.0...v0.11.0)** 
+
 ### Added
 
 - **Readers can edit their own name and picture** at `<mount>/profile`, linked from the nav. An admin
@@ -234,7 +249,8 @@ 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.
 
-[0.11.0]: https://github.com/avonderluft/bible270/releases/tag/v0.10.0
+[0.12.0]: https://github.com/avonderluft/bible270/releases/tag/v0.12.0
+[0.11.0]: https://github.com/avonderluft/bible270/releases/tag/v0.11.0
 [0.10.0]: https://github.com/avonderluft/bible270/releases/tag/v0.10.0
 [0.9.0]: https://github.com/avonderluft/bible270/releases/tag/v0.9.0
 [0.6.2]: https://github.com/avonderluft/bible270/releases/tag/v0.6.2

data/README.md

@@ -297,8 +297,8 @@ Bible270.configure do |config|
   config.tagline  = "A 270-day journey through Scripture"
   config.admin_emails = %w[andrew@example.org]
 
-  # config.start_date = nil       # community start date, or nil for undated
-  config.start_date = Date.new(2026, 9, 6)  
+  config.start_date = nil       # community start date, or nil for undated
+  # config.start_date = Date.new(2026, 9, 6)  
   config.allow_reader_start_date = true
 
   config.parent_controller = "ActionController::Base"   # or "::ApplicationController"
@@ -322,6 +322,42 @@ Bible270.configure do |config|
   }
 end
 ```
+### Footer
+ 
+The engine's pages end with a short note about how the plan works. Replace it with your own:
+ 
+```ruby
+config.footer_partial = 'shared/footer'      # a partial in your app
+config.footer_html    = '<p>&copy; 2026 …</p>'
+config.footer         = false                # no footer at all
+```
+ 
+By default yours replaces the engine's. To keep both:
+ 
+```ruby
+config.footer_placement = :after    # engine's note, then yours
+config.footer_placement = :before   # yours, then the engine's note
+config.footer_placement = :replace  # default
+```
+ 
+A partial is looked up in your app's view paths as well as the engine's, so `'shared/footer'` finds
+`app/views/shared/_footer.html.erb`. Keep it reasonably self-contained: engine controllers include
+the engine's helpers, not your app's, so a partial calling your own helpers needs
+`helper ::ApplicationHelper` adding to the engine's controller — or just inline the markup.
+ 
+### Favicon
+ 
+Pages under the mount point carry their own favicon — a rustic loaf, inlined as an SVG data URI, so
+there's nothing to add to your asset pipeline.
+ 
+```ruby
+config.favicon = nil                        # built-in loaf (default)
+config.favicon = '/icons/my-icon.svg'       # your own
+config.favicon = false                      # none; the host's favicon applies
+```
+ 
+It's emitted by the engine's layout, so if you point `config.layout` at your own layout, add
+`<%= b270_favicon_tag %>` to its `<head>`.
 
 References link to Bible Gateway by default — point `passage_url_builder` at your another reader if you wish, or your own reader if you host one.
 

data/app/controllers/bible270/admin_controller.rb

@@ -10,7 +10,7 @@ module Bible270
   class AdminController < ApplicationController
     before_action :require_admin!
     before_action :load_reader,
-                  only: %i[show destroy update_start update_name complete_through toggle_day]
+                  only: %i[show destroy update_start update_profile remove_avatar complete_through toggle_day]
     before_action :load_comment, only: %i[hide_comment unhide_comment destroy_comment]
 
     # ---- enrolment --------------------------------------------------------
@@ -95,14 +95,30 @@ module Bible270
       end
     end
 
-    def update_name
-      if @reader.update_names(params[:first_name], params[:last_name])
-        redirect_to admin_reader_path(@reader), notice: 'Name updated.'
+    # Name and picture together, mirroring what a reader can change about
+    # 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')
+      end
+
+      if problems.empty?
+        redirect_to admin_reader_path(@reader), notice: 'Updated.'
       else
-        redirect_to admin_reader_path(@reader), alert: 'Both a first and last name are needed.'
+        redirect_to admin_reader_path(@reader), alert: "Needs #{problems.to_sentence}."
       end
     end
 
+    def remove_avatar
+      @reader.remove_avatar!
+      redirect_to admin_reader_path(@reader), notice: "Removed #{@reader.display_name}'s picture."
+    end
+
     def complete_through
       day = params[:day].to_i
       if @reader.mark_through!(day)

data/app/helpers/bible270/plan_helper.rb

@@ -20,6 +20,46 @@ module Bible270
 
     # The signed-in reader's translation, falling back to the site default for
     # visitors who aren't signed in.
+    # Applies to every page the engine's layout renders, i.e. everything under
+    # the mount point. Pages rendered inside a host layout need this in that
+    # layout's <head> instead.
+    # The footer, from whichever source the host configured. A partial is looked
+    # up in the host's view paths as well as the engine's, so 'shared/footer'
+    # finds app/views/shared/_footer.html.erb.
+    # The footer, from whichever source the host configured. A partial is looked
+    # up in the host's view paths as well as the engine's, so 'shared/footer'
+    # finds app/views/shared/_footer.html.erb. config.footer_placement decides
+    # whether a custom footer replaces the engine's or sits alongside it.
+    def b270_footer
+      config = Bible270.config
+      return if config.footer_style == :none
+      return render('bible270/shared/footer') if config.footer_style == :default
+
+      parts = [b270_custom_footer]
+      if config.keep_default_footer?
+        default = render('bible270/shared/footer')
+        config.resolved_footer_placement == :after ? parts.unshift(default) : parts.push(default)
+      end
+
+      safe_join(parts)
+    end
+
+    def b270_custom_footer
+      case Bible270.config.footer_style
+      when :partial then render(Bible270.config.footer_partial)
+      when :html then content_tag(:footer, Bible270.config.footer_html.html_safe, class: 'b270-footer')
+      end
+    end
+
+    def b270_favicon_tag
+      favicon = Bible270.config.favicon
+      return if favicon == false
+
+      href = favicon.presence || Favicon.data_uri
+      type = href.start_with?('data:image/svg+xml', 'http') || href.end_with?('.svg') ? 'image/svg+xml' : nil
+      tag.link(rel: 'icon', type: type, href: href)
+    end
+
     def b270_bible_version
       current_reader&.effective_bible_version || Translations.resolve(nil)
     end

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

@@ -10,17 +10,37 @@
 </p>
 
 <div class="b270-panel">
-  <h2 class="b270-subhead">Name</h2>
-  <%= form_with url: admin_reader_name_path(@reader), method: :patch, class: "b270-emailform" do %>
+  <h2 class="b270-subhead">Name and picture</h2>
+  <%= form_with url: admin_reader_profile_path(@reader), method: :patch, class: "b270-emailform",
+                html: { multipart: true } do %>
+    <div class="b270-avatarrow">
+      <%= b270_avatar(@reader, size: 64) %>
+      <% if Bible270::Reader.avatar_uploads? %>
+        <label class="b270-field" style="flex:1">
+          <span>Picture</span>
+          <%= file_field_tag :avatar, accept: Bible270::Avatars.content_types.join(',') %>
+          <span class="b270-hint" style="margin:0">
+            PNG, JPEG, GIF or WebP, up to <%= Bible270::Avatars.human_size(Bible270::Avatars.max_bytes) %>.
+          </span>
+        </label>
+      <% end %>
+    </div>
+
     <label class="b270-field">
       <span>First name</span>
-      <%= text_field_tag :first_name, @reader.suggested_names[:first_name], required: true %>
+      <%= text_field_tag :first_name, @reader.suggested_names[:first_name] %>
     </label>
     <label class="b270-field">
       <span>Last name</span>
-      <%= text_field_tag :last_name, @reader.suggested_names[:last_name], required: true %>
+      <%= text_field_tag :last_name, @reader.suggested_names[:last_name] %>
     </label>
-    <%= submit_tag 'Save name', class: 'b270-btn' %>
+    <%= submit_tag 'Save', class: 'b270-btn' %>
+  <% end %>
+
+  <% if @reader.avatar_uploaded? %>
+    <%= button_to "Remove picture", admin_reader_avatar_path(@reader), method: :delete,
+          class: 'b270-linkbtn',
+          form: { data: { turbo_confirm: "Remove #{@reader.display_name}'s picture?" } } %>
   <% end %>
 </div>
 

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

@@ -23,7 +23,8 @@
       <% end %>
     </div>
     <p style="margin:16px 0 0">
-      <%= link_to "Continue reading — Day #{@start_day} →", day_path(@start_day), class: "b270-btn" %>
+      <% @day_verb = @start_day == 1 ? "Start" : "Continue" %>
+      <%= link_to "#{@day_verb} reading — Day #{@start_day} →", day_path(@start_day), class: "b270-btn" %>
       <% if @today_day && @today_day != @start_day %>
         <%= link_to "Go to today (Day #{@today_day})", day_path(@today_day), style: "margin-left:12px" %>
       <% end %>
@@ -41,9 +42,10 @@
 </div>
 
 <% if @readers.any? %>
-  <h2 class="b270-section-h">The community</h2>
+  <% rankings= @readers.count < 5 ? @readers.count : 5 %>
+  <h2 class="b270-section-h">Top <%= rankings %> reader leaders ...</h2>
   <div class="b270-list">
-    <% @readers.first(5).each_with_index do |r, i| %>
+    <% @readers.first(rankings).each_with_index do |r, i| %>
       <div class="b270-li">
         <span class="rank"><%= i + 1 %></span>
         <%= b270_avatar(r) %>

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

@@ -0,0 +1,3 @@
+<footer class="b270-footer">
+  The Old and New Testaments and are read once across the 270 days, with Psalms and Proverbs running alongside. Long chapters are divided so that daily readings are roughly equivalent in length.
+</footer>

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

@@ -151,7 +151,7 @@
   .b270-cell.complete{background:var(--teal);border-color:var(--teal);color:#eef3f2;font-weight:600}
   .b270-cell.now{box-shadow:0 0 0 2px var(--gold)}
 
-  .b270-footer{margin-top:40px;padding-top:22px;border-top:1px solid var(--line-soft);color:var(--faint);font-size:13px}
+  .b270-footer{margin-top:20px;padding-top:11px;border-top:1px solid var(--line-soft);color:var(--faint);font-size:13px}
   .b270-footer p{margin:0;line-height:1.5}
   details.b270-index summary{cursor:pointer;font-family:"Spectral",serif;font-size:18px;font-weight:600;list-style:none;margin-top:30px}
   details.b270-index summary::-webkit-details-marker{display:none}

data/app/views/layouts/bible270/application.html.erb

@@ -9,6 +9,7 @@
   <link rel="preconnect" href="https://fonts.googleapis.com">
   <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
   <link href="https://fonts.googleapis.com/css2?family=Spectral:ital,wght@0,400;0,500;0,600;1,400&family=Inter:wght@400;500;600&display=swap" rel="stylesheet">
+  <%= b270_favicon_tag %>
   <%= render "bible270/shared/styles" %>
   <%= yield :head %>
 </head>
@@ -20,12 +21,7 @@
     <%= yield %>
     <%# Pages with their own day grid opt out with content_for :hide_day_index %>
     <%= render 'bible270/shared/day_index' unless content_for?(:hide_day_index) %>
-    <footer class="b270-footer">
-      <p>The Old Testament and New Testament are each read once across the 270 days, with a
-         reading from all three tracks every day. Alongside them the Psalms run once and
-         Proverbs twice; the longest chapters are divided so the readings fill each day
-         evenly, and Psalm 119 comes in eleven sections.</p>
-    </footer>
+    <%= b270_footer %>
   </div>
 </body>
 </html>

data/config/routes.rb

@@ -15,7 +15,8 @@ Bible270::Engine.routes.draw do
   get    'admin',                        to: 'admin#index',            as: :admin
   get    'admin/readers/:id',            to: 'admin#show',             as: :admin_reader
   delete 'admin/readers/:id',            to: 'admin#destroy'
-  patch  'admin/readers/:id/name',       to: 'admin#update_name',      as: :admin_reader_name
+  patch  'admin/readers/:id/profile',    to: 'admin#update_profile',   as: :admin_reader_profile
+  delete 'admin/readers/:id/avatar',     to: 'admin#remove_avatar',    as: :admin_reader_avatar
   patch  'admin/readers/:id/start',      to: 'admin#update_start',     as: :admin_reader_start
   patch  'admin/readers/:id/through',    to: 'admin#complete_through', as: :admin_reader_through
   post   'admin/readers/:id/days/:day',  to: 'admin#toggle_day',       as: :admin_reader_day

data/lib/bible270/bible270.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require 'bible270/version'
+require 'bible270/plan'
+require 'bible270/email_sign_in'
+require 'bible270/names'
+require 'bible270/avatars'
+require 'bible270/translations'
+require 'bible270/favicon'
+require 'bible270/configuration'
+require 'bible270/engine' if defined?(Rails::Engine)
+
+module Bible270
+end

data/lib/bible270/configuration.rb

@@ -6,8 +6,10 @@
 # URI.encode_www_form_component produces byte-identical output to CGI.escape.
 require 'uri'
 require 'bible270/plan'
+require 'bible270/email_sign_in'
 require 'bible270/avatars'
 require 'bible270/translations'
+require 'bible270/favicon'
 
 module Bible270
   class Configuration
@@ -141,6 +143,59 @@ module Bible270
     # from the panel at runtime; setting this to false launches closed.
     attr_accessor :enrollment_open
 
+    # Favicon for the engine's pages. nil uses the built-in loaf, false renders
+    # no link tag at all (so the host's own favicon applies), and a string is
+    # used as the href — a path, a URL, or your own data URI.
+    # Footer for the engine's pages. Three ways to set it, and they're checked in
+    # this order:
+    #
+    #   config.footer_partial = 'shared/footer'   # a partial in your app
+    #   config.footer_html    = '<p>…</p>'        # raw HTML, marked safe
+    #   config.footer         = false             # no footer at all
+    #
+    # With none of them set you get the engine's own note about how the plan works.
+    # Rails adds the leading underscore when looking a partial up, so
+    # 'layouts/_bible270_footer' would search for '__bible270_footer' and raise
+    # MissingTemplate. Accept either spelling and normalise.
+    attr_reader :footer_partial
+
+    def footer_partial=(path)
+      @footer_partial =
+        if path.nil?
+          nil
+        else
+          segments = path.to_s.strip.split('/')
+          segments[-1] = segments[-1].sub(%r{\A_}, '') unless segments.empty?
+          segments.join('/')
+        end
+    end
+
+    # Where your footer goes relative to the engine's own: :replace (default),
+    # :after, or :before. Anything else is treated as :replace.
+    attr_accessor :footer_placement
+
+    PLACEMENTS = %i[replace after before].freeze
+
+    def resolved_footer_placement
+      placement = footer_placement.to_s.downcase.to_sym
+      PLACEMENTS.include?(placement) ? placement : :replace
+    end
+
+    # Whether the engine's own footer is shown alongside yours.
+    def keep_default_footer?
+      footer_style != :none && %i[after before].include?(resolved_footer_placement)
+    end
+
+    # :none, :partial, :html or :default.
+    def footer_style
+      # Plain Ruby, not present?: this file has to load without ActiveSupport.
+      return :none if footer == false
+      return :partial unless footer_partial.to_s.strip.empty?
+      return :html unless footer_html.to_s.strip.empty?
+
+      :default
+    end
+
     # Optional YAML file holding the same thing, re-read whenever it changes so
     # breaks can be tuned without restarting:
     #
@@ -206,7 +261,7 @@ module Bible270
     # Bible270::Translations::VERSIONS; narrow it to offer fewer.
     attr_accessor :bible_versions
 
-    attr_accessor :after_sign_out_path, :email_sign_in_max_per_window, :passage_url_builder, :tagline, :avatar_max_bytes, :chapter_breaks, :admin_emails, :admin_resolver, :bible_version
+    attr_accessor :after_sign_out_path, :email_sign_in_max_per_window, :passage_url_builder, :tagline, :footer_html, :footer, :favicon, :avatar_max_bytes, :chapter_breaks, :admin_emails, :admin_resolver, :bible_version
 
     # Public labels.
     attr_accessor :app_name
@@ -258,6 +313,11 @@ module Bible270
       @email_sign_in_require_name = true
       @email_sign_in_log_link = nil
       @enrollment_open = true
+      @footer_partial = nil
+      @footer_placement = :replace
+      @footer_html = nil
+      @footer = nil
+      @favicon = nil
       @avatar_max_bytes = Avatars::DEFAULT_MAX_BYTES
       @chapter_breaks = {}
       @chapter_breaks_path = nil

data/lib/bible270/favicon.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Bible270
+  # A favicon for the engine's own pages, inlined as a data URI.
+  #
+  # Inlined rather than served as an asset because the engine deliberately has no
+  # asset-pipeline dependency — its CSS is inlined the same way — so this works
+  # whether the host uses Propshaft, Sprockets or neither, and costs no request.
+  module Favicon
+    # A rustic loaf: a domed round on an ink board, with three slashed scores
+    # across the crust and a paler crumb showing at the base.
+    # Colours match the engine's palette (--ink, --gold, --paper).
+    SVG = <<~SVG
+      <svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 32 32'>
+        <rect width='32' height='32' rx='7' fill='%23231f18'/>
+        <path d='M4.5 21c0-6.2 5.1-10.5 11.5-10.5S27.5 14.8 27.5 21c0 1.4-1 2.4-2.4 2.4H6.9C5.5 23.4 4.5 22.4 4.5 21z'
+              fill='%23c6a24a'/>
+        <path d='M6.9 23.4h18.2c1.1 0 2-.6 2.3-1.5H4.6c.3.9 1.2 1.5 2.3 1.5z' fill='%23ece6da'/>
+        <g stroke='%23231f18' stroke-width='1.6' stroke-linecap='round' opacity='.75'>
+          <path d='M10.6 17.6l2.6-3'/>
+          <path d='M15 16.8l2.6-3'/>
+          <path d='M19.4 17.6l2.6-3'/>
+        </g>
+      </svg>
+    SVG
+
+  module_function
+
+    # Percent-encoding matters here: a raw '#' would truncate the URI at the
+    # fragment, and raw spaces are invalid in one.
+    def data_uri
+      compact = SVG.gsub(%r{\s+}, ' ').strip
+      "data:image/svg+xml,#{compact.gsub(' ', '%20')}"
+    end
+  end
+end

data/lib/bible270/version.rb

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

data/lib/bible270.rb

@@ -6,6 +6,7 @@ require 'bible270/email_sign_in'
 require 'bible270/names'
 require 'bible270/avatars'
 require 'bible270/translations'
+require 'bible270/favicon'
 require 'bible270/configuration'
 require 'bible270/engine' if defined?(Rails::Engine)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bible270
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Andrew vonderLuft
@@ -100,6 +100,7 @@ files:
 - app/views/bible270/readers/show.html.erb
 - app/views/bible270/sessions/new.html.erb
 - app/views/bible270/shared/_day_index.html.erb
+- app/views/bible270/shared/_footer.html.erb
 - app/views/bible270/shared/_header.html.erb
 - app/views/bible270/shared/_styles.html.erb
 - app/views/bible270/sign_in_mailer/magic_link.html.erb
@@ -116,9 +117,11 @@ files:
 - db/migrate/20260101000008_add_bible_version_to_bible270_readers.rb
 - lib/bible270.rb
 - lib/bible270/avatars.rb
+- lib/bible270/bible270.rb
 - lib/bible270/configuration.rb
 - lib/bible270/email_sign_in.rb
 - lib/bible270/engine.rb
+- lib/bible270/favicon.rb
 - lib/bible270/names.rb
 - lib/bible270/plan.rb
 - lib/bible270/translations.rb