bible270 1.5.1 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8c170757c087fab1698cb43ef5251e28c4e7c4f08187cb33b0ac3962f41fc28
-  data.tar.gz: 5e803ddf4f8d77b56c2c7c91859b7ea0f8222341162790f39fb2cc7abbc1f517
+  metadata.gz: ddb40f5dac18c21c5661cf6b290eb55247b87666d01a1a4239c97cbde95fc251
+  data.tar.gz: ac97b21064ffe1658dd62c5cd0df71fb748b2db88829e2f7a71fbd799302a065
 SHA512:
-  metadata.gz: 3ff3dcde674bf0be28d1baec700a39d8db3a26a199c72fc467dd6864020d1608a1667e9feecb2e530706cf1a92b3a653cd7b904dd883cc4f495dc9027145c6c8
-  data.tar.gz: 4e3566d9c90076d1a9c4c46ee99e9d2415320fcfeb8be0d2acc1a03ac9168278362a8cfe1dd93b108e4db312c292f3436a4061e24b5cb211ec217445a942a254
+  metadata.gz: 9543258320235373bd87deb1b39aed672c9a2fa1f753f5d39951f4b28db048a2b627e2a9cfbf30df4db5f506d4469e641b2b437394b21192ab2e859914deaa06
+  data.tar.gz: 54f1d379ba07ef8850f5e23f68d1d3b77e0ac29f01fb3e9b2e5b408e3c2b4c079d88049fb0e1b20f72a3f821d50d32b2a037541bd98accd0cdc41fc585cc16a7

data/CHANGELOG.md

