bible270 1.3.0 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90443d781de608736a3f9fdb35b68b9a85d24d2b2b4f56c3980f54975d239949
-  data.tar.gz: cb3dede7983920cf33aaf31b4d6070ec142874063702071512ad60aa387d8899
+  metadata.gz: 1045882b2a544c39d4f9c4b6282c4dd67861f1af380d4af7ad1cd226b57dcaee
+  data.tar.gz: 03c9162733bfaf96cc08fcd101231174efbf97378cdefe47e55d91d603c0b6bd
 SHA512:
-  metadata.gz: '02703879de6569e5f254de78bd32e4b9c911ca4daef9ca3bc4942ad1816baec285582f10bb1b4d9080d97dfd7588d9c343234cf0a5f2596f82fdfe758113f5a6'
-  data.tar.gz: 8e219a377d05acbe62ccea4bc39cf25a1b902bf98cc42495b82c53dbc9282104c14fb3abc55eed09ea910a84cd0e9b05c5063d8836b2eac3798f504fe914653d
+  metadata.gz: 8bc8c454821233d8c899af8c6224b08d5c48b615ac2c6bbf5dc03140cce041c60c7f1208c78a631576875b3eb3507ca82ae61e2c57a19b5c4fe0e6aab3d30c1d
+  data.tar.gz: 735cf1ba5f33e2f56bd87cbd2720eeb6b685822b148b7b2a13fd8e7537dcd63cf73e6253e050445be136087bcacc4802dcda36c939f1080994c2a8733a1f4b78

data/CHANGELOG.md

