bible270 0.11.2 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52e08240916fa78ed55408939d5ab6ecd297113f96b4f1cee646d471a9b289dd
-  data.tar.gz: 5e078496dab3ca466eb2c1ef702a1ef4578cfa16566aa8194eb04022025ac05b
+  metadata.gz: 57c5245aba9c3d25d04ad67878802fc5d7ad712750dac55e85083e5d45080947
+  data.tar.gz: c9405dc4ac8ab2cb41d20d7c9a2f4ed4018fe814a7054f98494220da4468df47
 SHA512:
-  metadata.gz: 07ab2d3720035d36f7dd9226455d2239db65fe0c623a682aea50ceec94cd74d4a0d13dd5c3cac0b06c8d66b2a08234d57f4cdb432ac647d905ff0f9116b5a2dd
-  data.tar.gz: eb5082979de6f974634b2a6abdafab906f7bbd62d68b465f14b13d5a9ec73d461c82f203c79e1c48084e4e7fdc00c16ea7bf3390713f3c11447267ed980ab1c9
+  metadata.gz: b3a226ef874707b703845e48c496deb6b037b7714db29323241d337dcdd248e0c95fb2fe545171dd467790aa78b99bd8e304f010cca2b94e79dc659336445588
+  data.tar.gz: 8bcaf063952c4d82fff0d88ee06838bc599085eaaa37d69498aa3f7da0ce844ee81d05f7b4a08c7095d9835e013cfd2454057f88bb1d8bfc3fc8f2f2a7704533

data/app/controllers/bible270/profiles_controller.rb

@@ -14,6 +14,9 @@ module Bible270
       problems = []
       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])
+        problems << 'a translation from the list'
+      end
       if params[:avatar].present? && !current_reader.attach_avatar(params[:avatar])
         problems << (current_reader.errors[:avatar].first || 'a valid image')
       end

data/app/helpers/bible270/plan_helper.rb

@@ -18,14 +18,24 @@ module Bible270
       Bible270.config.label_for_provider(provider)
     end
 
-    def b270_passage_url(reference)
+    # The signed-in reader's translation, falling back to the site default for
+    # visitors who aren't signed in.
+    def b270_bible_version
+      current_reader&.effective_bible_version || Translations.resolve(nil)
+    end
+
+    def b270_passage_url(reference, version = nil)
       return '#' if reference.blank?
 
-      Bible270.config.passage_url_builder.call(reference, Bible270.config.bible_version)
+      Bible270.config.passage_url_builder.call(reference, version || b270_bible_version)
+    end
+
+    # Small grey "(NKJV)" after a reading, so it's clear which translation the
+    # link opens in.
+    def b270_version_tag(version = nil)
+      content_tag :span, "(#{version || b270_bible_version})", class: 'b270-version'
     end
 
-    # An uploaded avatar wins over whatever the sign-in provider gave us.
-    # Active Storage routes live in the host app, hence main_app.
     def b270_avatar_src(reader)
       return main_app.rails_blob_path(reader.avatar, only_path: true) if reader.avatar_uploaded?
 

data/app/models/bible270/reader.rb

@@ -114,6 +114,22 @@ module Bible270
       Names.first_with_last_initial(first_name, last_name).presence || display_name
     end
 
+    # The translation this reader reads in. Null means "whatever the site default
+    # is", so changing config.bible_version moves everyone who hasn't chosen.
+    def effective_bible_version
+      Translations.resolve(bible_version)
+    end
+
+    def bible_version_label
+      Translations.label(effective_bible_version)
+    end
+
+    def update_bible_version(code)
+      return false unless Translations.valid?(code)
+
+      update(bible_version: Translations.normalize(code))
+    end
+
     def sort_name
       [last_name, first_name].map { |n| n.to_s.strip.downcase }.join(' ').strip.presence || display_name.to_s.downcase
     end
@@ -209,7 +225,7 @@ module Bible270
     def suggested_names
       return { first_name: first_name, last_name: last_name } if full_name
 
-      Names.split(display_name) || { first_name: display_name, last_name: nil }
+      Names.split_display_name(display_name) || { first_name: display_name, last_name: nil }
     end
 
     # ---- administrative adjustments --------------------------------------

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

@@ -1,4 +1,5 @@
 <% content_for :title, "#{@reader.display_name} — Admin" %>
+<% content_for :hide_day_index, true %><%# this page has its own grid %>
 <p class="b270-eyebrow"><%= link_to 'Admin', admin_path %></p>
 <h1><%= @reader.display_name %></h1>
 <p class="lede">

data/app/views/bible270/days/_reading.html.erb

@@ -11,7 +11,7 @@
     <% end %>
     <div class="b270-rbody">
       <div class="b270-cat"><%= t[:label] %></div>
