bible270 0.15.1 → 0.15.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0d1b963495f4293f7e9c2a2bfdd6e6bf22c70d632ee6c233f7a977c2e46e124
-  data.tar.gz: 5ef68e1d13d4e475a674bea5301ba2eed3e7054b1acb29a8cabce68700bf3870
+  metadata.gz: 3bac102109d922307b87047b9151aa16354f5aacbfa1829a1419ca3bd02dc251
+  data.tar.gz: 825c3e6d6da35d724ea0cb7ece96244ac8555251c4c8b2165492139f49c7c4d1
 SHA512:
-  metadata.gz: 55d02aad22edc399886cd67823b186414f1f989e5b672213bfa201445b10feeefdc94350be403689a3d57fa68f7acdcb42258a01f162d5fd71fc1514e292c2ea
-  data.tar.gz: f6fe740f3208ed91c46e129133cdf533095a121ed76b74c2dc303f5aa5af440dcd14a3b10d7b55a40ac1577387898bc146459de8ee1dea7c928cbbfe61199f81
+  metadata.gz: 54bb44c5d582ad4f4795a68a09d1facd54a0c4b8a77890ed0fb900c7d357ece4cb4e0656570c4bb15241fbb6cf9c6ef161f4a3d11962dd706aa41f03241b1f98
+  data.tar.gz: 961462928a89a8d3b060a4101996851115f2b8d479567a3741c3613f83823e7a78225113af1c82f1fc125d04101b93a5ee2ac2b2c554909fef1e6d859151e050

data/CHANGELOG.md

