bible270 0.15.2 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30168f88726808151fb47d82b1ccca08afdbdec56f1005d41d64575d85e21384
-  data.tar.gz: 9e63ced217294948d3e9e248ca0fc88da6b6be56e5d1b7988ac0b999661024a4
+  metadata.gz: 3190cb926559301bfff8450c5e4f3d32867d84528c795782f33786c8f49b5a9f
+  data.tar.gz: df04e7e7a97b995c86c3440a81bea7db90360617cb990bc60975aca5d11e1669
 SHA512:
-  metadata.gz: 0b01ce5346e5a2689c8a203f2962edc2a6b826ebcab1952a0a44a1ffcfe43a56b570c7f3c3806da442c822e6b58d7bc409708e9f2f507fb387df9d628f05d776
-  data.tar.gz: 132d37fcdaa158e96a3e293ab293cb5934064c1514736df913743189b24cf75bacd980b2b333b0ea71407a629e4edbbf15faf289ad59c8f4533b914d2946ea23
+  metadata.gz: a535dc114386b817d3e501ebb363d52f5898e8d99b10212a414c0bb760fb1f707cc09ed24298ffbeccc7e648f87ee9afadedd2bdcf0951253a3e8aa6d3348bda
+  data.tar.gz: 66b8697402e10bfd1ac99b6aa3b08728a1116521d93dbfbb41ecd2e979b7f34682f185786f27d5a23c154d892470ec679b3e596d01c220da99764fc545e361e6

data/CHANGELOG.md