-      <div class="b270-ref"><%= link_to ref, b270_passage_url(ref), target: "_blank", rel: "noopener" %></div>
+      <div class="b270-ref"><%= link_to ref, b270_passage_url(ref), target: "_blank", rel: "noopener" %> <%= b270_version_tag %></div>
     </div>
   </div>
 <% else %>

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

@@ -27,6 +27,14 @@
       <span>Last name</span>
       <%= text_field_tag :last_name, @names[:last_name], required: true, autocomplete: "family-name" %>
     </label>
+    <label class="b270-field">
+      <span>Bible translation</span>
+      <%= select_tag :bible_version,
+            options_for_select(Bible270::Translations.options, current_reader.effective_bible_version),
+            class: "b270-select" %>
+      <span class="b270-hint" style="margin:0">Reading links open in this translation.</span>
+    </label>
+
     <%= submit_tag "Save", class: "b270-btn" %>
   <% end %>
 

data/app/views/bible270/readers/show.html.erb

@@ -1,8 +1,12 @@
 <% content_for :title, "#{@reader.display_name} — #{Bible270.config.app_name}" %>
+<% content_for :hide_day_index, true %><%# this page has its own grid %>
 <div style="display:flex;align-items:center;gap:16px;margin-bottom:8px">
   <%= b270_avatar(@reader, size: 56) %>
   <div>
     <h1 style="margin:0"><%= @reader.display_name %></h1>
+    <% if signed_in? && current_reader.id == @reader.id %>
+      <p style="margin:2px 0 0"><%= link_to 'Edit your name', profile_path, class: 'b270-linkbtn' %></p>
+    <% end %>
     <p style="margin:2px 0 0;color:var(--faint);font-size:14px"><%= @days_completed %> of <%= Bible270::Plan::DAYS %> days complete · <%= @reader.completion_percent %>%</p>
   </div>
 </div>

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

@@ -107,6 +107,8 @@
   .b270-rbody{flex:1;min-width:0}
   .b270-cat{font-size:11px;letter-spacing:.13em;text-transform:uppercase;color:var(--faint);font-weight:600}
   .b270-ref{font-family:"Spectral",serif;font-size:19px;font-weight:500;margin-top:1px}
+  .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-ref a{text-decoration:none;border-bottom:1px solid transparent}
   .b270-ref a:hover{border-bottom-color:var(--gold)}
   .b270-reading.done .b270-ref{color:var(--muted)}

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

@@ -18,9 +18,13 @@
     <% if flash[:alert] %><div class="b270-flash alert"><%= flash[:alert] %></div><% end %>
     <% if flash[:notice] %><div class="b270-flash notice"><%= flash[:notice] %></div><% end %>
     <%= yield %>
-    <%= render 'bible270/shared/day_index' %>
+    <%# Pages with their own day grid opt out with content_for :hide_day_index %>
+    <%= render 'bible270/shared/day_index' unless content_for?(:hide_day_index) %>
     <footer class="b270-footer">
-      <p>The Old Testament, New Testament and Psalms/Proverbs are each read once across the 270 days. Long chapters are divided so the readings fill each day evenly, e.g. Psalm 119 comes in eleven sections.</p>
+      <p>The Old Testament and New Testament are each read once across the 270 days, with a
+         reading from all three tracks every day. Alongside them the Psalms run once and
+         Proverbs twice; the longest chapters are divided so the readings fill each day
+         evenly, and Psalm 119 comes in eleven sections.</p>
     </footer>
   </div>
 </body>

data/db/migrate/20260101000008_add_bible_version_to_bible270_readers.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddBibleVersionToBible270Readers < ActiveRecord::Migration[7.0]
+  def change
+    # Null means "use whatever the site default is", so changing
+    # config.bible_version moves everyone who hasn't chosen for themselves.
+    add_column :bible270_readers, :bible_version, :string
+  end
+end

data/lib/bible270/configuration.rb

@@ -7,6 +7,7 @@
 require 'uri'
 require 'bible270/plan'
 require 'bible270/avatars'
+require 'bible270/translations'
 
 module Bible270
   class Configuration
@@ -147,7 +148,6 @@ module Bible270
     #   Psalm 35: []
     #   Psalm 78: [20, 39, 55]
     attr_accessor :chapter_breaks_path
-    attr_accessor :after_sign_out_path, :email_sign_in_max_per_window, :passage_url_builder, :tagline, :avatar_max_bytes, :chapter_breaks, :admin_emails, :admin_resolver
 
     def admin?(reader)
       return false if reader.nil?
@@ -202,7 +202,11 @@ module Bible270
     end
 
     # Default Bible translation and a builder for external passage links.
-    attr_accessor :bible_version
+    # Which translations readers may choose from. Defaults to all of
+    # Bible270::Translations::VERSIONS; narrow it to offer fewer.
+    attr_accessor :bible_versions
+
+    attr_accessor :after_sign_out_path, :email_sign_in_max_per_window, :passage_url_builder, :tagline, :avatar_max_bytes, :chapter_breaks, :admin_emails, :admin_resolver, :bible_version
 
     # Public labels.
     attr_accessor :app_name