@@ -4,18 +4,34 @@ All notable changes to bible270. Format follows [Keep a Changelog](https://keepa
 
 ## Unreleased Changes
 
+### Fixed
+
+- correct Day 27's New Testament reading to include Matthew 26:75
+- silently recover all Turbo interactions from stale sessions, retry once with a fresh CSRF token, and reload rather than submit with a known-stale token if refreshing fails
+
+**[Full Changelog](https://github.com/avonderluft/bible270/compare/v1.3.0...main)**
+
+## [1.3.0] - 2026-08-29
+
 ### Added
 
-- let readers choose reflection emails for every new reflection and reply, only replies to their reflections and mentions of them, or none; administrators can manage the same setting, pending migrations are explained instead of silently hiding it, and existing preferences retain their previous behavior
-- suggest up to five unambiguous reader handles only while a signed-in writer types `@`, with keyboard and touch selection and no change to server-authoritative mention resolution
 - add Bible.com as the first-listed and default reader/admin Scripture source for every offered translation, using chapter links and WLC Hebrew or THGNT Greek when `HEB/GRK` is selected; existing reader choices are preserved
 - add `ALLGRK — LXX OT and Greek NT` immediately after `HEB/GRK`, using Blue Letter Bible's mGNT/LXX routing or Bible.com's GRCBRENT Old Testament and THGNT New Testament
 
+**[Full Changelog](https://github.com/avonderluft/bible270/compare/v1.2.0...v1.3.0)**
+
+## [1.2.0] - 2026-08-28
+
+### Added
+
+- let readers choose reflection emails for every new reflection and reply, only replies to their reflections and mentions of them, or none; administrators can manage the same setting, pending migrations are explained instead of silently hiding it, and existing preferences retain their previous behavior
+- suggest up to five unambiguous reader handles only while a signed-in writer types `@`, with keyboard and touch selection and no change to server-authoritative mention resolution
+
 ### Fixed
 
 - refresh stale `Reader` column information after an in-process database migration so newly available reflection email controls do not remain hidden until the web process restarts
 
-**[Full Changelog](https://github.com/avonderluft/bible270/compare/v1.1.7...main)**
+**[Full Changelog](https://github.com/avonderluft/bible270/compare/v1.1.7...v1.2.0)**
 
 ## [1.1.7] - 2026-08-27
 
@@ -575,6 +591,8 @@ 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.
 
+[1.3.0]: https://github.com/avonderluft/bible270/releases/tag/v1.3.0
+[1.2.0]: https://github.com/avonderluft/bible270/releases/tag/v1.2.0
 [1.1.7]: https://github.com/avonderluft/bible270/releases/tag/v1.1.7
 [1.1.6]: https://github.com/avonderluft/bible270/releases/tag/v1.1.6
 [1.1.5]: https://github.com/avonderluft/bible270/releases/tag/v1.1.5

data/app/controllers/bible270/application_controller.rb

@@ -116,18 +116,15 @@ module Bible270
       reason = error ? error.class : 'an unverified request'
       Rails.logger.info("[bible270] silently refreshing a page after #{reason}")
 
-      if stale_turbo_checkoff?
+      if request.format.turbo_stream?
         response.set_header('X-Bible270-Refresh-Session', 'true')
+        response.set_header('Cache-Control', 'no-store')
         head :conflict
       else
         redirect_back fallback_location: root_path, allow_other_host: false, status: :see_other
       end
     end
 
-    def stale_turbo_checkoff?
-      controller_name == 'checkoffs' && action_name == 'toggle' && request.format.turbo_stream?
-    end
-
     # Guard participation (checking off / commenting). Viewing is always open.
     def require_reader!
       return true if signed_in?

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

@@ -35,6 +35,7 @@
     let sessionRefreshedAt = Date.now();
     let sessionRefresh = null;
     let hiddenAt = null;
+    const submitters = new WeakMap();
 
     function updateAuthenticityToken(token) {
       const meta = document.querySelector("meta[name='csrf-token']");
@@ -97,6 +98,9 @@
     });
 
     document.addEventListener("submit", (event) => {
+      const submittedForm = event.target.closest("form");
+      if (submittedForm && event.submitter) submitters.set(submittedForm, event.submitter);
+
       const form = event.target.closest("form[data-b270-submit='true']");
       if (!form) return;
 
@@ -111,8 +115,7 @@
           form.requestSubmit(submitter || undefined);
         }).catch(() => {
           delete form.dataset.b270AwaitingSession;
-          sessionRefreshedAt = Date.now();
-          form.requestSubmit(submitter || undefined);
+          window.location.reload();
         });
         return;
       }
@@ -134,17 +137,22 @@
 
     function staleSessionResponse(fetchResponse) {
       if (!fetchResponse) return false;
-      if (fetchResponse.statusCode === 422) return true;
 
-      return fetchResponse.statusCode === 409 &&
-        fetchResponse.response.headers.get("X-Bible270-Refresh-Session") === "true";
+      const response = fetchResponse.response;
+      if (fetchResponse.statusCode === 409 &&
+          response.headers.get("X-Bible270-Refresh-Session") === "true") return true;
+
+      // Older deployments can still return Rails' HTML 422 page. Do not confuse
+      // an intentional Turbo Stream validation response with an expired session.
+      const contentType = response.headers.get("Content-Type") || "";
+      return fetchResponse.statusCode === 422 && contentType.includes("text/html");
     }
 
     document.addEventListener("turbo:before-fetch-response", (event) => {
       const target = event.target;
-      const form = target.closest && target.closest("form[data-b270-checkoff='true']");
+      const form = target.closest && target.closest("form");
       const response = event.detail.fetchResponse;
-      if (!form || !staleSessionResponse(response)) return;
+      if (!form || form.method.toLowerCase() === "get" || !staleSessionResponse(response)) return;
 
       event.preventDefault();
       if (form.dataset.b270RetriedAfterStaleSession === "true") {
@@ -152,9 +160,12 @@
         return;
       }
 
+      const submitter = submitters.get(form);
       form.dataset.b270RetriedAfterStaleSession = "true";
       resetForm(form);
-      refreshSession().then(() => form.requestSubmit()).catch(() => window.location.reload());
+      refreshSession()
+        .then(() => form.requestSubmit(submitter || undefined))
+        .catch(() => window.location.reload());
     });
 
     document.addEventListener("turbo:submit-end", (event) => {
@@ -165,6 +176,7 @@
       if (form.dataset.b270RetriedAfterStaleSession === "true" &&
           staleSessionResponse(event.detail.fetchResponse)) return;
 
+      delete form.dataset.b270RetriedAfterStaleSession;
       if (event.detail.success) {
         announce(form.dataset.b270Success || "Saved.", "success");
       } else {

data/lib/bible270/versification.rb

@@ -61,7 +61,7 @@ module Bible270
       'Zechariah' => [21, 13, 10, 14, 11, 15, 14, 23, 17, 12, 17, 14, 9, 21],
       'Malachi' => [14, 17, 18, 6],
       'Matthew' => [25, 22, 17, 25, 48, 34, 29, 34, 38, 42, 30, 50, 58, 36, 39, 28, 27, 35, 30, 34, 46, 45, 39, 51, 46,
-                    74, 66, 20],
+                    75, 66, 20],
       'Mark' => [45, 28, 35, 40, 43, 56, 36, 37, 50, 52, 33, 44, 37, 72, 47, 20],
       'Luke' => [80, 52, 38, 44, 39, 49, 50, 56, 62, 42, 54, 59, 35, 35, 32, 31, 37, 43, 48, 47, 38, 71, 56, 53],
       'John' => [51, 25, 36, 54, 47, 71, 53, 59, 41, 42, 57, 50, 38, 31, 27, 33, 26, 40, 42, 31, 25],

data/lib/bible270/version.rb

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

metadata

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