bible270 0.14.1 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 663793ae728057f408f03f490d324349dc105dc07395b1e3f29ee6c410331039
-  data.tar.gz: 9243a5ee0e3f921de058155825317684776babbbac0488cfca6bb2cbf5c810ad
+  metadata.gz: b1a3221c4afb7b3ba3e568f4b783a763aed4d86080dfbd13807bae0bc71e61a1
+  data.tar.gz: 30b56e503e05712358fe1314c657aa4224e68eee742cbfaad53f5b4587625c96
 SHA512:
-  metadata.gz: 393484c84f487178ba20d52191a8bbdb79d7e9009e1f7761c0c9514ab894923c52c021b6f9a0c66e8dfcaa5563d953e44e702c49cc800dfedf4ad43037e5b79d
-  data.tar.gz: 5c9dee8f97be46ae34b22c6cdf11c6fba418ad3f914847cd57d191d45de72fb77e152d92b44b32bbf8505f0d1bb1557e3e10dcacc3261c46a83bb3c4dc4540b3
+  metadata.gz: 622094718971b6b74ea4e5d81440d19eb1dd4eb6d2d9ae6ce2695e51b6a4f80d413c6fc7bcd08f30e428cb8808b596a875370730e21836999c08293adf7778a6
+  data.tar.gz: 67437bd6d453421a84c6c08e8589b4fb92666e387d107d4dd7c4828b6b264eace3d2dc88d5ed0e7bb3e0da8581323db66d9c257bd0c88748b60ec4699fc0e2aa

data/README.md

@@ -1,6 +1,6 @@
 # Bible 270
 