@@ -6,7 +6,49 @@ All notable changes to bible270. Format follows [Keep a Changelog](https://keepa
 
 See the changes since the last release:
 
-**[Full Changelog](https://github.com/avonderluft/bible270/compare/v0.15.0...main)**
+**[Full Changelog](https://github.com/avonderluft/bible270/compare/v0.15.3...main)**
+
+## [0.15.3] - 2026-08-04
+
+**[Full Changelog](https://github.com/avonderluft/bible270/compare/v0.15.2...v0.15.2)**
+
+### Added
+
+- `Bible270::Checkoff.reset_column_information` to migrations to prevent `UnknownAttributeError` during backfills.
+- more tests (reader identity, sign-ins, and token management) to increase coverage to > 93%
+
+### Changed
+
+- 'Today' now derived from system time, not UTC
+
+## [0.15.2] - 2026-08-04
+
+**[Full Changelog](https://github.com/avonderluft/bible270/compare/v0.15.1...v0.15.2)**
+
+### Added 
+
+- app icon to shared header partial
+
+### Changed
+
+- consistent reader sort order by first name in 'People' and 'Admin'
+
+## [0.15.1] - 2026-08-03
+
+**[Full Changelog](https://github.com/avonderluft/bible270/compare/v0.15.0...v0.15.1)**
+
+### Added
+
+- CSV file with versification by day
+
+### Changed
+
+- refactor 'progress' and 'reflections' into partials to be more DRY
+- update Coverage badge to be less cached
+
+### Removed
+
+- old zip file of tests
 
 ## [0.15.0] - 2026-08-02
 
@@ -317,6 +359,12 @@ 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.15.3]: https://github.com/avonderluft/bible270/releases/tag/v0.15.3
+[0.15.2]: https://github.com/avonderluft/bible270/releases/tag/v0.15.2
+[0.15.1]: https://github.com/avonderluft/bible270/releases/tag/v0.15.1
+[0.15.0]: https://github.com/avonderluft/bible270/releases/tag/v0.15.0
+[0.14.1]: https://github.com/avonderluft/bible270/releases/tag/v0.14.1
+[0.14.0]: https://github.com/avonderluft/bible270/releases/tag/v0.14.0
 [0.13.1]: https://github.com/avonderluft/bible270/releases/tag/v0.13.1
 [0.13.0]: https://github.com/avonderluft/bible270/releases/tag/v0.13.0
 [0.12.0]: https://github.com/avonderluft/bible270/releases/tag/v0.12.0

data/README.md

@@ -14,7 +14,7 @@ Three readings a day, sized by **verse count** so each day takes roughly the sam
 - **New Testament** — once through, a reading every day. 260 chapters over 270 days, long chapters are divided to even out the daily reading
 - **Psalms & Proverbs** — once each, interleaved in one track. 181 chapters have to cover 270 days, so some are divided, shared between the two books by verse load. **A psalm of 25 verses or fewer is never divided**, keeping 131 of the 150 whole; longer psalms and Proverbs chapters break at their turns of thought (see `CHAPTER_BREAKS`). **Psalm 119 is 11 sections of 16 verses** — two of its eight-verse acrostic stanzas each. Proverbs lands on 89 days, near its proportional share. **A divided chapter is always read on consecutive days**, so nothing is inserted between the parts of a split psalm.
 
-Genesis → Malachi and Revelation 22 both land on day 270, as does the second Proverbs 31 — the first falls on day 135, the midpoint. Psalm 150 comes in on day 269. Every day carries all three tracks. A typical day is ~119 verses (range 76–175).
+Genesis → Malachi and Revelation 22 both land on day 270, as does the second part of Proverbs 31.  Every day carries all three tracks. A typical day is ~119 verses (range 76–175).
 
 The schedule is pure deterministic Ruby (`Bible270::Plan`) — none of it is stored. Portions come from per-chapter verse counts in `Bible270::Versification`. The DB only holds readers, check-offs, comments, and sign-in tokens.
 

data/app/controllers/bible270/readers_controller.rb

@@ -7,7 +7,8 @@ module Bible270
       counts = Checkoff.group(:reader_id, :day).count
       @days_completed = Hash.new(0)
       counts.each { |(rid, day), n| @days_completed[rid] += 1 if n >= Plan.total_parts(day) }
-      @readers.sort_by! { |r| [-@days_completed[r.id], r.display_name.to_s] }
+      # Progress first, then by name — the same name ordering the admin list uses.
+      @readers.sort_by! { |r| [-@days_completed[r.id], r.sort_name] }
     end
 
     # The reader's own progress. Deliberately open to visitors: the panel shows an

data/app/helpers/bible270/plan_helper.rb

@@ -51,6 +51,19 @@ module Bible270
       end
     end
 
+    # The mark beside the title in the header. Larger than the favicon and inlined
+    # as SVG, so it stays crisp at any size and needs no asset pipeline.
+    def b270_mark(size: 38)
+      configured = Bible270.config.header_mark
+      return nil if configured == false
+
+      if configured.is_a?(String) && configured.present?
+        return image_tag(configured, width: size, height: size, alt: '', class: 'b270-mark')
+      end
+
+      content_tag :span, Favicon.inline_svg(size: size).html_safe, class: 'b270-mark'
+    end
+
     def b270_favicon_tag
       favicon = Bible270.config.favicon
       return if favicon == false

data/app/models/bible270/reader.rb

@@ -136,8 +136,12 @@ module Bible270
       update(bible_version: Translations.normalize(code))
     end
 
+    # Readers are listed by first name, matching how they are shown — the display
+    # name is "First Last", so sorting on it needs only case folding. Surname
+    # order was inconsistent with the community page and read oddly next to names
+    # displayed first-name-first.
     def sort_name
-      [last_name, first_name].map { |n| n.to_s.strip.downcase }.join(' ').strip.presence || display_name.to_s.downcase
+      display_name.to_s.strip.downcase
     end
 
     # ---- staying signed in -------------------------------------------------
@@ -344,7 +348,7 @@ module Bible270
 
     # Put this reader on `day` as of `on` — i.e. back-date the start so that the
     # given date lands on the given day of the plan.
-    def restart_on!(day:, on: Date.current)
+    def restart_on!(day:, on: Bible270.today)
       day = day.to_i
       return false unless Plan.valid_day?(day)
 
@@ -402,7 +406,7 @@ module Bible270
 
     # The plan day that today corresponds to (clamped into range), or nil when undated.
     def calendar_day
-      Plan.day_for(Date.current, effective_start_date)
+      Plan.day_for(Bible270.today, effective_start_date)
     end
 
     # Raw, unclamped — lets callers distinguish "not started yet" / "finished".
@@ -421,15 +425,15 @@ module Bible270
     end
 
     def raw_calendar_day
-      Plan.day_for(Date.current, effective_start_date, clamp: false)
+      Plan.day_for(Bible270.today, effective_start_date, clamp: false)
     end
 
     def not_started_yet?
-      Plan.before_start?(Date.current, effective_start_date)
+      Plan.before_start?(Bible270.today, effective_start_date)
     end
 
     def past_end_date?
-      Plan.after_end?(Date.current, effective_start_date)
+      Plan.after_end?(Bible270.today, effective_start_date)
     end
 
     def plan_end_date
@@ -488,7 +492,7 @@ module Bible270
       return if started_on.present?
       return if config.start_date.present?
 
-      update!(started_on: Date.current)
+      update!(started_on: Bible270.today)
     end
   end
 end

data/app/models/bible270/sign_in_token.rb

@@ -54,9 +54,15 @@ module Bible270
 
     # Too many outstanding requests for one address in the window.
     def self.rate_limited?(address)
+      # Normalised, because issue! stores a normalised address: querying the raw
+      # one let 'Eager@example.org' and 'eager@example.org' each have their own
+      # allowance, so varying the case bypassed the limit entirely.
+      email = EmailSignIn.normalize_email(address)
+      return false if email.nil?
+
       window = Bible270.config.email_sign_in_window
       max    = Bible270.config.email_sign_in_max_per_window
-      where(email: address).where(created_at: (Time.current - window)..).count >= max
+      where(email: email).where(created_at: (Time.current - window)..).count >= max
     end
 
     # Housekeeping: drop spent and stale rows. Safe to run from a cron/rake task.

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

@@ -8,7 +8,7 @@
       <% end %>
       · finishes <%= reader.plan_end_date.strftime("%B %-d, %Y") %>
       <% if reader.not_started_yet? %>
-        · <em>begins in <%= (reader.effective_start_date - Date.current).to_i %> days</em>
+        · <em>begins in <%= (reader.effective_start_date - Bible270.today).to_i %> days</em>
       <% elsif reader.past_end_date? %>
         · <em>the 270 days have elapsed</em>
       <% elsif (off = reader.days_off_pace) %>

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

@@ -1,7 +1,12 @@
 <header class="b270-topbar">
   <div class="b270-brand">
-    <%= link_to Bible270.config.app_name, root_path, class: "b270-title" %>
-    <span class="b270-tagline"><%= Bible270.config.tagline %></span>
+    <%= link_to root_path, class: "b270-brandlink" do %>
+      <%= b270_mark %>
+      <span class="b270-brandtext">
+        <span class="b270-title"><%= Bible270.config.app_name %></span>
+        <span class="b270-tagline"><%= Bible270.config.tagline %></span>
+      </span>
+    <% end %>
   </div>
   <nav class="b270-nav">
     <%= link_to "Plan", root_path %>

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

@@ -14,7 +14,12 @@
   .b270-wrap{max-width:820px;margin:0 auto;padding:clamp(14px,3.5vw,36px) clamp(14px,4vw,40px) 64px}
 
   .b270-topbar{display:flex;align-items:center;gap:16px;flex-wrap:wrap;padding-bottom:20px;border-bottom:1px solid var(--line-soft);margin-bottom:26px}
-  .b270-brand{display:flex;flex-direction:column;margin-right:auto}
+  .b270-brand{display:flex;margin-right:auto}
+  /* The whole brand is one link, so the mark and the words highlight together. */
+  .b270-brandlink{display:flex;align-items:center;gap:12px;text-decoration:none}
+  .b270-brandtext{display:flex;flex-direction:column}
+  .b270-mark{display:flex;align-items:center;flex:none;line-height:0}
+  .b270-mark svg,.b270-mark img{display:block;border-radius:8px}
   .b270-title{font-family:"Spectral",Georgia,serif;font-weight:600;font-size:22px;text-decoration:none}
   .b270-tagline{font-size:12px;color:var(--faint);letter-spacing:.04em}
   .b270-nav{display:flex;align-items:center;gap:16px;font-size:14px}

data/db/migrate/20260101000009_add_part_to_bible270_checkoffs.rb

@@ -12,6 +12,11 @@ class AddPartToBible270Checkoffs < ActiveRecord::Migration[7.0]
     add_index :bible270_checkoffs, %i[reader_id day track part], unique: true,
                                    name: 'idx_b270_checkoffs_part_unique'
 
+    # The backfill goes through the model, which caches its columns. If Checkoff
+    # was loaded before this ran — likely, since the app boots first — it does not
+    # know about `part` yet and insert_all raises UnknownAttributeError.
+    Bible270::Checkoff.reset_column_information
+
     expand_existing_checkoffs
   end
 
@@ -28,6 +33,10 @@ class AddPartToBible270Checkoffs < ActiveRecord::Migration[7.0]
     add_index :bible270_checkoffs, %i[reader_id day track], unique: true,
                                    name: 'idx_b270_checkoffs_unique'
     remove_column :bible270_checkoffs, :part
+
+    # Likewise on the way back down: leaving the cached column in place makes the
+    # model try to write one the table no longer has.
+    Bible270::Checkoff.reset_column_information
   end
 
 private

data/lib/bible270/configuration.rb

@@ -292,7 +292,7 @@ module Bible270
     # from, so without this the notice names the reader but cannot link to them.
     attr_accessor :mailer_host
 
-    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, :require_sign_in_to_participate
+    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, :header_mark, :remember_for, :require_sign_in_to_participate
 
     # Public labels.
     attr_accessor :app_name
@@ -318,7 +318,16 @@ module Bible270
     #
     # Expressed in seconds rather than 1.year because this file has to load
     # without ActiveSupport.
-    attr_accessor :remember_for
+    # The mark beside the title in the header. nil uses the built-in loaf, false
+    # shows none, and a string is used as an image source — so a host can put its
+    # own logo there without overriding the partial.
+    # Which clock decides what day it is. nil follows the machine's own time zone,
+    # which is what a self-hosted plan usually wants — Rails defaults Time.zone to
+    # UTC, so a reader in Los Angeles saw the next day's reading from 4pm.
+    #
+    #   config.time_zone = nil                     # the system clock (default)
+    #   config.time_zone = 'America/Los_Angeles'   # a named zone
+    attr_accessor :time_zone
 
     def remember_signed_in?
       remember_for.to_i.positive?
@@ -340,6 +349,8 @@ module Bible270
       end
       @app_name = 'Daily Bread'
       @tagline = 'Journeying through Scripture in 9 months'
+      @time_zone = nil
+      @header_mark = nil
       @remember_for = 365 * 24 * 60 * 60
       @require_sign_in_to_participate = true
       self.mount_at = '/daily-bread'

data/lib/bible270/favicon.rb

@@ -32,5 +32,16 @@ module Bible270
       compact = SVG.gsub(%r{\s+}, ' ').strip
       "data:image/svg+xml,#{compact.gsub(' ', '%20')}"
     end
+
+    # The same mark for inline use in a page, at whatever size. The percent
+    # encoding above is only correct inside a data URI: inlined into HTML,
+    # '%23231f18' is not a colour, so it is decoded here.
+    def inline_svg(size: nil)
+      markup = SVG.gsub('%23', '#').strip
+      return markup if size.nil?
+
+      pixels = size.to_i
+      markup.sub('<svg ', "<svg width='#{pixels}' height='#{pixels}' ")
+    end
   end
 end

data/lib/bible270/version.rb

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

data/lib/bible270.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'date'
+
 require 'bible270/version'
 require 'bible270/plan'
 require 'bible270/email_sign_in'
@@ -11,4 +13,18 @@ require 'bible270/configuration'
 require 'bible270/engine' if defined?(Rails::Engine)
 
 module Bible270
+module_function
+
+  # The plan's idea of today.
+  #
+  # Date.current follows Rails' Time.zone, which is UTC unless the host app sets
+  # it; Date.today follows the machine. A self-hosted reading plan wants the
+  # latter, so that is the default, with config.time_zone to override.
+  def today
+    zone = config.time_zone
+    return Date.today if zone.nil? || zone.to_s.empty?
+
+    found = Time.respond_to?(:find_zone) ? Time.find_zone(zone) : nil
+    found ? found.today : Date.today
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bible270
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: 0.15.3
 platform: ruby
 authors:
 - Andrew vonderLuft