@@ -6,19 +6,48 @@ All notable changes to bible270. Format follows [Keep a Changelog](https://keepa
 
 ### Added
 
+- let administrators sort the reader list by first name, last name, most completed days, or least completed days, and open the Rake task's progress report in a dismissable Reader Stats dialog that follows the current sort selection
+- let admin broadcasts target either every reader with an email address or only readers recognized as administrators
+
+### Changed
+
+- send each broad reflection/reply notification once with all eligible subscribers in BCC, while keeping direct reply and mention notices individually addressed
+
+### Fixed
+
+- normalize boolean column defaults reported by Rails adapters so migration reconciliation and tests work consistently across Rails 7.1 through 8.1
+
+**[Full Changelog](https://github.com/avonderluft/bible270/compare/v1.5.1...main)**
+
+## [1.5.1] - 2026-09-11
+
+### Added
+
+- add `bible270:notifications:enable_all` to opt every existing reader into emails for each new reflection and reply, with environment-aware counts and guidance when the selected database has no readers
+- add `bible270:readers:list` to print aligned Name, Days Read, and schedule Status columns, ordered by completed days
+
+### Changed
+
+- default new readers to emails for every new reflection and reply; migration `20260101000022` changes only the default and preserves existing reader preferences
+
+**[Full Changelog](https://github.com/avonderluft/bible270/compare/v1.5.0...v1.5.1)**
+
+## [1.5.0] - 2026-09-07
+
+### Added
+
 - add an on-demand Markdown formatting drawer and separate server-rendered Preview control for reflections and replies, with safe rendering, formatted notification emails, mention and browser-draft compatibility, and literal display of existing plain-text reflections; upgrading hosts must copy and run the new `body_format` comment migration
-- add `bible270:notifications:enable_all` to opt every existing reader into emails for each new reflection and reply
-- add `bible270:readers:list` to print an aligned, progress-sorted reader report with schedule status
 
 ### Changed
 
-- default new readers to emails for every new reflection and reply; existing reader preferences remain unchanged by the migration
+- update RuboCop and SimpleCov development dependencies and replace deprecated SimpleCov configuration methods
+- use the current Coveralls-backed Shields.io coverage badge endpoint for the `main` branch
 
 ### Fixed
 
 - keep `json` below 3.0 while supported Rails releases still pass positional parse options, preventing session-cookie decoding from crashing every request under `json` 3.0
 
-**[Full Changelog](https://github.com/avonderluft/bible270/compare/v1.4.2...main)**
+**[Full Changelog](https://github.com/avonderluft/bible270/compare/v1.4.2...v1.5.0)**
 
 ## [1.4.2] - 2026-09-03
 
@@ -667,7 +696,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.
 
-[Unreleased]: https://github.com/avonderluft/bible270/compare/v1.4.2...HEAD
+[Unreleased]: https://github.com/avonderluft/bible270/compare/v1.5.1...HEAD
+[1.5.1]: https://github.com/avonderluft/bible270/releases/tag/v1.5.1
+[1.5.0]: https://github.com/avonderluft/bible270/releases/tag/v1.5.0
 [1.4.2]: https://github.com/avonderluft/bible270/releases/tag/v1.4.2
 [1.4.1]: https://github.com/avonderluft/bible270/releases/tag/v1.4.1
 [1.4.0]: https://github.com/avonderluft/bible270/releases/tag/v1.4.0

data/README.md

@@ -258,8 +258,10 @@ end
 
 ## Admin panel
 
-At `<mount>/admin`: remove readers, adjust their completions, move them to a given day. Unreachable —
-every route 404s rather than 403s — unless you say who may use it:
+At `<mount>/admin`: sort readers by first name, last name, or completed days; open **Reader Stats** for
+the same progress report as `bible270:readers:list`, ordered by the current admin sort selection; remove
+readers; adjust their completions; and move them to a given day. The panel is unreachable — every route
+404s rather than 403s — unless you say who may use it:
 
 ```ruby
 config.admin_emails = %w[andrew@example.org]
@@ -267,7 +269,9 @@ config.admin_emails = %w[andrew@example.org]
 config.admin_resolver = ->(reader) { reader.email.to_s.end_with?('@example.org') }
 ```
 
-Admins get an extra "Admin" link in the header. From a reader's page you can:
+Admins get an extra "Admin" link in the header. The broadcast form can send an individually addressed
+message either to every reader with an email address or only to readers recognized as administrators.
+From a reader's page you can:
 
 - **move them to a day** — "put them on day 42 as of today" back-dates the start date; check-offs are
   keyed to day numbers, so nothing in their history moves;
@@ -293,8 +297,9 @@ them. Upgrading hosts must copy and run migration `20260101000021`, which record
 plain text or Markdown; until then, the composer safely falls back to plain text.
 
 When `config.mention_notifications` is enabled, each reader can request email for every new reflection
-and reply, only replies to their reflections and mentions of them, or none. Administrators can change
-the same preference from the reader's Admin page. Migration
+and reply, only replies to their reflections and mentions of them, or none. Broad notifications are sent
+once with eligible subscribers in BCC; direct reply and mention notices remain individually addressed.
+Administrators can change the same preference from the reader's Admin page. Migration
 `20260101000018` adds the broad opt-in without changing any existing reader's choice, while migration
 `20260101000022` makes that broad option the default for readers created afterward. Migration
 `20260101000017` stores each reader's last visit to the Reflections page. After upgrading, install and

data/app/controllers/bible270/admin_controller.rb

@@ -10,6 +10,13 @@ module Bible270
   class AdminController < ApplicationController
     LAST_BROADCAST_AT = 'last_broadcast_at'
     LAST_BROADCAST_SUBJECT = 'last_broadcast_subject'
+    BROADCAST_AUDIENCES = %w[everyone admins].freeze
+    READER_SORT_OPTIONS = {
+      'first_name' => 'First Name',
+      'last_name' => 'Last Name',
+      'most_completed' => 'Most days completed',
+      'least_completed' => 'Least days completed'
+    }.freeze
 
     before_action :require_admin!
     before_action :load_reader,
@@ -55,7 +62,11 @@ module Bible270
     def index
       @enrollment_closed = Setting.enrollment_closed?
       @enrollment_closed_at = Setting.enrollment_closed_at
-      @readers = Reader.all.to_a.sort_by(&:sort_name)
+      @days_completed = Reader.completed_days_by_id
+      @reader_sort_options = READER_SORT_OPTIONS
+      @reader_sort = READER_SORT_OPTIONS.key?(params[:sort]) ? params[:sort] : 'first_name'
+      @reader_report = ReaderProgressReport.new(completed_days: @days_completed, sort: @reader_sort)
+      @readers = @reader_report.sorted_readers
       @run_start_date = Setting.run_start_date
       @configured_start_date = Bible270.config.start_date
       @run_start_date_overridden = Setting.run_start_date_overridden?
@@ -66,8 +77,9 @@ module Bible270
         @shared_calendar_readers = @readers.size
         @personal_calendar_readers = 0
       end
-      @days_completed = Reader.completed_days_by_id
-      @reachable = Reader.where.not(email: [nil, '']).count
+      reachable_readers = @readers.select { |reader| reader.email.present? }
+      @reachable = reachable_readers.size
+      @reachable_admins = reachable_readers.count { |reader| Bible270.config.admin?(reader) }
       @last_broadcast_at = parsed_time(Setting.read(LAST_BROADCAST_AT))
       @last_broadcast_subject = Setting.read(LAST_BROADCAST_SUBJECT)
     end
@@ -118,13 +130,21 @@ module Bible270
     def broadcast
       subject = params[:subject].to_s.strip
       body = params[:body].to_s.strip
+      audience = params[:audience].presence || 'everyone'
 
+      unless BROADCAST_AUDIENCES.include?(audience)
+        return redirect_to admin_path, alert: 'Choose who should receive the message. Nothing was sent.'
+      end
       if subject.empty? || body.empty?
         return redirect_to(admin_path, alert: 'A message needs both a subject and something to say.')
       end
 
-      recipients = Reader.where.not(email: [nil, '']).order(:id)
-      return redirect_to(admin_path, alert: 'Nobody has an email address.') if recipients.empty?
+      recipients = broadcast_recipients(audience)
+      noun = audience == 'admins' ? 'admin' : 'reader'
+      if recipients.empty?
+        alert = audience == 'admins' ? 'No admins have an email address.' : 'Nobody has an email address.'
+        return redirect_to admin_path, alert: alert
+      end
 
       recipient_count = recipients.count
       sent = deliver_broadcast(recipients, subject, body)
@@ -132,7 +152,7 @@ module Bible270
 
       if sent.zero?
         action = later ? 'queued' : 'sent'
-        return redirect_to admin_path, alert: "The message could not be #{action} to any readers."
+        return redirect_to admin_path, alert: "The message could not be #{action} to any #{noun.pluralize}."
       end
 
       Setting.write(LAST_BROADCAST_AT, Time.current.iso8601)
@@ -140,8 +160,8 @@ module Bible270
 
       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?
+      notice = "#{action} #{sent} #{noun.pluralize(sent)}."
+      notice += " #{failures} #{noun.pluralize(failures)} could not be #{later ? 'queued' : 'sent'}." if failures.positive?
       redirect_to admin_path, notice: notice
     end
 
@@ -285,6 +305,14 @@ module Bible270
       nil
     end
 
+    def broadcast_recipients(audience)
+      recipients = Reader.where.not(email: [nil, '']).order(:id)
+      return recipients if audience == 'everyone'
+
+      admin_ids = recipients.select { |reader| Bible270.config.admin?(reader) }.map(&:id)
+      recipients.where(id: admin_ids)
+    end
+
     def deliver_broadcast(recipients, subject, body)
       later = Bible270.config.registration_notice_deliver_later
       sent = 0

data/app/mailers/bible270/notice_mailer.rb

@@ -36,16 +36,19 @@ module Bible270
       deliver_comment_notice("#{@app_name}: #{@author.display_name} replied on day #{@comment.day}")
     end
 
-    def comment_posted(comment_id:, reader_id:)
-      return message.perform_deliveries = false unless prepare_comment_notice(comment_id, reader_id)
-      return message.perform_deliveries = false unless @reader.wants_all_comment_notifications?
-      return message.perform_deliveries = false if @comment.reader_id == @reader.id
+    def comment_posted(comment_id:, reader_ids:)
+      return message.perform_deliveries = false unless prepare_comment(comment_id)
+
+      addresses = all_comment_addresses(reader_ids)
+      return message.perform_deliveries = false if addresses.empty?
 
       kind = @comment.reply? ? 'reply' : 'reflection'
       @heading = "#{@author.display_name} posted a #{kind}"
       @introduction = "#{@author.display_name} posted a #{kind} on day #{@comment.day}."
       @reason = 'You are getting this because you asked to be emailed about every new reflection and reply.'
-      deliver_comment_notice("#{@app_name}: #{@author.display_name} posted a #{kind} on day #{@comment.day}")
+      mail bcc: addresses,
+           subject: "#{@app_name}: #{@author.display_name} posted a #{kind} on day #{@comment.day}",
+           template_name: 'comment_notice'
     end
 
     def daily_reminder(reader_id:, day:, on: Bible270.today)
@@ -108,13 +111,21 @@ module Bible270
     end
 
     def prepare_comment_notice(comment_id, reader_id)
-      return false unless Bible270.config.mention_notifications
+      return false unless prepare_comment(comment_id)
 
-      @comment = Comment.find_by(id: comment_id)
       @reader = Reader.find_by(id: reader_id)
-      return false if @comment.nil? || @reader.nil? || @reader.email.blank?
+      return false if @reader.nil? || @reader.email.blank?
       return false unless @reader.wants_comment_notifications?
 
+      true
+    end
+
+    def prepare_comment(comment_id)
+      return false unless Bible270.config.mention_notifications
+
+      @comment = Comment.find_by(id: comment_id)
+      return false if @comment.nil?
+
       @author = @comment.reader
       @app_name = Bible270.config.app_name
       @day_url = day_url_for(@comment.day)
@@ -122,6 +133,15 @@ module Bible270
       true
     end
 
+    def all_comment_addresses(reader_ids)
+      Reader.all_comment_notification_recipients
+        .where(id: Array(reader_ids))
+        .where.not(id: @comment.reader_id)
+        .pluck(:email)
+        .map(&:strip)
+        .uniq(&:downcase)
+    end
+
     def deliver_comment_notice(subject)
       mail to: @reader.email, subject: subject, template_name: 'comment_notice'
     end

data/app/models/bible270/comment.rb

@@ -205,9 +205,20 @@ module Bible270
     end
 
     def notify_all_comment_readers(except: [])
-      Reader.all_comment_notification_recipients.where.not(id: except).find_each do |recipient|
-        deliver_comment_notice(recipient, :comment_posted)
+      recipient_ids = Reader.all_comment_notification_recipients.where.not(id: except).pluck(:id)
+      return if recipient_ids.empty?
+
+      notice = NoticeMailer.comment_posted(comment_id: id, reader_ids: recipient_ids)
+      if Bible270.config.registration_notice_deliver_later
+        notice.deliver_later
+      else
+        notice.deliver_now
       end
+    rescue StandardError => e
+      Rails.logger.error(
+        "[bible270] could not send comment_posted notice for comment #{id} " \
+        "to #{recipient_ids&.size || 0} readers: #{e.class}: #{e.message}"
+      )
     end
 
     def reply_notification_reader

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

@@ -63,6 +63,18 @@
 </div>
 
 <% if @readers.any? %>
+  <div class="b270-admin-reader-tools">
+    <%= form_with url: admin_path, method: :get, class: "b270-admin-reader-sort" do %>
+      <label>
+        <span>Sort readers by</span>
+        <%= select_tag :sort, options_for_select(@reader_sort_options.map { |value, label| [label, value] }, @reader_sort) %>
+      </label>
+      <%= submit_tag "Sort", class: "b270-btn" %>
+    <% end %>
+    <button type="button" class="b270-btn b270-reader-stats-open" aria-haspopup="dialog"
+            aria-controls="b270-reader-stats-dialog" data-b270-reader-stats-open hidden>Reader Stats</button>
+  </div>
+
   <div class="b270-list">
     <% @readers.each do |reader| %>
       <div class="b270-li">
@@ -84,27 +96,73 @@
       </div>
     <% end %>
   </div>
+
+  <dialog id="b270-reader-stats-dialog" class="b270-reader-stats-dialog"
+          aria-labelledby="b270-reader-stats-title" data-b270-reader-stats-dialog>
+    <div class="b270-reader-stats-content">
+      <div class="b270-reader-stats-head">
+        <h2 id="b270-reader-stats-title" class="b270-subhead">Reader Stats</h2>
+        <form method="dialog"><button type="submit" class="b270-linkbtn">Close</button></form>
+      </div>
+      <pre><%= @reader_report.to_table %></pre>
+    </div>
+  </dialog>
+
+  <script nonce="<%= content_security_policy_nonce %>">
+    (() => {
+      function scan() {
+        document.querySelectorAll("[data-b270-reader-stats-open]").forEach((button) => {
+          const dialog = document.getElementById(button.getAttribute("aria-controls"));
+          if (dialog && typeof dialog.showModal === "function") button.hidden = false;
+        });
+      }
+
+      if (window.Bible270ReaderStats) {
+        scan();
+        return;
+      }
+
+      document.addEventListener("click", (event) => {
+        const target = event.target;
+        const openButton = target.closest && target.closest("[data-b270-reader-stats-open]");
+        if (openButton) {
+          const dialog = document.getElementById(openButton.getAttribute("aria-controls"));
+          if (dialog && typeof dialog.showModal === "function") dialog.showModal();
+          return;
+        }
+
+        if (target.matches && target.matches("[data-b270-reader-stats-dialog]")) target.close();
+      });
+      document.addEventListener("turbo:load", scan);
+      window.Bible270ReaderStats = { scan };
+      scan();
+    })();
+  </script>
 <% else %>
   <p style="color:var(--faint)">No readers yet.</p>
 <% end %>
 
 <div class="b270-panel">
-  <h2 class="b270-subhead">Write to everyone</h2>
+  <h2 class="b270-subhead">Write a message</h2>
 
   <% if @reachable.zero? %>
     <p class="b270-hint" style="margin-top:0">No reader has an email address yet.</p>
   <% else %>
     <p class="b270-hint" style="margin-top:0">
-      Goes to <strong><%= @reachable %></strong>
-      <%= @reachable == 1 ? 'reader' : 'readers' %> individually, not as one message with
-      everyone in bcc — so each is greeted by name.
+      <strong><%= pluralize(@reachable, 'reader') %></strong> can receive email,
+      including <strong><%= pluralize(@reachable_admins, 'admin') %></strong>.
+      Messages are sent individually so each recipient can be greeted by name.
       <% if @last_broadcast_at.present? %>
         <br>Last sent <%= b270_datetime(@last_broadcast_at) %><% if @last_broadcast_subject.present? %>: <em><%= @last_broadcast_subject %></em><% end %>.
       <% end %>
     </p>
 
     <%= form_with url: admin_broadcast_path, method: :post, class: "b270-form",
-          data: { turbo_confirm: "Send this to #{@reachable} #{@reachable == 1 ? 'reader' : 'readers'}?" } do %>
+          data: { turbo_confirm: "Send this message to the selected recipients?" } do %>
+      <div class="b270-broadcast-audience">
+        <label for="b270-broadcast-audience" class="b270-sr-only">Recipients</label>
+        <%= select_tag :audience, options_for_select([['Write to everyone', 'everyone'], ['Write to all admins', 'admins']], 'everyone'), id: 'b270-broadcast-audience', class: 'b270-select' %>
+      </div>
       <%= text_field_tag :subject, params[:subject], placeholder: "Subject", class: "b270-input" %>
       <%= text_area_tag :body, params[:body], placeholder: "What would you like to say?", rows: 6 %>
       <div class="row">

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

@@ -277,6 +277,7 @@
   .b270-input{width:100%;padding:9px 11px;border:1px solid var(--line);border-radius:9px;background:#fff;font:inherit;font-size:14px;margin-bottom:8px}
   .b270-form textarea{width:100%;font:inherit;font-size:15px;border:1px solid var(--line);border-radius:10px;padding:11px 13px;background:#fff;resize:vertical;min-height:76px}
   .b270-form textarea[data-b270-autosize=false]{min-height:114px}
+  .b270-broadcast-audience{margin:8px 0}
   .b270-editor-utilities[hidden]{display:none}
   .b270-editor-utilities{display:flex;align-items:center;justify-content:space-between;gap:12px;margin:0 2px 5px}
   .b270 .b270-editor-utility{padding:2px 0;border:0;background:transparent;color:var(--muted);font:inherit;font-size:12px;cursor:pointer}
@@ -313,6 +314,19 @@
   .b270-btn:hover{background:#3a352b}
 
   /* community */
+  .b270-admin-reader-tools{display:flex;align-items:flex-end;justify-content:flex-end;gap:8px;margin:0 0 10px;flex-wrap:wrap}
+  .b270-admin-reader-sort{display:flex;align-items:flex-end;gap:8px}
+  .b270-admin-reader-sort label{display:grid;gap:3px;font-size:11.5px;color:var(--muted)}
+  .b270-admin-reader-sort select{min-width:170px;padding:7px 25px 7px 9px;border:1px solid var(--line);border-radius:8px;background:#fff;color:var(--ink);font:inherit;font-size:12.5px}
+  .b270 .b270-admin-reader-sort .b270-btn,.b270 .b270-reader-stats-open{margin:0;padding:8px 13px;font-size:12.5px}
+  .b270-reader-stats-dialog{width:min(680px,calc(100vw - 28px));max-width:none;padding:0;border:1px solid var(--line);border-radius:14px;background:var(--card);color:var(--ink);box-shadow:0 18px 60px rgba(35,31,24,.35)}
+  .b270-reader-stats-dialog::backdrop{background:rgba(35,31,24,.55)}
+  .b270-reader-stats-content{padding:20px}
+  .b270-reader-stats-head{display:flex;align-items:center;justify-content:space-between;gap:16px;margin-bottom:12px}
+  .b270-reader-stats-head .b270-subhead{margin:0}
+  .b270-reader-stats-head form{margin:0}
+  .b270-reader-stats-head .b270-linkbtn{margin:0;color:var(--muted)}
+  .b270-reader-stats-dialog pre{max-height:65vh;overflow:auto;margin:0;padding:12px;border:1px solid var(--line-soft);border-radius:9px;background:#fff;color:var(--ink);font:12.5px/1.5 ui-monospace,SFMono-Regular,Menlo,Consolas,monospace}
   .b270-list{background:var(--card);border:1px solid var(--line);border-radius:14px;box-shadow:var(--shadow);overflow:hidden}
   .b270-li{display:flex;align-items:center;gap:14px;padding:14px 18px}
   .b270-li+.b270-li{border-top:1px solid var(--line-soft)}

data/lib/bible270/migration_reconciler.rb

@@ -227,7 +227,8 @@ module Bible270
       return missing if missing.any?
 
       column = connection.columns(:bible270_readers).find { |candidate| candidate.name == 'notify_on_all_comments' }
-      column&.default == true ? [] : ['column bible270_readers.notify_on_all_comments default true']
+      default = ActiveModel::Type::Boolean.new.cast(column&.default)
+      default == true ? [] : ['column bible270_readers.notify_on_all_comments default true']
     end
 
     # The Bible270 installer can install Active Storage for reader avatars. A

data/lib/bible270/reader_progress_report.rb

@@ -4,20 +4,24 @@ module Bible270
   # Builds the plain-text reader progress table used by administrative tasks.
   class ReaderProgressReport
     HEADERS = ['Name', 'Days Read', 'Status'].freeze
+    SORTS = %w[first_name last_name most_completed least_completed].freeze
+    DEFAULT_SORT = 'most_completed'
     Row = Struct.new(:name, :days_read, :status, keyword_init: true)
 
-    def initialize(readers: Reader.all, completed_days: Reader.completed_days_by_id)
+    def initialize(readers: Reader.all, completed_days: Reader.completed_days_by_id, sort: DEFAULT_SORT)
       @readers = readers
       @completed_days = completed_days
+      @sort = SORTS.include?(sort.to_s) ? sort.to_s : DEFAULT_SORT
+    end
+
+    def sorted_readers
+      @sorted_readers ||= readers.to_a.sort_by { |reader| reader_sort_key(reader) }
     end
 
     def rows
-      @rows ||= begin
-        report_rows = readers.map do |reader|
-          days_read = completed_days.fetch(reader.id, 0)
-          Row.new(name: reader.display_name, days_read: days_read, status: status(reader, days_read))
-        end
-        report_rows.sort_by { |row| [-row.days_read, row.name.downcase, row.name] }
+      @rows ||= sorted_readers.map do |reader|
+        days_read = completed_days.fetch(reader.id, 0)
+        Row.new(name: reader.display_name, days_read: days_read, status: status(reader, days_read))
       end
     end
 
@@ -36,7 +40,21 @@ module Bible270
 
   private
 
-    attr_reader :readers, :completed_days
+    attr_reader :readers, :completed_days, :sort
+
+    def reader_sort_key(reader)
+      case sort
+      when 'first_name'
+        [reader.sort_name, reader.id]
+      when 'last_name'
+        last_name = reader.last_name.presence || reader.display_name.to_s.split.last
+        [last_name.to_s.downcase, reader.sort_name, reader.id]
+      when 'least_completed'
+        [completed_days[reader.id].to_i, reader.sort_name, reader.id]
+      else
+        [-completed_days[reader.id].to_i, reader.sort_name, reader.id]
+      end
+    end
 
     def status(reader, days_read)
       calendar_day = reader.calendar_day

data/lib/bible270/version.rb

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

metadata

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