@@ -6,7 +6,58 @@ 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.16.0...main)**
+
+## [0.16.0] - 2026-08-05
+
+### Added
+
+- threaded replies to reflections
+- 'at' mention replies email notify writer of original reflection
+
+**[Full Changelog](https://github.com/avonderluft/bible270/compare/v0.15.3...v0.16.0)**
+
+## [0.15.3] - 2026-08-04
+
+**[Full Changelog](https://github.com/avonderluft/bible270/compare/v0.15.2...v0.15.3)**
+
+### 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
 
@@ -208,7 +259,6 @@ Nothing consequential.
 - Posting a reflection about the whole day failed with "Track is not included in the list": the
   form's blank option submits an empty string, which `allow_nil` rejects. Blank tracks are now
   normalised to NULL before validation.
-
 - `config.email_sign_in_log_link` — tri-state: nil logs the sign-in link in development and test
   only, true forces it on (for smoke-testing a production build locally before mail is wired up),
   false disables it. The log also distinguishes sent, rate-limited and failed delivery, which the
@@ -226,7 +276,7 @@ Nothing consequential.
 
 ### Changed
 
-* **The New Testament now has a reading every day — no days off.** 260 chapters over 270 days is reconciled by dividing the 10 longest chapters in two: Luke 1, Matthew 26 and 27, Mark 14, Luke 9, 12 and 22, John 6 and 8, and Acts 7. Luke 1 reads as 1–40 then 41–80. This drops the longest NT reading from 80 verses to 58 (stdev 14.6 → 11.4) and removes the 10 rest days from 0.8.0, so all three tracks are present on all 270 days and every day needs three check-offs.
+* The New Testament now has a reading every day — no days off.
 * The daily total is now 76–175 verses (was 76–203), averaging ~119.
 
 ### Added
@@ -252,11 +302,7 @@ This is the initial public release.
 * A pure, deterministic Ruby schedule; the database stores readers, check-offs, and comments rather than plan rows.
 * `Bible270::Versification`, providing per-chapter verse counts for all 66 books, generated from a public-domain KJV text and validated against canonical anchors.
 * Verse-balanced daily portions rather than chapter-count balancing, so daily reading time is approximately even.
-* Old Testament days grouped to be even in verses, averaging approximately 73 verses per day.
 * Per-track progress bars based on days read rather than chapter totals.
-* The New Testament read twice, with each pass occupying half of the 270-day plan. Whole chapters are verse-balanced within each pass.
-* A Psalms/Proverbs companion plan resolving to exactly 135 portions, making two complete passes across the 270-day plan.
-* Chapters are generally kept whole; Psalm 119 is divided into two readings, while shorter chapters may be combined with a neighboring psalm.
 * Configurable start dates through `config.start_date` and `config.allow_reader_start_date`, including per-reader date management.
 * Calendar mapping functions on `Bible270::Plan`: `date_for`, `day_for`, `end_date_for`, `before_start?`, `after_end?`, and `to_date`.
 * Calendar-aware day pages, including a **Today** badge, a **Go to today** link, and a pace indicator.
@@ -279,17 +325,13 @@ This is the initial public release.
 * Configuration-driven engine mounting and OmniAuth path prefixes.
 * `spec.email` in the gemspec.
 * Gem metadata pointing to the actual repository for `source_code_uri`, `bug_tracker_uri`, and `changelog_uri`.
-* RubyGems MFA requirement through `rubygems_mfa_required`.
-* This changelog, packaged with the gem.
 * Compatibility notes and tests covering Ruby 4.0 changes, including removal of the `cgi` dependency.
 
 ### Changed
 
 * The project was renamed from `bible_reading_plan` to `bible270`, including the `Bible270` module, database tables, migrations, CSS and helper prefixes, install task, and engine name.
 * The install generator defaults to `/daily-bread`, writes the mount path into the engine initializer, and emits configuration-driven `mount` and `path_prefix` lines.
-* The README documents the mount point, initializer load-order requirements, OAuth callback URLs, and CMS links that may need updating when the mount path changes.
 * The engine's sign-in paths follow the mount point at runtime through `request.script_name`.
-* Author and copyright information now read “Andrew vonderLuft”.
 * The display-name-from-email example uses a neutral address.
 * `sign_out` is `DELETE` only.
 * Guarded actions redirect to the sign-in page.
@@ -306,17 +348,17 @@ This is the initial public release.
 * Ruby 4.0 compatibility issues caused by the removed `cgi` default gem.
 * Progress bars that could not reach the correct totals because they compared checked days with chapter totals.
 
-### Breaking Changes
-
-* The project was renamed from `bible_reading_plan` to `bible270`; this is a fresh install rather than an in-place upgrade because database table names changed.
-* The New Testament schedule changed from a single pass to two verse-balanced passes.
-* The Psalms/Proverbs schedule changed to two complete 135-portion passes.
-* Calendar and reading-plan behavior is based on day numbers rather than stored plan rows.
-
 ### Requirements
 
 * 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.16.0]: https://github.com/avonderluft/bible270/releases/tag/v0.16.0
+[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/app/controllers/bible270/admin_controller.rb

@@ -44,7 +44,7 @@ module Bible270
     # Everything is visible by default; this lists it all so anything unsuitable
     # can be taken down.
     def comments
-      scope = Comment.includes(:reader).order(created_at: :desc)
+      scope = Comment.includes(:reader, parent: :reader).order(created_at: :desc)
       @filter = params[:filter].to_s
       scope = scope.hidden if @filter == 'hidden'
       scope = scope.approved if @filter == 'visible'

data/app/controllers/bible270/application_controller.rb

@@ -2,6 +2,12 @@
 
 module Bible270
   class ApplicationController < Bible270.config.parent_controller.constantize
+    # The long-lived sign-in cookie. private_constant rather than sitting below
+    # `private`, which does not apply to constants — rubocop is right that the
+    # placement said something it could not do.
+    REMEMBER_COOKIE = :bible270_remember
+    private_constant :REMEMBER_COOKIE
+
     # Rails only auto-includes an isolated engine's helpers when the controller's
     # superclass is *exactly* ActionController::Base:
     #
@@ -22,8 +28,6 @@ module Bible270
 
     helper_method :current_reader, :signed_in?, :b270_config, :enrollment_closed?
 
-    REMEMBER_COOKIE = :bible270_remember
-
   private
 
     def bible270_layout
@@ -67,6 +71,12 @@ module Bible270
       # Re-establish the session so the rest of the request behaves as normal.
       session[:bible270_reader_id] = reader.id
       reader
+    rescue StandardError => e
+      # A cookie is attacker-supplied input: a damaged or forged one must sign
+      # nobody in, and must never take the site down. Anything unexpected here is
+      # treated as "not remembered", and the cookie is dropped.
+      Rails.logger.warn("[bible270] ignoring an unusable remember cookie: #{e.class}: #{e.message}")
+      forget_reader!
     end
 
     # Encrypted, so the payload can be neither read nor forged by the client.

data/app/controllers/bible270/comments_controller.rb

@@ -44,7 +44,7 @@ module Bible270
   private
 
     def comment_params
-      params.require(:comment).permit(:body, :track)
+      params.require(:comment).permit(:body, :track, :parent_id)
     end
   end
 end

data/app/controllers/bible270/days_controller.rb

@@ -24,8 +24,11 @@ module Bible270
       redirect_to(root_path, alert: 'That day is outside the plan.') and return unless Plan.valid_day?(@day)
 
       @readings   = Plan.readings_for(@day)
-      @comments   = Comment.for_day(@day).includes(:reader)
-      @new_comment = Comment.new(day: @day)
+      @comments   = Comment.threads_for_day(@day)
+      # Replying prefills the form with the handle rather than needing JavaScript,
+      # so it works with Turbo and without an asset pipeline.
+      parent = reply_parent
+      @new_comment = Comment.new(day: @day, parent_id: parent&.id, body: reply_prefix(parent))
       @reader_tracks = current_reader ? current_reader.read_tracks_for(@day) : []
 
       # Every box on the day, not every track: an Old Testament reading of three
@@ -41,5 +44,24 @@ module Bible270
       @prev_day = @day > 1 ? @day - 1 : nil
       @next_day = @day < Plan::DAYS ? @day + 1 : nil
     end
+
+  private
+
+    # "@handle " for the reflection being replied to, or nothing. Private, but
+    # declared with the keyword rather than trailing the file, so it is obvious
+    # this is not an action.
+    # The reflection being replied to, if the link carried one and it is a
+    # top-level reflection: a reply to a reply is not allowed.
+    def reply_parent
+      parent = Comment.approved.find_by(id: params[:reply_to])
+      parent if parent && parent.day == @day && parent.parent_id.nil?
+    end
+
+    # "@handle " so the author is mentioned — and so gets the email — without the
+    # reader having to type it.
+    def reply_prefix(parent)
+      handle = parent&.reader&.mention_handle
+      handle ? "@#{handle} " : nil
+    end
   end
 end

data/app/controllers/bible270/profiles_controller.rb

@@ -12,6 +12,10 @@ module Bible270
 
     def update
       problems = []
+      # A checkbox sends nothing when unticked, so absence means off. Set before
+      # the name check, so the preference is saved even if a name is rejected.
+      current_reader.update_column(:notify_on_mention, params[:notify_on_mention].present?)
+
       problems << 'both a first and last name' unless current_reader.update_names(params[:first_name],
                                                                                   params[:last_name])
       if params[:bible_version].present? && !current_reader.update_bible_version(params[:bible_version])

data/app/helpers/bible270/plan_helper.rb

@@ -53,6 +53,38 @@ module Bible270
 
     # 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.
+    # Renders "@handle" as a link to that reader. An unresolved or ambiguous handle
+    # is left as plain text, which is how a writer discovers it found nobody.
+    #
+    # Built by walking the matches and escaping everything between them, rather
+    # than escaping afterwards: the body is reader-supplied, so the only safe
+    # construction is one where every non-link fragment is escaped by hand.
+    def b270_with_mentions(body)
+      text = body.to_s
+      readers = Bible270::Reader.mentioned_in(text)
+
+      pieces = []
+      cursor = 0
+
+      text.to_enum(:scan, Bible270::Mentions::PATTERN).each do
+        match = Regexp.last_match
+        pieces << ERB::Util.html_escape(text[cursor...match.begin(0)])
+
+        handle = Bible270::Mentions.normalize(match[1])
+        reader = readers.find { |candidate| candidate.answers_to?(handle) }
+        pieces << if reader
+                    link_to(match[0], reader_path(reader), class: 'b270-mention')
+                  else
+                    ERB::Util.html_escape(match[0])
+                  end
+
+        cursor = match.end(0)
+      end
+
+      pieces << ERB::Util.html_escape(text[cursor..].to_s)
+      safe_join(pieces)
+    end
+
     def b270_mark(size: 38)
       configured = Bible270.config.header_mark
       return nil if configured == false

data/app/mailers/bible270/notice_mailer.rb

@@ -5,19 +5,47 @@ module Bible270
   class NoticeMailer < ApplicationMailer
     def new_reader(reader_id:, recipients:)
       @reader = Reader.find_by(id: reader_id)
-      return message.perform_deliveries = false if @reader.nil? || recipients.blank?
+      # Blanks dropped rather than trusting the caller: ['']  is not blank — a
+      # one-element array never is — so it would otherwise have been sent to an
+      # empty address, which fails at the SMTP server rather than here.
+      addresses = Array(recipients).map { |address| address.to_s.strip }.reject(&:empty?)
+      return message.perform_deliveries = false if @reader.nil? || addresses.empty?
 
       @app_name = Bible270.config.app_name
       @total = Reader.count
       @admin_url = admin_url_for(@reader)
 
-      mail to: recipients, subject: "#{@app_name}: #{@reader.display_name} has joined"
+      mail to: addresses, subject: "#{@app_name}: #{@reader.display_name} has joined"
+    end
+
+    def mentioned(comment_id:, reader_id:)
+      @comment = Comment.find_by(id: comment_id)
+      @reader = Reader.find_by(id: reader_id)
+      return message.perform_deliveries = false if @comment.nil? || @reader.nil? || @reader.email.blank?
+
+      @author = @comment.reader
+      @app_name = Bible270.config.app_name
+      @day_url = day_url_for(@comment.day)
+
+      mail to: @reader.email,
+           subject: "#{@app_name}: #{@author.display_name} mentioned you on day #{@comment.day}"
     end
 
   private
 
     # A mailer has no request, so the host is config.mailer_host or nothing. No
     # link is better than a broken one.
+    def day_url_for(day)
+      host = Bible270.config.mailer_host
+      return nil if host.blank?
+
+      Bible270::Engine.routes.url_helpers.day_url(
+        day, host: host, protocol: host.start_with?('localhost') ? 'http' : 'https'
+      )
+    rescue StandardError
+      nil
+    end
+
     def admin_url_for(reader)
       host = Bible270.config.mailer_host
       return nil if host.blank?

data/app/models/bible270/comment.rb

@@ -7,6 +7,12 @@ module Bible270
 
     belongs_to :reader, class_name: 'Bible270::Reader'
 
+    # One level of replies. dependent: :destroy, because a reply to a deleted
+    # reflection has nothing left to answer.
+    belongs_to :parent, class_name: 'Bible270::Comment', optional: true
+    has_many :replies, class_name: 'Bible270::Comment', foreign_key: :parent_id,
+                       dependent: :destroy, inverse_of: :parent
+
     validates :day, inclusion: { in: 1..Plan::DAYS }
     validates :body, presence: true, length: { maximum: 4000 }
     # A reflection can be about one track or about the whole day. The form's
@@ -16,16 +22,29 @@ module Bible270
     before_validation :normalize_track
 
     validates :track, inclusion: { in: Plan::TRACKS.keys }, allow_blank: true
+    validate :parent_is_a_top_level_reflection
+    validate :parent_is_on_the_same_day
+
+    # Fires once the reflection is really saved, so nothing is sent for one whose
+    # transaction rolls back.
+    after_create_commit :notify_mentioned_readers
 
     scope :approved, -> { where(approved: true) }
     scope :hidden,   -> { where(approved: false) }
-    scope :for_day,  ->(d) { approved.where(day: d).order(created_at: :asc) }
-    scope :recent,   -> { approved.order(created_at: :desc) }
+    # Only the reflections themselves: replies are rendered under their parent, so
+    # listing them again at the top level would show each twice.
+    scope :for_day,  ->(d) { approved.where(day: d, parent_id: nil).order(created_at: :asc) }
+    scope :threads_for_day, ->(d) { for_day(d).includes(:reader, replies: :reader) }
+    scope :recent, -> { approved.order(created_at: :desc) }
 
     # Every reflection is visible when written; these are the moderation actions.
     def hide!    = update!(approved: false, moderated_at: Time.current)
     def unhide!  = update!(approved: true,  moderated_at: Time.current)
     def hidden?  = !approved
+    def reply?   = parent_id.present?
+
+    # Visible replies, oldest first: a conversation reads forwards.
+    def visible_replies = replies.approved.order(created_at: :asc)
     def moderated? = moderated_at.present?
 
   private
@@ -33,5 +52,36 @@ module Bible270
     def normalize_track
       self.track = Plan.normalize_track(track)
     end
+
+    # A reply to a reply would make a tree, and with it the questions of how deep
+    # to indent and what hiding a middle node means. One level avoids all of that.
+    def parent_is_a_top_level_reflection
+      return if parent.nil?
+      return if parent.parent_id.nil?
+
+      errors.add(:parent, 'is itself a reply')
+    end
+
+    def parent_is_on_the_same_day
+      return if parent.nil? || parent.day == day
+
+      errors.add(:parent, "is on day #{parent.day}, not #{day}")
+    end
+
+    # A mention emails the person named. Failures are logged rather than raised:
+    # nobody should lose a reflection because the mail server is down.
+    def notify_mentioned_readers
+      return unless Bible270.config.mention_notifications
+
+      Reader.mentioned_in(body).each do |mentioned|
+        next if mentioned.id == reader_id
+        next unless mentioned.wants_mention_notices?
+
+        notice = NoticeMailer.mentioned(comment_id: id, reader_id: mentioned.id)
+        Bible270.config.registration_notice_deliver_later ? notice.deliver_later : notice.deliver_now
+      end
+    rescue StandardError => e
+      Rails.logger.error("[bible270] could not send mention notices for comment #{id}: #{e.class}: #{e.message}")
+    end
   end
 end

data/app/models/bible270/reader.rb

@@ -144,6 +144,48 @@ module Bible270
       display_name.to_s.strip.downcase
     end
 
+    # ---- mentions ----------------------------------------------------------
+
+    # The handle to write when mentioning this reader: their first name, unless
+    # someone else shares it, in which case first.last.
+    def mention_handle
+      first = first_name.presence || display_name.to_s.split.first
+      return nil if first.blank?
+
+      Mentions.preferred_handle(first, last_name, ambiguous: self.class.shared_first_name?(first, self))
+    end
+
+    def self.shared_first_name?(first, except = nil)
+      scope = where('LOWER(first_name) = ?', first.to_s.downcase)
+      scope = scope.where.not(id: except.id) if except&.id
+      scope.exists?
+    end
+
+    # The readers a piece of text mentions. A handle matching more than one reader
+    # resolves to nobody: mailing the wrong person is worse than mailing none, and
+    # the writer sees the mention left unlinked.
+    def self.mentioned_in(text)
+      handles = Mentions.extract(text)
+      return [] if handles.empty?
+
+      candidates = where.not(first_name: [nil, '']).to_a
+      handles.filter_map do |handle|
+        matches = candidates.select { |reader| reader.answers_to?(handle) }
+        matches.first if matches.one?
+      end.uniq
+    end
+
+    def answers_to?(handle)
+      Mentions.handles_for(first_name, last_name).include?(handle)
+    end
+
+    def wants_mention_notices?
+      return false if email.blank?
+      return true unless respond_to?(:notify_on_mention)
+
+      notify_on_mention != false
+    end
+
     # ---- staying signed in -------------------------------------------------
 
     # Generated on first use rather than at sign-up, so readers who never stay
@@ -348,7 +390,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)
 
@@ -406,7 +448,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".
@@ -425,15 +467,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
@@ -492,7 +534,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/admin/comments.html.erb

@@ -19,6 +19,7 @@
           <strong><%= comment.reader.display_name %></strong>
           · <%= link_to "day #{comment.day}", day_path(comment.day) %>
           · <%= comment.created_at.strftime('%b %-d, %Y') %>
+          <% if comment.reply? %>· reply to <strong><%= comment.parent&.reader&.display_name || 'a deleted reflection' %></strong><% end %>
           <% if comment.hidden? %><span class="b270-badge">Hidden</span><% end %>
         </div>
         <p class="b270-cbody"><%= comment.body %></p>

data/app/views/bible270/comments/_comment.html.erb

@@ -1,5 +1,6 @@
-<div class="b270-comment" id="comment-<%= comment.id %>">
-  <%= b270_avatar(comment.reader) %>
+<%# locals: (comment:, reply: false) %>
+<div class="b270-comment <%= 'b270-reply' if reply %>" id="comment-<%= comment.id %>">
+  <%= b270_avatar(comment.reader, size: reply ? 28 : 34) %>
   <div style="flex:1">
     <div class="b270-cmeta">
       <strong><%= link_to comment.reader.display_name, reader_path(comment.reader), style: "text-decoration:none" %></strong>
@@ -10,6 +11,23 @@
               form: { style: "display:inline", data: { turbo_stream: true } } %>
       <% end %>
     </div>
-    <p class="b270-cbody"><%= comment.body %></p>
+
+    <p class="b270-cbody"><%= b270_with_mentions(comment.body) %></p>
+
+    <%# Only a top-level reflection can be replied to: one level deep, so a reply
+        offers no Reply of its own. %>
+    <% unless reply %>
+      <% if signed_in? && comment.reader_id != current_reader.id %>
+        <div class="b270-creply">
+          <%= link_to "Reply", day_path(comment.day, reply_to: comment.id, anchor: "new_comment_form"),
+                class: "b270-linkbtn" %>
+        </div>
+      <% end %>
+
+      <div class="b270-replies" id="replies-<%= comment.id %>">
+        <%= render partial: "bible270/comments/comment",
+              collection: comment.visible_replies, as: :comment, locals: { reply: true } %>
+      </div>
+    <% end %>
   </div>
 </div>

data/app/views/bible270/comments/_form.html.erb

@@ -3,7 +3,14 @@
   <% if comment.errors.any? %>
     <p style="color:var(--oxblood);font-size:13px"><%= comment.errors.full_messages.to_sentence %></p>
   <% end %>
-  <%= f.text_area :body, placeholder: "Share a reflection on today's reading…" %>
+  <% if comment.parent_id.present? && (parent = Bible270::Comment.find_by(id: comment.parent_id)) %>
+    <p class="b270-replying">
+      Replying to <strong><%= parent.reader.display_name %></strong>
+      · <%= link_to "cancel", day_path(day, anchor: "new_comment_form") %>
+    </p>
+  <% end %>
+  <%= f.hidden_field :parent_id %>
+  <%= f.text_area :body, placeholder: comment.parent_id.present? ? "Write your reply…" : "Share a reflection on today's reading…" %>
   <div class="row">
     <%= f.select :track,
           options_for_select([["The whole day", ""]] + Bible270::Plan::TRACKS.map { |k, v| [v[:label], k] }),

data/app/views/bible270/comments/create.turbo_stream.erb

@@ -1,7 +1,16 @@
 <%= turbo_stream.remove "no_comments" %>
-<%= turbo_stream.append "comments" do %>
-  <%= render partial: "bible270/comments/comment", locals: { comment: @comment } %>
+
+<%# A reply belongs under its parent; a new reflection goes at the end. %>
+<% if @comment.reply? %>
+  <%= turbo_stream.append "replies-#{@comment.parent_id}" do %>
+    <%= render partial: "bible270/comments/comment", locals: { comment: @comment, reply: true } %>
+  <% end %>
+<% else %>
+  <%= turbo_stream.append "comments" do %>
+    <%= render partial: "bible270/comments/comment", locals: { comment: @comment, reply: false } %>
+  <% end %>
 <% end %>
+
 <%= turbo_stream.replace "new_comment_form" do %>
   <%= render "bible270/comments/form", day: @day, comment: Bible270::Comment.new(day: @day) %>
 <% end %>

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/notice_mailer/mentioned.html.erb

@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html>
+  <body style="margin:0;padding:24px;background:#ece6da;font-family:-apple-system,Segoe UI,Roboto,Helvetica,Arial,sans-serif;color:#231f18">
+    <div style="max-width:520px;margin:0 auto;background:#f4efe6;border:1px solid #d7cfbf;border-radius:14px;padding:28px">
+      <h1 style="margin:0 0 6px;font-family:Georgia,serif;font-size:20px;font-weight:600">
+        <%= @author.display_name %> mentioned you
+      </h1>
+      <p style="margin:0 0 18px;font-size:14px;color:#6d6558">
+        Day <%= @comment.day %> · <%= @app_name %>
+      </p>
+
+      <blockquote style="margin:0;padding:14px 16px;background:#ece6da;border-left:3px solid #a5812c;border-radius:8px;font-size:15px;line-height:1.55">
+        <%= simple_format(@comment.body) %>
+      </blockquote>
+
+      <% if @day_url %>
+        <p style="margin:20px 0 0">
+          <a href="<%= @day_url %>" style="display:inline-block;background:#231f18;color:#ece6da;text-decoration:none;padding:10px 18px;border-radius:10px;font-weight:600;font-size:14px">Read it and reply</a>
+        </p>
+      <% end %>
+
+      <p style="margin:22px 0 0;font-size:12px;color:#9a9082">
+        You are getting this because someone wrote your name in a reflection.
+        You can turn these off on your profile page.
+      </p>
+    </div>
+  </body>
+</html>

data/app/views/bible270/notice_mailer/mentioned.text.erb

@@ -0,0 +1,12 @@
+<%= @author.display_name %> mentioned you in a reflection on day <%= @comment.day %>.
+
+<%= @comment.body %>
+
+<% if @day_url %>
+Read it and reply: <%= @day_url %>
+<% else %>
+You can find it on day <%= @comment.day %> of <%= @app_name %>.
+<% end %>
+--
+You are getting this because someone wrote your name in a reflection. You can
+turn these off on your profile page.

data/app/views/bible270/profiles/edit.html.erb

@@ -19,6 +19,11 @@
       <% end %>
     </div>
 
+    <label class="b270-field" style="flex-direction:row;align-items:center;gap:10px">
+      <%= check_box_tag :notify_on_mention, "1", current_reader.notify_on_mention %>
+      <span style="margin:0">Email me when someone mentions me in a reflection</span>
+    </label>
+
     <label class="b270-field">
       <span>First name</span>
       <%= text_field_tag :first_name, @names[:first_name], required: true, autocomplete: "given-name" %>

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

@@ -4,7 +4,7 @@
     --line:#d7cfbf; --line-soft:#e2dbcd; --teal:#2f6a67; --oxblood:#8a2f3b; --gold:#a5812c;
     --gold-lite:#c6a24a; --shadow:0 1px 0 rgba(35,31,24,.04),0 10px 30px -18px rgba(35,31,24,.35);
     margin:0; background:radial-gradient(120% 80% at 100% 0%,rgba(165,129,44,.06),transparent 55%),var(--paper);
-    color:var(--ink); font-family:"Inter",system-ui,sans-serif; line-height:1.5; -webkit-font-smoothing:antialiased;
+    color:var(--ink); font-family:"Inter",system-ui,sans-serif; line-height:1.2; -webkit-font-smoothing:antialiased;
   }
   .b270 *{box-sizing:border-box}
   /* Blanket anchor colour. NB: this is (0,1,1), so any single-class rule
@@ -151,6 +151,17 @@
   .b270-comment:first-child{border-top:none}
   .b270-cmeta{font-size:13px;color:var(--muted)}
   .b270-cmeta strong{color:var(--ink)}
+  /* Replies sit indented under their parent, with a rule down the left so a
+     thread reads as one block rather than a run of separate reflections. */
+  .b270-replies{margin:10px 0 0}
+  .b270-replies:empty{margin:0}
+  .b270-comment.b270-reply{padding:10px 0 0 16px;border-top:none;border-left:2px solid var(--line-soft);gap:10px}
+  .b270-comment.b270-reply .b270-cbody{font-size:14.5px}
+  .b270-replying{margin:0 0 8px;font-size:13px;color:var(--muted)}
+  .b270-replying strong{color:var(--ink)}
+  .b270-mention{color:var(--teal);font-weight:600;text-decoration:none}
+  .b270-mention:hover{text-decoration:underline}
+  .b270-creply{margin-top:6px}
   .b270-cbody{margin:3px 0 0;white-space:pre-wrap}
   .b270-cdel{font-size:12px;color:var(--oxblood);background:none;border:none;cursor:pointer;padding:0;margin-left: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}

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/db/migrate/20260101000011_add_mention_notices_to_bible270_readers.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class AddMentionNoticesToBible270Readers < ActiveRecord::Migration[7.0]
+  # Being emailed because someone typed your name is the sort of thing people
+  # want to switch off, so it is a per-reader setting rather than a site-wide one.
+  # Default true: a mention nobody hears about is not much use.
+  def change
+    add_column :bible270_readers, :notify_on_mention, :boolean, null: false, default: true
+  end
+end