-[![Gem Version](https://img.shields.io/gem/v/bible270)](https://rubygems.org/gems/bible270) [![Downloads](https://img.shields.io/gem/dt/bible270)](https://rubygems.org/gems/bible270) [![GitHub Release Date - Published_At](https://img.shields.io/github/release-date/avonderluft/bible270?label=last%20release&color=seagreen)](https://github.com/avonderluft/bible270/releases)
+[![Gem Version](https://img.shields.io/gem/v/bible270)](https://rubygems.org/gems/bible270) [![Coverage Status](https://coveralls.io/repos/github/avonderluft/bible270/badge.svg?branch=main)](https://coveralls.io/github/avonderluft/bible270?branch=main?cacheSeconds=60) [![Downloads](https://img.shields.io/gem/dt/bible270)](https://rubygems.org/gems/bible270) [![GitHub Release Date - Published_At](https://img.shields.io/github/release-date/avonderluft/bible270?label=last%20release&color=seagreen)](https://github.com/avonderluft/bible270/releases)
 
 A mountable **Rails engine** that drops a 270-day (9 month) interactive Bible reading plan into any Rails app, built with [ComfortableMediaSurfer](https://github.com/shakacode/comfortable-media-surfer) CMS in mind. Readers tick off each day's readings, post reflections, and see how everyone else is getting on, much like the social plans on Bible.com.
 
@@ -506,4 +506,4 @@ A few things that'll make review quick:
 
 ## License
 
-[MIT-LICENSE](./MIT-LICENSE).
+[MIT-LICENSE](./MIT-LICENSE).

data/app/controllers/bible270/admin_controller.rb

@@ -31,7 +31,7 @@ module Bible270
       @readers = Reader.all.to_a.sort_by(&:sort_name)
       counts = Checkoff.group(:reader_id, :day).count
       @days_completed = Hash.new(0)
-      counts.each { |(rid, day), n| @days_completed[rid] += 1 if n >= Plan.required_track_count(day) }
+      counts.each { |(rid, day), n| @days_completed[rid] += 1 if n >= Plan.total_parts(day) }
     end
 
     def show

data/app/controllers/bible270/application_controller.rb

@@ -22,6 +22,8 @@ module Bible270
 
     helper_method :current_reader, :signed_in?, :b270_config, :enrollment_closed?
 
+    REMEMBER_COOKIE = :bible270_remember
+
   private
 
     def bible270_layout
@@ -44,9 +46,47 @@ module Bible270
           resolver.call(self)
         elsif (id = session[:bible270_reader_id])
           Reader.find_by(id: id)
+        else
+          reader_from_remember_cookie
         end
     end
 
+    # A session cookie dies when the browser restarts, which on a phone can be
+    # daily. This restores the session from a long-lived signed cookie carrying
+    # the reader id and a rotating token, so the reader stays signed in.
+    def reader_from_remember_cookie
+      return nil unless Bible270.config.remember_signed_in?
+
+      payload = cookies.encrypted[REMEMBER_COOKIE]
+      return nil if payload.blank?
+
+      id, token = payload.to_s.split(':', 2)
+      reader = Reader.from_remember_cookie(id, token)
+      return forget_reader! if reader.nil?
+
+      # Re-establish the session so the rest of the request behaves as normal.
+      session[:bible270_reader_id] = reader.id
+      reader
+    end
+
+    # Encrypted, so the payload can be neither read nor forged by the client.
+    def remember_reader!(reader)
+      return unless Bible270.config.remember_signed_in?
+
+      cookies.encrypted[REMEMBER_COOKIE] = {
+        value: "#{reader.id}:#{reader.remember_token!}",
+        expires: Bible270.config.remember_for.to_i.seconds.from_now,
+        httponly: true,
+        same_site: :lax,
+        secure: request.ssl?
+      }
+    end
+
+    def forget_reader!
+      cookies.delete(REMEMBER_COOKIE)
+      nil
+    end
+
     def signed_in?
       current_reader.present?
     end

data/app/controllers/bible270/checkoffs_controller.rb

@@ -7,15 +7,20 @@ module Bible270
 
       @day   = params[:day].to_i
       @track = params[:track].to_s
+      # Part 0 is the first chapter of the reading. Requests without one predate
+      # per-chapter check-offs and mean the first part.
+      @part  = params[:part].to_i
 
-      head :bad_request and return unless Plan.valid_day?(@day) && Plan.present_tracks(@day).include?(@track)
+      head :bad_request and return unless Plan.valid_day?(@day) &&
+                                          Plan.present_tracks(@day).include?(@track) &&
+                                          Plan.valid_part?(@day, @track, @part)
 
-      existing = current_reader.checkoffs.find_by(day: @day, track: @track)
+      existing = current_reader.checkoffs.find_by(day: @day, track: @track, part: @part)
       if existing
         existing.destroy
       else
         current_reader.ensure_started!
-        current_reader.checkoffs.create(day: @day, track: @track)
+        current_reader.checkoffs.create(day: @day, track: @track, part: @part)
       end
 
       @reader = current_reader.reload

data/app/controllers/bible270/days_controller.rb

@@ -9,7 +9,7 @@ module Bible270
       @readers = Reader.order(updated_at: :desc).to_a
       counts = Checkoff.group(:reader_id, :day).count
       @days_completed = Hash.new(0)
-      counts.each { |(rid, day), n| @days_completed[rid] += 1 if n >= Plan.required_track_count(day) }
+      counts.each { |(rid, day), n| @days_completed[rid] += 1 if n >= Plan.total_parts(day) }
       @readers = @readers.sort_by { |r| -@days_completed[r.id] }
 
       @start_day = current_reader&.current_day || 1
@@ -28,10 +28,13 @@ module Bible270
       @new_comment = Comment.new(day: @day)
       @reader_tracks = current_reader ? current_reader.read_tracks_for(@day) : []
 
-      req = Plan.required_track_count(@day)
+      # Every box on the day, not every track: an Old Testament reading of three
+      # chapters is three rows, so counting tracks would call someone finished
+      # who had only read the Old Testament.
+      required = Plan.total_parts(@day)
       completer_ids = Checkoff.where(day: @day)
         .group(:reader_id)
-        .having('COUNT(*) >= ?', req)
+        .having('COUNT(*) >= ?', required)
         .pluck(:reader_id)
       @completers = Reader.where(id: completer_ids).order(:display_name)
 

data/app/controllers/bible270/readers_controller.rb

@@ -6,7 +6,7 @@ module Bible270
       @readers = Reader.all.to_a
       counts = Checkoff.group(:reader_id, :day).count
       @days_completed = Hash.new(0)
-      counts.each { |(rid, day), n| @days_completed[rid] += 1 if n >= Plan.required_track_count(day) }
+      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] }
     end
 

data/app/controllers/bible270/sessions_controller.rb

@@ -33,12 +33,17 @@ module Bible270
       # Rotate the session id to avoid session fixation, then sign in.
       reset_session
       session[:bible270_reader_id] = reader.id
+      remember_reader!(reader)
       @current_reader = reader
 
       redirect_to destination, notice: "Welcome #{reader.first_name}."
     end
 
     def destroy
+      # Clear the long-lived cookie too, or the next request would sign them
+      # straight back in. The stored token is left alone so their other devices
+      # stay signed in; Reader#forget! is what revokes those.
+      forget_reader!
       reset_session
       @current_reader = nil
       redirect_to(after_sign_out_path, notice: 'Signed out.')
@@ -109,6 +114,7 @@ module Bible270
 
       reset_session
       session[:bible270_reader_id] = reader.id
+      remember_reader!(reader)
       @current_reader = reader
 
       if name_needed?(reader)
@@ -174,6 +180,10 @@ module Bible270
       return nil if value.include?('//')   # protocol-relative URL
       return nil if value.include?('\\')   # browsers may normalise \ to /
       return nil if value.include?('/auth/')
+      # Never return someone to sign-in or sign-out after signing in: harmless,
+      # but it reads as though the sign-in failed. Matched by path so it holds
+      # wherever the engine is mounted.
+      return nil if value.match?(%r{/sign_(in|out)(/|\z|\?)})
 
       value
     end

data/app/models/bible270/checkoff.rb

@@ -9,8 +9,10 @@ module Bible270
 
     validates :day, inclusion: { in: 1..Plan::DAYS }
     validates :track, inclusion: { in: Plan::TRACKS.keys }
-    validates :track, uniqueness: { scope: %i[reader_id day] }
+    validates :track, uniqueness: { scope: %i[reader_id day part] }
+    validates :part, numericality: { only_integer: true, greater_than_or_equal_to: 0 }
     validate  :track_present_on_day
+    validate  :part_within_reading
 
   private
 
@@ -20,5 +22,14 @@ module Bible270
 
       errors.add(:track, "is not part of day #{day}")
     end
+
+    # Part 0 is the first chapter of the day's reading; an Old Testament reading
+    # of three chapters has parts 0, 1 and 2.
+    def part_within_reading
+      return if day.nil? || track.nil? || part.nil?
+      return if Plan.valid_part?(day, track, part)
+
+      errors.add(:part, "is not part of the #{track} reading on day #{day}")
+    end
   end
 end

data/app/models/bible270/reader.rb

@@ -140,6 +140,36 @@ module Bible270
       [last_name, first_name].map { |n| n.to_s.strip.downcase }.join(' ').strip.presence || display_name.to_s.downcase
     end
 
+    # ---- staying signed in -------------------------------------------------
+
+    # Generated on first use rather than at sign-up, so readers who never stay
+    # signed in never carry one.
+    def remember_token!
+      return remember_token if remember_token.present?
+
+      token = SecureRandom.urlsafe_base64(32)
+      update_column(:remember_token, token)
+      token
+    end
+
+    # Rotating the token invalidates every device at once.
+    def forget!
+      update_column(:remember_token, nil)
+      true
+    end
+
+    def self.from_remember_cookie(reader_id, token)
+      return nil if reader_id.blank? || token.blank?
+
+      reader = find_by(id: reader_id)
+      return nil if reader.nil? || reader.remember_token.blank?
+
+      # Constant-time comparison: the token is a credential.
+      return nil unless ActiveSupport::SecurityUtils.secure_compare(reader.remember_token, token.to_s)
+
+      reader
+    end
+
     def avatar_uploaded?
       self.class.avatar_uploads? && avatar.attached?
     end
@@ -183,28 +213,44 @@ module Bible270
       done = checked_count(day)
       return :none if done.zero?
 
-      done >= Plan.required_track_count(day) ? :complete : :partial
+      done >= Plan.total_parts(day) ? :complete : :partial
     end
 
     def read_tracks_for(day)
-      checkoffs.where(day: day).pluck(:track)
+      checkoffs.where(day: day).pluck(:track).uniq
     end
 
-    def read?(day, track)
-      read_tracks_for(day).include?(track.to_s)
+    # Which chapters of a track the reader has ticked on this day.
+    def read_parts_for(day, track)
+      checkoffs.where(day: day, track: track.to_s).pluck(:part)
+    end
+
+    def read?(day, track, part = nil)
+      return read_parts_for(day, track).include?(part) if part
+
+      # No part given: the track counts as read only when every chapter is.
+      read_parts_for(day, track).size >= Plan.part_count(day, track)
+    end
+
+    def track_partially_read?(day, track)
+      done = read_parts_for(day, track).size
+      done.positive? && done < Plan.part_count(day, track)
     end
 
     def day_complete?(day)
       n = checked_counts[day].to_i
-      n.positive? && n >= Plan.required_track_count(day)
+      n.positive? && n >= Plan.total_parts(day)
     end
 
     def days_completed
-      checked_counts.count { |day, n| n >= Plan.required_track_count(day) }
+      checked_counts.count { |day, n| n >= Plan.total_parts(day) }
     end
 
+    # Days on which this track is *finished*. Counting rows would count chapters
+    # now that an Old Testament reading has one per chapter.
     def days_read_in(track)
-      checkoffs.where(track: track.to_s).count
+      checkoffs.where(track: track.to_s).group(:day).count
+        .count { |day, done| done >= Plan.part_count(day, track) }
     end
 
     def completion_percent
@@ -240,13 +286,37 @@ module Bible270
     def mark_day_complete!(day)
       return false unless Plan.valid_day?(day)
 
-      Plan.present_tracks(day).each do |track|
-        checkoffs.find_or_create_by!(day: day, track: track)
-      end
+      # Deliberately not find_or_create_by!: since Rails 8.1 that creates first
+      # and rescues RecordNotUnique, but Checkoff validates uniqueness, so a
+      # duplicate raises RecordInvalid before the database is reached and is
+      # never rescued. Reading what exists first is also one query per day rather
+      # than one per chapter.
+      missing = missing_parts_on(day)
+      insert_checkoffs(day, missing) if missing.any?
+
       reload_progress
       true
     end
 
+    # [[track, part], ...] not yet ticked on this day.
+    def missing_parts_on(day)
+      wanted = Plan.present_tracks(day).flat_map do |track|
+        Array.new(Plan.part_count(day, track)) { |part| [track, part] }
+      end
+      have = checkoffs.where(day: day).pluck(:track, :part)
+
+      wanted - have
+    end
+
+    def insert_checkoffs(day, pairs)
+      now = Time.current
+      Checkoff.insert_all(
+        pairs.map do |track, part|
+          { reader_id: id, day: day, track: track, part: part, created_at: now, updated_at: now }
+        end
+      )
+    end
+
     def clear_day!(day)
       return false unless Plan.valid_day?(day)
 
@@ -261,13 +331,12 @@ module Bible270
 
     # Mark everything up to and including `day` complete, and clear anything after.
     def mark_through!(day)
-      return false unless day.to_i.between?(0, Plan::DAYS)
+      day = day.to_i
+      return false unless day.between?(0, Plan::DAYS)
 
       transaction do
-        checkoffs.where(day: (day.to_i + 1)..).destroy_all
-        (1..day.to_i).each do |d|
-          Plan.present_tracks(d).each { |t| checkoffs.find_or_create_by!(day: d, track: t) }
-        end
+        checkoffs.where(day: (day + 1)..).delete_all
+        (1..day).each { |d| mark_day_complete!(d) }
       end
       reload_progress
       true
@@ -300,6 +369,7 @@ module Bible270
     # Private, but declared this way rather than with a `private` section: methods
     # defined below here are called from controllers and views.
     private :notify_of_registration
+    private :missing_parts_on, :insert_checkoffs
 
     def reload_progress
       @checked_counts = nil

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

@@ -1,18 +1,58 @@
-<% t = b270_track(track); ref = readings[track]; done = reader_tracks.include?(track) %>
+<%
+  t = b270_track(track)
+  ref = readings[track]
+  parts = Bible270::Plan.parts_for(day, track)
+  read_parts = signed_in? ? current_reader.read_parts_for(day, track) : []
+  done = ref.present? && read_parts.size >= parts.size
+%>
 <% if ref %>
-  <div class="b270-reading <%= track %> <%= 'done' if done %>" id="reading_<%= day %>_<%= track %>">
-    <% if signed_in? %>
-      <%= button_to toggle_checkoff_path(day, track), class: "b270-toggle", form: { data: { turbo_stream: true } },
-            aria: { label: (done ? "Mark #{t[:label]} unread" : "Mark #{t[:label]} read") } do %>
+  <div class="b270-reading <%= track %> <%= 'multi' if parts.size > 1 %> <%= 'done' if done %>"
+       id="reading_<%= day %>_<%= track %>">
+    <%# One box per chapter. A reading of a single chapter keeps the original
+        single-box layout; only multi-chapter Old Testament readings split. The
+        multi layout is a block, not a flex row, so each chapter's box sits in the
+        same column as the single box on the other tracks. %>
+    <% if parts.size > 1 %>
+      <div class="b270-rbody">
+        <div class="b270-cat"><%= t[:label] %></div>
+        <ul class="b270-parts">
+          <% parts.each_with_index do |part_ref, index| %>
+            <% part_done = read_parts.include?(index) %>
+            <li class="b270-part <%= 'done' if part_done %>">
+              <% if signed_in? %>
+                <%= button_to toggle_checkoff_part_path(day, track, index), class: "b270-toggle",
+                      form: { data: { turbo_stream: true } },
+                      aria: { label: (part_done ? "Mark #{part_ref} unread" : "Mark #{part_ref} read") } do %>
+                  <span class="b270-check"><svg viewBox="0 0 24 24"><polyline points="20 6 9 17 4 12"/></svg></span>
+                <% end %>
+              <% else %>
+                <span class="b270-check"><svg viewBox="0 0 24 24"><polyline points="20 6 9 17 4 12"/></svg></span>
+              <% end %>
+              <span class="b270-ref">
+                <%= link_to part_ref, b270_passage_url(part_ref), target: "_blank", rel: "noopener" %>
+              </span>
+            </li>
+          <% end %>
+        </ul>
+        <div class="b270-parts-meta">
+          <%= read_parts.size %> of <%= parts.size %> chapters <%= b270_version_tag %>
+        </div>
+      </div>
+    <% else %>
+      <% if signed_in? %>
+        <%= button_to toggle_checkoff_part_path(day, track, 0), class: "b270-toggle",
+              form: { data: { turbo_stream: true } },
+              aria: { label: (done ? "Mark #{t[:label]} unread" : "Mark #{t[:label]} read") } do %>
+          <span class="b270-check"><svg viewBox="0 0 24 24"><polyline points="20 6 9 17 4 12"/></svg></span>
+        <% end %>
+      <% else %>
         <span class="b270-check"><svg viewBox="0 0 24 24"><polyline points="20 6 9 17 4 12"/></svg></span>
       <% end %>
-    <% else %>
-      <span class="b270-check"><svg viewBox="0 0 24 24"><polyline points="20 6 9 17 4 12"/></svg></span>
+      <div class="b270-rbody">
+        <div class="b270-cat"><%= t[:label] %></div>
+        <div class="b270-ref"><%= link_to ref, b270_passage_url(ref), target: "_blank", rel: "noopener" %> <%= b270_version_tag %></div>
+      </div>
     <% end %>
-    <div class="b270-rbody">
-      <div class="b270-cat"><%= t[:label] %></div>
-      <div class="b270-ref"><%= link_to ref, b270_passage_url(ref), target: "_blank", rel: "noopener" %> <%= b270_version_tag %></div>
-    </div>
   </div>
 <% else %>
   <div class="b270-reading <%= track %> rest" id="reading_<%= day %>_<%= track %>">

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

@@ -108,6 +108,25 @@
   .b270-rbody{flex:1;min-width:0}
   .b270-cat{font-size:11px;letter-spacing:.13em;text-transform:uppercase;color:var(--faint);font-weight:600}
   .b270-ref{font-family:"Spectral",serif;font-size:19px;font-weight:500;margin-top:1px}
+  /* per-chapter check-offs: a smaller box per chapter, listed under the track */
+  /* A multi-chapter reading is laid out as a block rather than a flex row, so
+     each chapter's box sits in the same column as the single box on the other
+     tracks. The label is indented by that column's width (26px) plus the row
+     gap (15px) to stay level with the other tracks' labels. */
+  .b270-reading.multi{display:block}
+  .b270-reading.multi .b270-cat{margin-left:41px}
+  .b270-reading.multi .b270-parts-meta{margin-left:41px}
+  .b270-parts{list-style:none;margin:6px 0 0;padding:0;display:flex;flex-direction:column;gap:8px}
+  .b270-part{display:flex;align-items:center;gap:15px}
+  .b270-part .b270-ref{font-size:19px}
+  /* A ticked chapter looks exactly like a ticked single reading: the box fills
+     in the track's colour and the tick appears. No strikethrough — the other
+     tracks don't strike their references either. */
+  .b270-reading.ot .b270-part.done .b270-check{background:var(--teal);border-color:var(--teal)}
+  .b270-reading.nt .b270-part.done .b270-check{background:var(--oxblood);border-color:var(--oxblood)}
+  .b270-reading.pp .b270-part.done .b270-check{background:var(--gold);border-color:var(--gold)}
+  .b270-part.done .b270-check svg{opacity:1}
+  .b270-parts-meta{margin-top:10px;font-size:12.5px;color:var(--faint)}
   .b270-version{font-size:11.5px;color:var(--faint);font-weight:400;letter-spacing:.02em;white-space:nowrap}
   .b270-select{font:inherit;font-size:14px;padding:10px 30px 10px 12px;border:1px solid var(--line);border-radius:9px;background:#fff;color:var(--ink);width:100%;max-width:100%;text-overflow:ellipsis}
   .b270-ref a{text-decoration:none;border-bottom:1px solid transparent}
@@ -156,5 +175,5 @@
   .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}
-  @media (max-width:480px){ .b270-tm{grid-template-columns:104px 1fr auto} .b270-reading{padding:14px 15px;gap:12px} }
+  @media (max-width:480px){ .b270-tm{grid-template-columns:104px 1fr auto} .b270-reading{padding:14px 15px;gap:12px} .b270-reading.multi .b270-cat,.b270-reading.multi .b270-parts-meta{margin-left:38px} .b270-part{gap:12px} }
 </style>

data/config/routes.rb

@@ -5,6 +5,9 @@ Bible270::Engine.routes.draw do
 
   get 'day/:day', to: 'days#show', as: :day, constraints: { day: %r{\d+} }
 
+  # :part is the chapter within the reading; omitted means the first.
+  post   'day/:day/toggle/:track/:part', to: 'checkoffs#toggle', as: :toggle_checkoff_part,
+                                         constraints: { day: %r{\d+}, part: %r{\d+} }
   post   'day/:day/toggle/:track', to: 'checkoffs#toggle', as: :toggle_checkoff,
                                    constraints: { day: %r{\d+} }
   post   'day/:day/comments',      to: 'comments#create',  as: :day_comments,

data/db/migrate/20260101000009_add_part_to_bible270_checkoffs.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+class AddPartToBible270Checkoffs < ActiveRecord::Migration[7.0]
+  # An Old Testament reading is usually several whole chapters, and readers get
+  # through them one at a time, so each chapter becomes a separately tickable
+  # part. Part 0 is the first chapter of that day's reading.
+  def up
+    add_column :bible270_checkoffs, :part, :integer, null: false, default: 0
+
+    old_index = 'idx_b270_checkoffs_unique'
+    remove_index :bible270_checkoffs, name: old_index if index_name_exists?(:bible270_checkoffs, old_index)
+    add_index :bible270_checkoffs, %i[reader_id day track part], unique: true,
+                                   name: 'idx_b270_checkoffs_part_unique'
+
+    expand_existing_checkoffs
+  end
+
+  def down
+    # Collapse back: a track counts as read if any of its chapters were.
+    execute <<~SQL.squish
+      DELETE FROM bible270_checkoffs
+      WHERE id NOT IN (
+        SELECT MIN(id) FROM bible270_checkoffs GROUP BY reader_id, day, track
+      )
+    SQL
+
+    remove_index :bible270_checkoffs, name: 'idx_b270_checkoffs_part_unique'
+    add_index :bible270_checkoffs, %i[reader_id day track], unique: true,
+                                   name: 'idx_b270_checkoffs_unique'
+    remove_column :bible270_checkoffs, :part
+  end
+
+private
+
+  # Before this migration one row meant "the whole reading is done". Leaving
+  # those rows at part 0 would silently demote a finished multi-chapter day to
+  # one chapter of it, so each is expanded into a row per chapter.
+  def expand_existing_checkoffs
+    rows = select_all(<<~SQL.squish).to_a
+      SELECT id, reader_id, day, track FROM bible270_checkoffs WHERE part = 0
+    SQL
+    return if rows.empty?
+
+    now = Time.current
+    additions = rows.flat_map do |row|
+      count = Bible270::Plan.part_count(row['day'].to_i, row['track'])
+      next [] if count <= 1
+
+      (1...count).map do |part|
+        { reader_id: row['reader_id'], day: row['day'], track: row['track'],
+          part: part, created_at: now, updated_at: now }
+      end
+    end
+    return if additions.empty?
+
+    say "expanding #{rows.size} check-offs into #{rows.size + additions.size} chapter parts", true
+    Bible270::Checkoff.insert_all(additions)
+  end
+end

data/db/migrate/20260101000010_add_remember_token_to_bible270_readers.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class AddRememberTokenToBible270Readers < ActiveRecord::Migration[7.0]
+  # Lets a reader stay signed in across browser restarts. The cookie carries this
+  # token alongside the reader id, so rotating it signs that reader out
+  # everywhere — which a bare id in a cookie could not offer.
+  def change
+    add_column :bible270_readers, :remember_token, :string
+    add_index :bible270_readers, :remember_token, name: 'idx_b270_readers_remember'
+  end
+end

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
+    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
 
     # Public labels.
     attr_accessor :app_name
@@ -311,7 +311,18 @@ module Bible270
     attr_accessor :allow_reader_start_date
 
     # Only signed-in readers may check off and comment (viewing is always open).
-    attr_accessor :require_sign_in_to_participate
+    # How long a reader stays signed in on a device, in seconds. The plan runs
+    # 270 days and most people read it on a phone, where a browser-session cookie
+    # is discarded within days — so this defaults to a year. Set nil or false to
+    # keep sign-in to the browser session only.
+    #
+    # Expressed in seconds rather than 1.year because this file has to load
+    # without ActiveSupport.
+    attr_accessor :remember_for
+
+    def remember_signed_in?
+      remember_for.to_i.positive?
+    end
 
     def initialize
       @parent_controller = 'ActionController::Base'
@@ -329,6 +340,7 @@ module Bible270
       end
       @app_name = 'Daily Bread'
       @tagline = 'Journeying through Scripture in 9 months'
+      @remember_for = 365 * 24 * 60 * 60
       @require_sign_in_to_participate = true
       self.mount_at = '/daily-bread'
       @start_date = nil

data/lib/bible270/plan.rb

@@ -558,6 +558,42 @@ module Bible270
 
     def required_track_count(day) = present_tracks(day).size
 
+    # ---- parts of a reading -------------------------------------------------
+    #
+    # An Old Testament reading is usually several whole chapters (260 of the 270
+    # days, up to six), which readers get through one at a time. Each chapter is
+    # a separately tickable part. A New Testament or Psalms/Proverbs reading is a
+    # single chapter or a portion of one, so it has exactly one part.
+    #
+    # Parts are identified by position, so part 0 is always the first chapter of
+    # that day's reading.
+
+    def parts_for(day, track)
+      return [] unless valid_day?(day)
+
+      case track.to_s
+      when 'ot'
+        groups = ot_groups[day - 1]
+        groups.nil? ? [] : groups.map { |book, chapter| format_reference([[book, chapter]]) }
+      when 'nt', 'pp'
+        reading = readings_for(day)[track.to_s]
+        reading.nil? ? [] : [reading]
+      else
+        []
+      end
+    end
+
+    def part_count(day, track) = parts_for(day, track).size
+
+    def valid_part?(day, track, part)
+      part.is_a?(Integer) && part >= 0 && part < part_count(day, track)
+    end
+
+    # Every tickable box on a day, across all three tracks.
+    def total_parts(day)
+      memo(:"total_parts_#{day}") { present_tracks(day).sum { |track| part_count(day, track) } }
+    end
+
     def valid_day?(day) = day.is_a?(Integer) && day >= 1 && day <= DAYS
 
     # Blank means "the whole day", which is stored as NULL. Select fields submit

data/lib/bible270/versification.rb

@@ -93,7 +93,17 @@ module Bible270
 
   module_function
 
-    def verses(book, chapter) = VERSES.fetch(book)[chapter - 1]
+    # Guarded rather than indexing straight in: chapter 0 would become index -1
+    # and silently return the *last* chapter's verse count, and an over-large
+    # chapter would return nil for callers that expect a number. An unknown book
+    # still raises, since that is a programming error rather than bad data.
+    def verses(book, chapter)
+      counts = VERSES.fetch(book)
+      return 0 unless chapter.is_a?(Integer) && chapter.positive? && chapter <= counts.size
+
+      counts[chapter - 1]
+    end
+
     def chapter_count(book) = VERSES.fetch(book).size
     def total_verses(book) = VERSES.fetch(book).sum
   end

data/lib/bible270/version.rb

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

data/lib/generators/bible270/install/templates/bible270.rb.tt

@@ -73,7 +73,8 @@ Bible270.configure do |config|
   # config.footer_partial = 'layouts/bible270_footer'  
   # config.footer_html    = '<p>&copy; 2026 …</p>'
   # config.footer         = false                # no footer at all
-  #_
+  #
   # config.footer_placement = :after    # engine's note, then yours
   # config.footer_placement = :before   # yours, then the engine's note
   # config.footer_placement = :replace  # default
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bible270
 version: !ruby/object:Gem::Version
-  version: 0.14.1
+  version: 0.15.0
 platform: ruby
 authors:
 - Andrew vonderLuft
@@ -23,6 +23,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '7.0'
+- !ruby/object:Gem::Dependency
+  name: turbo-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: omniauth
   requirement: !ruby/object:Gem::Requirement
@@ -118,9 +132,10 @@ files:
 - db/migrate/20260101000006_add_approval_to_bible270_comments.rb
 - db/migrate/20260101000007_create_bible270_settings.rb
 - db/migrate/20260101000008_add_bible_version_to_bible270_readers.rb
+- db/migrate/20260101000009_add_part_to_bible270_checkoffs.rb
+- db/migrate/20260101000010_add_remember_token_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

data/lib/bible270/bible270.rb

@@ -1,14 +0,0 @@
-# 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