RubyGems - bible270 - Versions diffs - 1.2.0 → 1.3.0 - Mend

bible270 1.2.0 → 1.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (12) hide show

checksums.yaml +4 -4
data/CHANGELOG.md +2 -0
data/README.md +8 -4
data/app/helpers/bible270/plan_helper.rb +7 -5
data/app/models/bible270/reader.rb +3 -2
data/app/views/bible270/shared/_passage_source.html.erb +7 -3
data/app/views/bible270/shared/_styles.html.erb +3 -3
data/db/migrate/20260101000019_change_passage_source_default_to_bible_com.rb +8 -0
data/lib/bible270/migration_reconciler.rb +9 -0
data/lib/bible270/translations.rb +72 -19
data/lib/bible270/version.rb +1 -1
metadata +2 -1

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9f698d3dbbc6afbb9130e3dc81767302792e8f25e23db7d702401eb290b747e
-  data.tar.gz: e109e61cc7a4e39098124cb7e1996c980d248b54c3e7649702901a6b5e65e392
+  metadata.gz: 90443d781de608736a3f9fdb35b68b9a85d24d2b2b4f56c3980f54975d239949
+  data.tar.gz: cb3dede7983920cf33aaf31b4d6070ec142874063702071512ad60aa387d8899
 SHA512:
-  metadata.gz: d9742929c763b48681e352e95510a8944eb087529453ed10af579fd737db35a75492ef55c25c9a6416d925728072b69868a02f2e8f3300882f14711a3f71c338
-  data.tar.gz: d5b50e44afd429885e2e90af7b36df10fa0aaff363d39c03309f4d1885560da0f73d020ba7de53571f0ae0be129b2e55bccba9e1bd02dc45d82984718d82134d
+  metadata.gz: '02703879de6569e5f254de78bd32e4b9c911ca4daef9ca3bc4942ad1816baec285582f10bb1b4d9080d97dfd7588d9c343234cf0a5f2596f82fdfe758113f5a6'
+  data.tar.gz: 8e219a377d05acbe62ccea4bc39cf25a1b902bf98cc42495b82c53dbc9282104c14fb3abc55eed09ea910a84cd0e9b05c5063d8836b2eac3798f504fe914653d

data/CHANGELOG.md CHANGED Viewed

