bible270 1.6.2 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10dd20a51ceee2f549e465ad8826eaa1211c6722c08f2ecf6e81f5ec885eeb90
-  data.tar.gz: 598254caeb9eb32a2464663895c64ec0c3eec85cc98705b8da0ed05facb10141
+  metadata.gz: fcb72fefa9ed7c0dc470ac07e7cdd1a143e8376e2d08be4adcdcc18d9633a286
+  data.tar.gz: 651c9fdc0d0332d79e2cdc72f96ccdb0a1a8e22b6fafec398d62bc4f84f8c7b0
 SHA512:
-  metadata.gz: 3e587617e2a3d06e1e26cead51a0b96c87a6468b93e53bb03b60ab7a87931cc602f4b3ec5fb72c6b712a0b01a1dffc44a2d15422510e8064b7da881d44d9d31b
-  data.tar.gz: b64e61b9682538bf19be6aa6dc428ebc67b8e43808192e29fa6cb04aeac8747e6264ba320c18c6cdc800b6c7a14fafb6eafc1f352fbf7f55b4572248a1699922
+  metadata.gz: 326a54581672c51728662557d7fc7178ed1b4ce44c03e480ae09829790c8f457274504121d30ae1d816fb41cd7f00acbdaadf649d75e3e7a6283626556cec57a
+  data.tar.gz: 24335e6617785300b54733aff19f217bc1c85365282ff4798a6a5c5d04636f910e2d2d56f2e8895d2961c30c6e94873a64008de6ae7d7e27a80778312af62a60

data/CHANGELOG.md