data/db/migrate/20260101000012_add_parent_to_bible270_comments.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class AddParentToBible270Comments < ActiveRecord::Migration[7.0]
+  # Replies. One level only: a reply cannot itself be replied to, which keeps the
+  # rendering and the moderation story simple — a thread is a reflection and the
+  # answers to it, not a tree.
+  def change
+    add_reference :bible270_comments, :parent, null: true, index: { name: 'idx_b270_comments_parent' },
+                                               foreign_key: { to_table: :bible270_comments }
+  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, :remember_for, :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
@@ -321,7 +321,17 @@ module Bible270
     # 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.
-    attr_accessor :header_mark
+    # 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
+
+    # Email a reader when someone writes "@them" in a reflection. Readers can opt
+    # out individually on their profile; this switches the whole feature off.
+    attr_accessor :mention_notifications
 
     def remember_signed_in?
       remember_for.to_i.positive?
@@ -343,6 +353,8 @@ module Bible270
       end
       @app_name = 'Daily Bread'
       @tagline = 'Journeying through Scripture in 9 months'
+      @time_zone = nil
+      @mention_notifications = true
       @header_mark = nil
       @remember_for = 365 * 24 * 60 * 60
       @require_sign_in_to_participate = true

data/lib/bible270/mentions.rb

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+module Bible270
+  # Finding "@someone" in a reflection, and deciding who that is.
+  #
+  # There is no username field, so mentions match against the names readers
+  # already have. Two forms are accepted, both case-insensitively:
+  #
+  #   @andrew                 a first name
+  #   @andrew.vonderluft      first and last, joined by a dot
+  #
+  # A mention that matches more than one reader resolves to nobody. Guessing
+  # would mean mailing the wrong person, and silence is easier to notice than a
+  # misdelivered message: the writer sees their mention unlinked.
+  module Mentions
+    # Deliberately narrow: letters, digits, dots, hyphens and apostrophes, so
+    # "@andrew," and "@andrew." at the end of a sentence still work, and an email
+    # address in the body is not mistaken for a mention.
+    PATTERN = %r{(?<![\w@])@([\p{L}\p{N}][\p{L}\p{N}.'-]{0,60})}
+
+    MAX_PER_COMMENT = 10
+
+  module_function
+
+    # The handles written in a piece of text, normalised and de-duplicated.
+    def extract(text)
+      return [] if text.nil?
+
+      text.to_s.scan(PATTERN).flatten
+        .map { |handle| normalize(handle) }
+        .reject(&:empty?)
+        .uniq
+        .first(MAX_PER_COMMENT)
+    end
+
+    # Trailing punctuation is dropped so "@andrew." and "@andrew" agree.
+    def normalize(handle)
+      handle.to_s.downcase.gsub(%r{[^\p{L}\p{N}.'-]}, '').sub(%r{[.'-]+\z}, '')
+    end
+
+    # Every handle a reader answers to, given their names.
+    def handles_for(first_name, last_name)
+      first = normalize(first_name)
+      last  = normalize(last_name)
+      return [] if first.empty?
+
+      handles = [first]
+      handles << "#{first}.#{last}" unless last.empty?
+      handles.uniq
+    end
+
+    # The form to write when there is more than one reader with the same first
+    # name: the longer handle is unambiguous.
+    def preferred_handle(first_name, last_name, ambiguous: false)
+      handles = handles_for(first_name, last_name)
+      return nil if handles.empty?
+
+      ambiguous ? handles.last : handles.first
+    end
+
+    # Wraps each mention so a view can style it, leaving the text otherwise
+    # untouched. The block receives the handle and returns the replacement.
+    def highlight(text)
+      return text.to_s if text.nil?
+
+      text.to_s.gsub(PATTERN) do
+        handle = Regexp.last_match(1)
+        yield(normalize(handle), "@#{handle}")
+      end
+    end
+  end
+end

data/lib/bible270/version.rb

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

data/lib/bible270.rb

@@ -1,9 +1,12 @@
 # frozen_string_literal: true
 
+require 'date'
+
 require 'bible270/version'
 require 'bible270/plan'
 require 'bible270/email_sign_in'
 require 'bible270/names'
+require 'bible270/mentions'
 require 'bible270/avatars'
 require 'bible270/translations'
 require 'bible270/favicon'
@@ -11,4 +14,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.2
+  version: 0.16.0
 platform: ruby
 authors:
 - Andrew vonderLuft
@@ -110,6 +110,8 @@ files:
 - app/views/bible270/days/_start_date.html.erb
 - app/views/bible270/days/index.html.erb
 - app/views/bible270/days/show.html.erb
+- app/views/bible270/notice_mailer/mentioned.html.erb
+- app/views/bible270/notice_mailer/mentioned.text.erb
 - app/views/bible270/notice_mailer/new_reader.html.erb
 - app/views/bible270/notice_mailer/new_reader.text.erb
 - app/views/bible270/profiles/edit.html.erb
@@ -138,12 +140,15 @@ files:
 - 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
+- db/migrate/20260101000011_add_mention_notices_to_bible270_readers.rb
+- db/migrate/20260101000012_add_parent_to_bible270_comments.rb
 - lib/bible270.rb
 - lib/bible270/avatars.rb
 - lib/bible270/configuration.rb
 - lib/bible270/email_sign_in.rb
 - lib/bible270/engine.rb
 - lib/bible270/favicon.rb
+- lib/bible270/mentions.rb
 - lib/bible270/names.rb
 - lib/bible270/plan.rb
 - lib/bible270/translations.rb