@@ -230,9 +234,11 @@ module Bible270
       @after_sign_in_path = nil
       @after_sign_out_path = nil
       @bible_version = 'NKJV'
+      @bible_versions = Translations::VERSIONS.keys
       @passage_url_builder = ->(reference, version) do
         search  = URI.encode_www_form_component(reference)
-        version = URI.encode_www_form_component(version)
+        # Translations.gateway_code maps 'NASB95' to Bible Gateway's 'NASB1995'.
+        version = URI.encode_www_form_component(Translations.gateway_code(version))
         "https://www.biblegateway.com/passage/?search=#{search}&version=#{version}"
       end
       @app_name = 'Daily Bread'

data/lib/bible270/translations.rb

@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+
+module Bible270
+  # The translations a reader may choose between, and how each maps onto the
+  # external reader's own code. Kept free of Rails so it can be unit tested.
+  #
+  # The distinction matters: readers know the NASB 1995 as "NASB95", but Bible
+  # Gateway's parameter for it is "NASB1995". Sending the display code straight
+  # through would land every link on a search page instead of the passage.
+  module Translations
+    # `label` is the full name, for prose. `short` is what goes in the select,
+    # where "New American Standard Bible 1995" overflows the box.
+    VERSIONS = {
+      'NKJV' => { label: 'New King James Version', short: 'New King James Version', gateway: 'NKJV' },
+      'NASB95' => { label: 'New American Standard Bible 1995', short: 'New American Standard 1995', gateway: 'NASB1995' },
+      'LSB' => { label: 'Legacy Standard Bible', short: 'Legacy Standard Version', gateway: 'LSB' },
+      'ESV' => { label: 'English Standard Version', short: 'English Standard Version', gateway: 'ESV' },
+      'KJV' => { label: 'King James Version', short: 'King James Version', gateway: 'KJV' }
+    }.freeze
+
+    DEFAULT = 'NKJV'
+
+  module_function
+
+    # The codes offered to readers, narrowed by config.bible_versions if the host
+    # only wants some of them.
+    def codes
+      allowed = Bible270.config.bible_versions if Bible270.config.respond_to?(:bible_versions)
+      requested = Array(allowed).map { |code| code.to_s.upcase }.select { |code| VERSIONS.key?(code) }
+      requested.any? ? requested : VERSIONS.keys
+    end
+
+    def valid?(code)
+      codes.include?(normalize(code))
+    end
+
+    def normalize(code)
+      code.to_s.strip.upcase
+    end
+
+    def label(code)
+      VERSIONS.dig(normalize(code), :label)
+    end
+
+    def short_label(code)
+      VERSIONS.dig(normalize(code), :short) || label(code)
+    end
+
+    # The code the external reader expects, which is not always the code readers
+    # recognise.
+    def gateway_code(code)
+      VERSIONS.dig(normalize(code), :gateway) || normalize(code)
+    end
+
+    # [[label, code], ...] for a select field.
+    def options
+      codes.map { |code| ["#{code} — #{short_label(code)}", code] }
+    end
+
+    # Falls back to the configured default, then to ESV, so a link is never built
+    # with a blank version.
+    def resolve(code)
+      return normalize(code) if valid?(code)
+
+      configured = Bible270.config.bible_version if Bible270.config.respond_to?(:bible_version)
+      return normalize(configured) if valid?(configured)
+
+      codes.include?(DEFAULT) ? DEFAULT : codes.first
+    end
+  end
+end

data/lib/bible270/version.rb

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

data/lib/bible270.rb

@@ -5,6 +5,7 @@ require 'bible270/plan'
 require 'bible270/email_sign_in'
 require 'bible270/names'
 require 'bible270/avatars'
+require 'bible270/translations'
 require 'bible270/configuration'
 require 'bible270/engine' if defined?(Rails::Engine)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bible270
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.12.0
 platform: ruby
 authors:
 - Andrew vonderLuft
@@ -113,6 +113,7 @@ files:
 - db/migrate/20260101000005_add_names_to_bible270_readers.rb
 - db/migrate/20260101000006_add_approval_to_bible270_comments.rb
 - db/migrate/20260101000007_create_bible270_settings.rb
+- db/migrate/20260101000008_add_bible_version_to_bible270_readers.rb
 - lib/bible270.rb
 - lib/bible270/avatars.rb
 - lib/bible270/configuration.rb
@@ -120,6 +121,7 @@ files:
 - lib/bible270/engine.rb
 - lib/bible270/names.rb
 - lib/bible270/plan.rb
+- lib/bible270/translations.rb
 - lib/bible270/versification.rb
 - lib/bible270/version.rb
 - lib/generators/bible270/install/install_generator.rb