@@ -4,7 +4,36 @@ All notable changes to bible270. Format follows [Keep a Changelog](https://keepa
 
 ## [Unreleased]
 
-**[Full Changelog](https://github.com/avonderluft/bible270/compare/v1.6.0...main)**
+### Added
+
+- show Blue Letter Bible Scripture popups when readers hover over references in rendered reflections, replies, and Markdown previews; popups follow each reader's selected translation, handle original-language choices by testament, and rescan content added by Turbo without forcing a page reload
+- let administrators sort the reader list and Reader Stats report by most or least recent reading activity, while keeping readers with no activity at the end
+
+**[Full Changelog](https://github.com/avonderluft/bible270/compare/v1.6.2...main)**
+
+## [1.6.2] - 2026-09-14
+
+### Fixed
+
+- keep ordered and unordered Markdown lists compact when writers leave blank lines between items, removing visible indentation and extra line-break artifacts from previews and rendered reflections
+
+**[Full Changelog](https://github.com/avonderluft/bible270/compare/v1.6.1...v1.6.2)**
+
+## [1.6.1] - 2026-09-14
+
+### Added
+
+- let administrators edit any reflection or reply inline while preserving its recorded author and retaining the existing restrictions for ordinary readers
+
+### Changed
+
+- select only the `list item` placeholder when inserting a list, and continue unordered or incrementing ordered list markers when the writer presses Enter
+
+### Fixed
+
+- render pasted `http://` and `https://` URLs as safe links in Markdown previews and displayed reflections without nesting explicit Markdown links or swallowing trailing punctuation
+
+**[Full Changelog](https://github.com/avonderluft/bible270/compare/v1.6.0...v1.6.1)**
 
 ## [1.6.0] - 2026-09-14
 
@@ -701,7 +730,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.6.0...HEAD
+[Unreleased]: https://github.com/avonderluft/bible270/compare/v1.6.2...HEAD
+[1.6.2]: https://github.com/avonderluft/bible270/releases/tag/v1.6.2
+[1.6.1]: https://github.com/avonderluft/bible270/releases/tag/v1.6.1
 [1.6.0]: https://github.com/avonderluft/bible270/releases/tag/v1.6.0
 [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

data/README.md

@@ -23,7 +23,7 @@ The schedule is pure deterministic Ruby (`Bible270::Plan`) — none of it is sto
 ## Requirements
 
 - **Ruby** >= 3.2. Plain Ruby, no C extensions. Runs on 4.0.6 — it avoids everything 4.0 dropped or unbundled (notably `cgi`; URL escaping uses `URI.encode_www_form_component`).
-- **Rails** >= 7.0. On Ruby 4.0 your host app is the real constraint, not this engine — check your lockfile with RailsBump first.
+- **Rails** >= 7.2. On Ruby 4.0 your host app is the real constraint, not this engine — check your lockfile with RailsBump first.
 - A host app, and Turbo if you want check-offs without a page reload.
 
 Mutation controls expose pending, success, and retry feedback when JavaScript runs, while ordinary HTML
@@ -507,6 +507,21 @@ dedicated browser tab so moving among the day's passages does not
 leave a trail of open tabs; Ctrl-click, Cmd-click, middle-click, and the browser's context menu still
 open additional tabs when a reader wants to compare passages.
 
+Rendered reflections and replies also use [Blue Letter Bible ScriptTagger](https://www.blueletterbible.org/webtools/BLB_ScriptTagger.cfm)
+to show Scripture text when a reader hovers over a reference. The popup follows that reader's selected
+translation (or the site default for a visitor); `HEB/GRK` and `ALLGRK` choose the appropriate original
+language separately for Old and New Testament references. The engine layout loads this automatically.
+If `config.layout` points to a host layout, render the integration once near the end of its `<body>`:
+
+```erb
+<%= render "bible270/shared/scripture_popups" %>
+```
+
+ScriptTagger loads JavaScript and CSS from Blue Letter Bible at runtime. A host with Content Security
+Policy enabled must allow `https://www.blueletterbible.org` in its existing `script-src` and `style-src`
+directives. This sends the visitor's IP address and normal request metadata to Blue Letter Bible when an
+engine page loads; hovering a reference also sends that reference and selected translation to BLB.
+
 ## With ComfortableMediaSurfer
 
 The CMS serves your content; this is a separate mounted app. Either **just link to it** (mount, add a nav link, done — the engine renders its own themed pages), or **match your chrome** by setting `config.parent_controller = "::ApplicationController"` and `config.layout = "layouts/application"` so it sits inside your header and footer. All engine CSS is prefixed `b270-`, so nothing collides.

data/app/controllers/bible270/admin_controller.rb

@@ -15,7 +15,9 @@ module Bible270
       'first_name' => 'First Name',
       'last_name' => 'Last Name',
       'most_completed' => 'Most days completed',
-      'least_completed' => 'Least days completed'
+      'least_completed' => 'Least days completed',
+      'most_recent_activity' => 'Most recent activity',
+      'least_recent_activity' => 'Least recent activity'
     }.freeze
 
     before_action :require_admin!
@@ -65,7 +67,14 @@ module Bible270
       @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.all.load
+      @recent_reader_activities = Checkoff.recent_activity_by_reader(readers.map(&:id))
+      @reader_report = ReaderProgressReport.new(
+        readers: readers,
+        completed_days: @days_completed,
+        recent_activities: @recent_reader_activities,
+        sort: @reader_sort
+      )
       @readers = @reader_report.sorted_readers
       @run_start_date = Setting.run_start_date
       @configured_start_date = Bible270.config.start_date

data/app/helpers/bible270/plan_helper.rb

@@ -181,6 +181,16 @@ module Bible270
       local&.strftime('%b %-d, %Y at %-I:%M %p')
     end
 
+    def b270_reader_activity_description(activity)
+      if activity.day_completed?
+        readings = Plan.readings_for(activity.day).values.compact.join(', ')
+        "completed Day #{activity.day} (#{readings})"
+      else
+        reference = Plan.parts_for(activity.day, activity.track).fetch(activity.part)
+        "checked off “#{reference}” for Day #{activity.day}"
+      end
+    end
+
     # Writers may revise their own words; administrators may also correct or
     # moderate any reflection without changing its recorded author.
     def b270_can_edit?(comment)

data/app/models/bible270/checkoff.rb

@@ -5,6 +5,8 @@ module Bible270
   class Checkoff < ApplicationRecord
     self.table_name = 'bible270_checkoffs'
 
+    RecentActivity = Struct.new(:occurred_at, :day, :track, :part, :day_completed?, keyword_init: true)
+
     belongs_to :reader, class_name: 'Bible270::Reader'
 
     validates :day, inclusion: { in: 1..Plan::DAYS }
@@ -14,6 +16,31 @@ module Bible270
     validate  :track_present_on_day
     validate  :part_within_reading
 
+    # The most recently created check-off still present for each reader. This uses
+    # three bulk queries regardless of the number of readers displayed in Admin.
+    def self.recent_activity_by_reader(reader_ids)
+      latest_ids = where(reader_id: reader_ids).group(:reader_id).maximum(:id).values
+      latest_checkoffs = where(id: latest_ids).index_by(&:reader_id)
+      day_counts = recent_activity_day_counts(latest_checkoffs.values)
+
+      latest_checkoffs.transform_values do |checkoff|
+        RecentActivity.new(
+          occurred_at: checkoff.created_at,
+          day: checkoff.day,
+          track: checkoff.track,
+          part: checkoff.part,
+          day_completed?: day_counts.fetch([checkoff.reader_id, checkoff.day], 0) >= Plan.total_parts(checkoff.day)
+        )
+      end
+    end
+
+    def self.recent_activity_day_counts(checkoffs)
+      return {} if checkoffs.empty?
+
+      where(reader_id: checkoffs.map(&:reader_id), day: checkoffs.map(&:day)).group(:reader_id, :day).count
+    end
+    private_class_method :recent_activity_day_counts
+
   private
 
     def track_present_on_day

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

@@ -89,6 +89,13 @@
             · <%= @days_completed[reader.id] %>/<%= Bible270::Plan::DAYS %> days
             <% if reader.dated? %>· started <%= reader.effective_start_date.strftime('%b %-d, %Y') %><% end %>
           </div>
+          <div class="sub b270-reader-activity">
+            <% if (activity = @recent_reader_activities[reader.id]) %>
+              <%= b270_date(activity.occurred_at) %>: <%= b270_reader_activity_description(activity) %>
+            <% else %>
+              No reading activity yet
+            <% end %>
+          </div>
         </div>
         <div class="stat">
           <span class="big"><%= (@days_completed[reader.id].to_f / Bible270::Plan::DAYS * 100).round %>%</span>

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

@@ -139,7 +139,9 @@
         if (!response.ok) throw new Error("Preview unavailable");
         return response.text();
       }).then((html) => {
+        preview.removeAttribute("data-b270-blb-tagged");
         preview.innerHTML = html;
+        window.Bible270ScripturePopups?.scan(preview);
       }).catch((error) => {
         if (error.name !== "AbortError") preview.textContent = "Preview unavailable. Return to Write and try again.";
       });

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

@@ -0,0 +1,131 @@
+<% popup_translations = Bible270::Translations.blue_letter_tagger_translations(b270_bible_version) %>
+<script src="https://www.blueletterbible.org/assets/scripts/blbToolTip/BLB_ScriptTagger-min.js"
+        type="text/javascript" nonce="<%= content_security_policy_nonce %>" data-turbo-eval="false"></script>
+<script nonce="<%= content_security_policy_nonce %>"
+        data-old-testament-translation="<%= popup_translations.fetch(:old_testament) %>"
+        data-new-testament-translation="<%= popup_translations.fetch(:new_testament) %>">
+  (() => {
+    const settings = document.currentScript.dataset;
+    const requestedTranslations = {
+      oldTestament: settings.oldTestamentTranslation,
+      newTestament: settings.newTestamentTranslation
+    };
+    if (window.Bible270ScripturePopups) {
+      window.Bible270ScripturePopups.configure(requestedTranslations);
+      window.Bible270ScripturePopups.scan();
+      return;
+    }
+
+    const tagger = window.BLB && window.BLB.Tagger;
+    if (!tagger) return;
+
+    const translations = { ...requestedTranslations };
+    const selector = ".b270-cbody";
+    const pending = new Set();
+    let retry;
+
+    function configure(requested) {
+      translations.oldTestament = requested.oldTestament;
+      translations.newTestament = requested.newTestament;
+      tagger.Translation = translations.oldTestament;
+    }
+
+    configure(requestedTranslations);
+    tagger.HyperLinks = "hover";
+    tagger.HideTanslationAbbrev = false;
+    tagger.HideTranslationAbbrev = false;
+    tagger.TargetNewWindow = true;
+    tagger.DarkTheme = false;
+    tagger.Style = "par";
+    tagger.NoSearchTagNames = "h1 h2 h3 h4";
+    tagger.NoSearchClassNames = "noTag doNotTag b270-ref b270-reflink b270-blb-existing-link";
+
+    function ready() {
+      return tagger.RegExSet && tagger.NoSearchTags && tagger.NoSearchClasses &&
+        window.YAHOO && window.YAHOO.util && window.YAHOO.util.Dom && window.BLB.BookNames;
+    }
+
+    function explicitTranslation(text, translation) {
+      const escaped = translation.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+      return new RegExp(`(?:^|[\\s,(])${escaped}\\)?$`, "i").test(text);
+    }
+
+    function newTestamentReference(reference) {
+      const normalized = tagger.normalizeReference(reference);
+      const book = normalized.split(" ", 1)[0].replaceAll("_", " ").toLowerCase();
+      const canonical = window.BLB.BookNames[book];
+      return Number(window.BLB.BookOrder[canonical]) >= 40;
+    }
+
+    const originalInsertRefNode = tagger.insertRefNode;
+    tagger.insertRefNode = function(reference, text, translation, node) {
+      let popupTranslation = translation;
+      const testamentSpecific = translations.oldTestament !== translations.newTestament;
+      if (testamentSpecific && !explicitTranslation(text, translation)) {
+        popupTranslation = newTestamentReference(reference) ?
+          translations.newTestament : translations.oldTestament;
+      }
+      return originalInsertRefNode.call(tagger, reference, text, popupTranslation, node);
+    };
+
+    const originalWalkDomTree = tagger.walkDomTree;
+    tagger.walkDomTree = function(root, linkedAnchor, depth) {
+      if (root === document.body) {
+        window.Bible270ScripturePopups.scan(root);
+        return 0;
+      }
+      return originalWalkDomTree.call(tagger, root, linkedAnchor, depth);
+    };
+
+    function collect(root) {
+      if (!root) return;
+      if (root.nodeType === Node.ELEMENT_NODE && root.matches(selector)) pending.add(root);
+      if (root.querySelectorAll) root.querySelectorAll(selector).forEach((body) => pending.add(body));
+    }
+
+    function flush() {
+      retry = null;
+      if (!ready()) {
+        retry = window.setTimeout(flush, 25);
+        return;
+      }
+
+      const bodies = Array.from(pending);
+      pending.clear();
+      bodies.forEach((body) => {
+        if (!body.isConnected || body.dataset.b270BlbTagged === "true") return;
+
+        body.querySelectorAll("a").forEach((link) => link.classList.add("b270-blb-existing-link"));
+        body.dataset.b270BlbTagged = "true";
+        tagger.walkDomTree(body);
+      });
+    }
+
+    function scan(root = document) {
+      collect(root);
+      if (pending.size && !retry) retry = window.setTimeout(flush, 0);
+    }
+
+    function reset(root = document) {
+      root.querySelectorAll(`${selector} a.BLBST_a`).forEach((link) => {
+        link.replaceWith(document.createTextNode(link.textContent));
+      });
+      root.querySelectorAll(selector).forEach((body) => {
+        body.removeAttribute("data-b270-blb-tagged");
+      });
+      document.getElementById("scriptDiv")?.remove();
+      tagger.ContainerToHide = null;
+    }
+
+    window.Bible270ScripturePopups = { configure, scan };
+    new MutationObserver((mutations) => {
+      mutations.forEach((mutation) => mutation.addedNodes.forEach((node) => {
+        if (node.nodeType === Node.ELEMENT_NODE) scan(node);
+      }));
+    }).observe(document.documentElement, { childList: true, subtree: true });
+    document.addEventListener("turbo:load", () => scan());
+    document.addEventListener("turbo:before-cache", () => reset());
+    window.addEventListener("pageshow", () => scan());
+    scan();
+  })();
+</script>

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

@@ -23,5 +23,6 @@
     <%= render 'bible270/shared/day_index' unless content_for?(:hide_day_index) %>
     <%= b270_footer %>
   </div>
+  <%= render "bible270/shared/scripture_popups" %>
 </body>
 </html>

data/lib/bible270/reader_progress_report.rb

@@ -4,13 +4,17 @@ 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
+    SORTS = %w[
+      first_name last_name most_completed least_completed most_recent_activity least_recent_activity
+    ].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, sort: DEFAULT_SORT)
+    def initialize(readers: Reader.all, completed_days: Reader.completed_days_by_id, recent_activities: {},
+                   sort: DEFAULT_SORT)
       @readers = readers
       @completed_days = completed_days
+      @recent_activities = recent_activities
       @sort = SORTS.include?(sort.to_s) ? sort.to_s : DEFAULT_SORT
     end
 
@@ -40,7 +44,7 @@ module Bible270
 
   private
 
-    attr_reader :readers, :completed_days, :sort
+    attr_reader :readers, :completed_days, :recent_activities, :sort
 
     def reader_sort_key(reader)
       case sort
@@ -51,11 +55,21 @@ module Bible270
         [last_name.to_s.downcase, reader.sort_name, reader.id]
       when 'least_completed'
         [completed_days[reader.id].to_i, reader.sort_name, reader.id]
+      when 'most_recent_activity'
+        activity_sort_key(reader, descending: true)
+      when 'least_recent_activity'
+        activity_sort_key(reader, descending: false)
       else
         [-completed_days[reader.id].to_i, reader.sort_name, reader.id]
       end
     end
 
+    def activity_sort_key(reader, descending:)
+      activity = recent_activities[reader.id]
+      timestamp = activity&.occurred_at&.to_f
+      [activity.nil? ? 1 : 0, descending && timestamp ? -timestamp : timestamp.to_f, reader.sort_name, reader.id]
+    end
+
     def status(reader, days_read)
       calendar_day = reader.calendar_day
       return 'undated' unless calendar_day

data/lib/bible270/translations.rb

@@ -87,6 +87,21 @@ module Bible270
       VERSIONS.dig(normalize(code), :gateway) || normalize(code)
     end
 
+    # ScriptTagger accepts one default translation, but Bible270's two original-
+    # language choices vary by testament. Returning both lets the browser select
+    # the correct BLB text for each detected reference.
+    def blue_letter_tagger_translations(code)
+      translation = resolve(code)
+      case translation
+      when ORIGINAL_LANGUAGES
+        { old_testament: 'WLC', new_testament: 'mGNT' }
+      when ALL_GREEK
+        { old_testament: 'LXX', new_testament: 'mGNT' }
+      else
+        { old_testament: translation, new_testament: translation }
+      end
+    end
+
     # [[label, code], ...] for a select field.
     def options
       codes.map { |code| ["#{code} — #{short_label(code)}", code] }

data/lib/bible270/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bible270
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.7.1
 platform: ruby
 authors:
 - Andrew vonderLuft
@@ -187,6 +187,7 @@ files:
 - app/views/bible270/shared/_passage_source.html.erb
 - app/views/bible270/shared/_progress.html.erb
 - app/views/bible270/shared/_reflections.html.erb
+- app/views/bible270/shared/_scripture_popups.html.erb
 - app/views/bible270/shared/_styles.html.erb
 - app/views/bible270/shared/_track_bars.html.erb
 - app/views/bible270/sign_in_mailer/magic_link.html.erb
@@ -261,7 +262,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.16
+rubygems_version: 4.0.20
 specification_version: 4
 summary: 'A mountable Rails engine: a 270-day, verse-balanced Bible reading plan (OT
   and NT once, Psalms/Proverbs alongside) with per-user check-offs, comments, and