@@ -8,6 +8,8 @@ All notable changes to bible270. Format follows [Keep a Changelog](https://keepa
 - 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
 ### Fixed

data/README.md CHANGED Viewed

@@ -462,10 +462,14 @@ config.favicon = false                      # none; the host's favicon applies
 It's emitted by the engine's layout, so if you point `config.layout` at your own layout, add
 `<%= b270_favicon_tag %>` to its `<head>`.
-References link to Bible Gateway by default. Readers choose Bible Gateway or Blue Letter Bible from
-their profile, and an admin can set the same source for any reader. The `HEB/GRK` option always uses
-Blue Letter Bible: WLC for Old Testament, Psalms, and Proverbs readings, and mGNT for New Testament
-readings. Scripture links share one dedicated browser tab so moving among the day's passages does not
+References link to Bible.com by default. Readers choose Bible.com, Bible Gateway, or Blue Letter Bible
+from their profile, and an admin can set the same source for any reader. With `HEB/GRK`,
+Bible Gateway is unavailable: Blue Letter Bible uses WLC for Old Testament, Psalms, and Proverbs and
+mGNT for New Testament, while Bible.com uses WLC and THGNT respectively. The `ALLGRK — LXX OT and
+Greek NT` option also excludes Bible Gateway: Blue Letter Bible uses its mGNT/LXX route for every
+track, while Bible.com uses GRCBRENT for the Old Testament and THGNT for the New Testament. Bible.com
+links open the whole chapter rather than its individual-verse introduction page. Scripture links share one
+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.

data/app/helpers/bible270/plan_helper.rb CHANGED Viewed

@@ -115,7 +115,9 @@ module Bible270
       return '#' if reference.blank?
       selected_version = version || b270_bible_version
-      if selected_version != Translations::ORIGINAL_LANGUAGES && current_reader&.blue_letter_bible?
+      source = current_reader&.passage_source.presence || Reader::DEFAULT_PASSAGE_SOURCE
+      return Translations.passage_url(reference, selected_version, bible_com: true) if source == 'bible_com'
+      if source == 'blue_letter_bible' || Translations.original_languages?(selected_version)
         return Translations.passage_url(reference, selected_version, blue_letter: true)
       end
@@ -125,8 +127,8 @@ module Bible270
     # The named target and noopener are the secure no-JavaScript fallback.
     # Interaction UI retains one opener-backed tab handle on desktop. iOS Safari
     # cannot foreground a reused background tab, so it closes and replaces that
-    # script-opened tab on each click. The two fixed providers are intentionally
-    # trusted for this enhanced path.
+    # script-opened tab on each click. The three fixed providers are trusted for
+    # this enhanced path.
     def b270_passage_link(reference, **options)
       data = options.fetch(:data, {}).merge(b270_passage_link: true)
       options.merge!(data: data, target: PASSAGE_LINK_TARGET, rel: 'noopener')
@@ -138,8 +140,8 @@ module Bible270
     # used for each track rather than repeating the combined preference code.
     def b270_version_tag(version = nil, track: nil)
       label = version || b270_bible_version
-      if label == Translations::ORIGINAL_LANGUAGES && track
-        label = track.to_s == 'nt' ? 'Greek' : 'Hebrew'
+      if Translations.original_languages?(label) && track
+        label = label == Translations::ALL_GREEK || track.to_s == 'nt' ? 'Greek' : 'Hebrew'
       end
       content_tag :span, "(#{label})", class: 'b270-version'

data/app/models/bible270/reader.rb CHANGED Viewed

@@ -25,8 +25,8 @@ module Bible270
     # transaction rolls back.
     after_create_commit :notify_of_registration
-    PASSAGE_SOURCES = %w[bible_gateway blue_letter_bible].freeze
-    DEFAULT_PASSAGE_SOURCE = 'bible_gateway'
+    PASSAGE_SOURCES = %w[bible_com bible_gateway blue_letter_bible].freeze
+    DEFAULT_PASSAGE_SOURCE = 'bible_com'
     DAILY_REMINDER_TIME_FORMAT = %r{\A(?:[01]\d|2[0-3]):[0-5]\d\z}
     DAILY_REMINDER_MINUTES = %w[00 15 30 45].freeze
     DAILY_REMINDER_COLUMNS = %w[daily_reminders daily_reminder_time last_daily_reminder_sent_on].freeze
@@ -236,6 +236,7 @@ module Bible270
     def bible_gateway? = passage_source == 'bible_gateway'
     def blue_letter_bible? = passage_source == 'blue_letter_bible'
+    def bible_com? = passage_source == 'bible_com'
     # Readers are listed by first name, matching how they are shown — the display
     # name is "First Last", so sorting on it needs only case folding. Surname

data/app/views/bible270/shared/_passage_source.html.erb CHANGED Viewed

@@ -1,13 +1,17 @@
-<% original_languages = reader.effective_bible_version == Bible270::Translations::ORIGINAL_LANGUAGES %>
+<% original_languages = Bible270::Translations.original_languages?(reader.effective_bible_version) %>
 <div class="b270-source-choices" role="radiogroup" aria-label="Reading link source">
+  <label class="b270-source-choice">
+    <%= radio_button_tag :passage_source, "bible_com", reader.bible_com? %>
+    <span>Bible.com</span>
+  </label>
   <label class="b270-source-choice <%= 'disabled' if original_languages %>">
     <%= radio_button_tag :passage_source, "bible_gateway",
           !original_languages && reader.bible_gateway?, disabled: original_languages %>
     <span>Bible Gateway</span>
   </label>
-  <label class="b270-source-choice <%= 'disabled' if original_languages %>">
+  <label class="b270-source-choice">
     <%= radio_button_tag :passage_source, "blue_letter_bible",
-          original_languages || reader.blue_letter_bible?, disabled: original_languages %>
+          reader.blue_letter_bible? || (original_languages && !reader.bible_com?) %>
     <span>Blue Letter Bible</span>
   </label>
 </div>

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

@@ -186,9 +186,9 @@
   .b270-parts-meta{margin-top:10px;font-size:12.5px;color:var(--faint)}
   .b270-version{font-size:11.5px;color:var(--faint);font-weight:400;letter-spacing:.02em;white-space:nowrap}
   .b270-select{font:inherit;font-size:14px;padding:10px 30px 10px 12px;border:1px solid var(--line);border-radius:9px;background:#fff;color:var(--ink);width:100%;max-width:100%;text-overflow:ellipsis}
-  .b270-source-choices{display:flex;align-items:center;gap:18px;flex-wrap:wrap;margin:8px 0 2px;color:var(--muted);font-size:12.5px}
-  .b270-source-choice{display:inline-flex;align-items:center;gap:7px;cursor:pointer;white-space:nowrap}
-  .b270-source-choice input{appearance:none;width:17px;height:17px;margin:0;border:1px solid var(--line);border-radius:3px;background:#fff;display:grid;place-content:center;cursor:pointer}
+  .b270-source-choices{display:flex;align-items:center;justify-content:space-between;gap:4px;flex-wrap:nowrap;width:100%;margin:8px 0 2px;color:var(--muted);font-size:clamp(10.5px,3.4vw,12.5px)}
+  .b270-source-choice{display:inline-flex;align-items:center;gap:4px;cursor:pointer;white-space:nowrap}
+  .b270-source-choice input{appearance:none;width:14px;height:14px;margin:0;border:1px solid var(--line);border-radius:3px;background:#fff;display:grid;place-content:center;cursor:pointer;flex:none}
   .b270-source-choice input::before{content:"";width:9px;height:9px;transform:scale(0);transition:transform .1s;clip-path:polygon(14% 44%,0 59%,38% 100%,100% 18%,82% 0,37% 65%);background:var(--paper)}
   .b270-source-choice input:checked{background:var(--gold);border-color:var(--gold)}
   .b270-source-choice input:checked::before{transform:scale(1)}

data/db/migrate/20260101000019_change_passage_source_default_to_bible_com.rb ADDED Viewed

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+class ChangePassageSourceDefaultToBibleCom < ActiveRecord::Migration[7.0]
+  def change
+    change_column_default :bible270_readers, :passage_source,
+                          from: 'bible_gateway', to: 'bible_com'
+  end
+end

data/lib/bible270/migration_reconciler.rb CHANGED Viewed

@@ -28,6 +28,7 @@ module Bible270
       'AddDailyRemindersToBible270Readers' => :check_daily_reminders,
       'AddReflectionsSeenAtToBible270Readers' => :check_reflections_seen_at,
       'AddAllCommentNoticesToBible270Readers' => :check_all_comment_notices,
+      'ChangePassageSourceDefaultToBibleCom' => :check_passage_source_default,
       'CreateActiveStorageTables' => :check_active_storage
     }.freeze
@@ -195,6 +196,14 @@ module Bible270
       table_missing(:bible270_readers, columns: %i[notify_on_all_comments])
     end
+    def check_passage_source_default
+      missing = table_missing(:bible270_readers, columns: %i[passage_source])
+      return missing if missing.any?
+      column = connection.columns(:bible270_readers).find { |candidate| candidate.name == 'passage_source' }
+      column&.default == 'bible_com' ? [] : ['column bible270_readers.passage_source default bible_com']
+    end
     # The Bible270 installer can install Active Storage for reader avatars. A
     # copied database can therefore have the same timestamp mismatch for Rails'
     # generated Active Storage migration as it has for the engine migrations.

data/lib/bible270/translations.rb CHANGED Viewed

@@ -20,17 +20,36 @@ module Bible270
       'ESV' => { label: 'English Standard Version', short: 'English Standard Version', gateway: 'ESV', blue_letter: 'esv' },
       'KJV' => { label: 'King James Version', short: 'King James Version', gateway: 'KJV', blue_letter: 'kjv' },
       'YLT' => { label: 'Young\'s Literal Translation', short: 'Young\'s Literal Translation', gateway: 'YLT', blue_letter: 'ylt' },
-      'HEB/GRK' => { label: 'Hebrew and Greek', short: 'Hebrew and Greek', gateway: 'WLC', blue_letter: 'wlc/mgnt' }
+      'HEB/GRK' => { label: 'Hebrew and Greek', short: 'Hebrew and Greek', gateway: 'WLC', blue_letter: 'wlc/mgnt' },
+      'ALLGRK' => { label: 'LXX Old Testament and Greek New Testament', short: 'LXX OT and Greek NT', gateway: 'LXX', blue_letter: 'mgnt' }
     }.freeze
     DEFAULT = 'NKJV'
     ORIGINAL_LANGUAGES = 'HEB/GRK'
+    ALL_GREEK = 'ALLGRK'
+    ORIGINAL_LANGUAGE_CODES = [ORIGINAL_LANGUAGES, ALL_GREEK].freeze
     BLUE_LETTER_BASE_URL = 'https://www.blueletterbible.org'
+    BIBLE_COM_BASE_URL = 'https://www.bible.com/bible'
+    BIBLE_COM_VERSIONS = {
+      'NKJV' => [114, 'NKJV'], 'NASB95' => [100, 'NASB1995'], 'LSB' => [3345, 'LSB'],
+      'ESV' => [59, 'ESV'], 'KJV' => [1, 'KJV'], 'YLT' => [821, 'YLT98']
+    }.freeze
+    BIBLE_COM_ORIGINAL_LANGUAGES = {
+      old_testament: [3585, 'WLC'], new_testament: [2270, 'THGNT']
+    }.freeze
+    BIBLE_COM_ALL_GREEK = {
+      old_testament: [2503, 'GRCBRENT'], new_testament: [2270, 'THGNT']
+    }.freeze
     BLUE_LETTER_BOOK_CODES = %w[
       gen exo lev num deu jos jdg rut 1sa 2sa 1ki 2ki 1ch 2ch ezr neh est job psa pro ecc sng
       isa jer lam eze dan hos joe amo oba jon mic nah hab zep hag zec mal mat mar luk joh act rom
       1co 2co gal eph php col 1th 2th 1ti 2ti tit phm heb jas 1pe 2pe 1jo 2jo 3jo jud rev
     ].freeze
+    BIBLE_COM_BOOK_CODES = %w[
+      GEN EXO LEV NUM DEU JOS JDG RUT 1SA 2SA 1KI 2KI 1CH 2CH EZR NEH EST JOB PSA PRO ECC SNG
+      ISA JER LAM EZK DAN HOS JOL AMO OBA JON MIC NAM HAB ZEP HAG ZEC MAL MAT MRK LUK JHN ACT ROM
+      1CO 2CO GAL EPH PHP COL 1TH 2TH 1TI 2TI TIT PHM HEB JAS 1PE 2PE 1JN 2JN 3JN JUD REV
+    ].freeze
   module_function
@@ -50,6 +69,10 @@ module Bible270
       code.to_s.strip.upcase
     end
+    def original_languages?(code)
+      ORIGINAL_LANGUAGE_CODES.include?(normalize(code))
+    end
     def label(code)
       VERSIONS.dig(normalize(code), :label)
     end
@@ -69,10 +92,9 @@ module Bible270
       codes.map { |code| ["#{code} — #{short_label(code)}", code] }
     end
-    def passage_url(reference, version, blue_letter: false)
-      if blue_letter || normalize(version) == ORIGINAL_LANGUAGES
-        return blue_letter_url(reference, version)
-      end
+    def passage_url(reference, version, blue_letter: false, bible_com: false)
+      return bible_com_url(reference, version) if bible_com
+      return blue_letter_url(reference, version) if blue_letter || original_languages?(version)
       search = URI.encode_www_form_component(reference)
       gateway = URI.encode_www_form_component(gateway_code(version))
@@ -85,25 +107,17 @@ module Bible270
     # query URL, so link to the first chapter/verse and let its chapter navigation
     # carry the reader onward.
     def blue_letter_url(reference, version = ORIGINAL_LANGUAGES)
-      books = Versification::VERSES.keys
-      book_index = books.index { |book| reference.to_s.start_with?("#{book} ") }
-      return "#{BLUE_LETTER_BASE_URL}/" unless book_index
-      book = books[book_index]
-      location = reference.to_s.delete_prefix("#{book} ")
-      match = location.match(%r{\A(\d+)(?::(\d+))?})
-      return "#{BLUE_LETTER_BASE_URL}/" unless match
-      chapter = match[1].to_i
-      verse = match[2]&.to_i || 1
-      chapter_verses = Versification::VERSES[book]
-      return "#{BLUE_LETTER_BASE_URL}/" unless chapter.between?(1, chapter_verses.length)
-      return "#{BLUE_LETTER_BASE_URL}/" unless verse.between?(1, chapter_verses[chapter - 1])
+      start = reference_start(reference)
+      return "#{BLUE_LETTER_BASE_URL}/" unless start
+      book_index, chapter, verse = start
+      books = Versification::VERSES.keys
       canonical_chapter = books.first(book_index).sum { |prior| Versification::VERSES[prior].length } + chapter
       new_testament = book_index >= books.index('Matthew')
       reader = if normalize(version) == ORIGINAL_LANGUAGES
                  new_testament ? 'mgnt' : 'wlc'
+               elsif normalize(version) == ALL_GREEK
+                 'mgnt'
                else
                  VERSIONS.dig(normalize(version), :blue_letter)
                end
@@ -114,6 +128,45 @@ module Bible270
         "#{chapter}/#{verse}/s_#{anchor}"
     end
+    def bible_com_url(reference, version)
+      start = reference_start(reference)
+      return BIBLE_COM_BASE_URL unless start
+      book_index, chapter, = start
+      version_id, version_code = bible_com_version(version, book_index)
+      return BIBLE_COM_BASE_URL unless version_id && version_code
+      "#{BIBLE_COM_BASE_URL}/#{version_id}/#{BIBLE_COM_BOOK_CODES[book_index]}." \
+        "#{chapter}.#{version_code}"
+    end
+    def bible_com_version(version, book_index)
+      normalized = normalize(version)
+      testament = book_index >= Versification::VERSES.keys.index('Matthew') ? :new_testament : :old_testament
+      return BIBLE_COM_ORIGINAL_LANGUAGES[testament] if normalized == ORIGINAL_LANGUAGES
+      return BIBLE_COM_ALL_GREEK[testament] if normalized == ALL_GREEK
+      BIBLE_COM_VERSIONS[normalized]
+    end
+    def reference_start(reference)
+      books = Versification::VERSES.keys
+      book_index = books.index { |book| reference.to_s.start_with?("#{book} ") }
+      return unless book_index
+      book = books[book_index]
+      match = reference.to_s.delete_prefix("#{book} ").match(%r{\A(\d+)(?::(\d+))?})
+      return unless match
+      chapter = match[1].to_i
+      verse = match[2]&.to_i || 1
+      chapter_verses = Versification::VERSES[book]
+      return unless chapter.between?(1, chapter_verses.length)
+      return unless verse.between?(1, chapter_verses[chapter - 1])
+      [book_index, chapter, verse]
+    end
     # Falls back to the configured default, then to ESV, so a link is never built
     # with a blank version.
     def resolve(code)

data/lib/bible270/version.rb CHANGED Viewed

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

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bible270
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Andrew vonderLuft
@@ -173,6 +173,7 @@ files:
 - db/migrate/20260101000016_add_daily_reminders_to_bible270_readers.rb
 - db/migrate/20260101000017_add_reflections_seen_at_to_bible270_readers.rb
 - db/migrate/20260101000018_add_all_comment_notices_to_bible270_readers.rb
+- db/migrate/20260101000019_change_passage_source_default_to_bible_com.rb
 - lib/bible270.rb
 - lib/bible270/avatars.rb
 - lib/bible270/configuration.rb