bible270 0.15.1 → 0.15.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0d1b963495f4293f7e9c2a2bfdd6e6bf22c70d632ee6c233f7a977c2e46e124
-  data.tar.gz: 5ef68e1d13d4e475a674bea5301ba2eed3e7054b1acb29a8cabce68700bf3870
+  metadata.gz: 30168f88726808151fb47d82b1ccca08afdbdec56f1005d41d64575d85e21384
+  data.tar.gz: 9e63ced217294948d3e9e248ca0fc88da6b6be56e5d1b7988ac0b999661024a4
 SHA512:
-  metadata.gz: 55d02aad22edc399886cd67823b186414f1f989e5b672213bfa201445b10feeefdc94350be403689a3d57fa68f7acdcb42258a01f162d5fd71fc1514e292c2ea
-  data.tar.gz: f6fe740f3208ed91c46e129133cdf533095a121ed76b74c2dc303f5aa5af440dcd14a3b10d7b55a40ac1577387898bc146459de8ee1dea7c928cbbfe61199f81
+  metadata.gz: 0b01ce5346e5a2689c8a203f2962edc2a6b826ebcab1952a0a44a1ffcfe43a56b570c7f3c3806da442c822e6b58d7bc409708e9f2f507fb387df9d628f05d776
+  data.tar.gz: 132d37fcdaa158e96a3e293ab293cb5934064c1514736df913743189b24cf75bacd980b2b333b0ea71407a629e4edbbf15faf289ad59c8f4533b914d2946ea23

data/README.md

@@ -14,7 +14,7 @@ Three readings a day, sized by **verse count** so each day takes roughly the sam
 - **New Testament** — once through, a reading every day. 260 chapters over 270 days, long chapters are divided to even out the daily reading
 - **Psalms & Proverbs** — once each, interleaved in one track. 181 chapters have to cover 270 days, so some are divided, shared between the two books by verse load. **A psalm of 25 verses or fewer is never divided**, keeping 131 of the 150 whole; longer psalms and Proverbs chapters break at their turns of thought (see `CHAPTER_BREAKS`). **Psalm 119 is 11 sections of 16 verses** — two of its eight-verse acrostic stanzas each. Proverbs lands on 89 days, near its proportional share. **A divided chapter is always read on consecutive days**, so nothing is inserted between the parts of a split psalm.
 
-Genesis → Malachi and Revelation 22 both land on day 270, as does the second Proverbs 31 — the first falls on day 135, the midpoint. Psalm 150 comes in on day 269. Every day carries all three tracks. A typical day is ~119 verses (range 76–175).
+Genesis → Malachi and Revelation 22 both land on day 270, as does the second part of Proverbs 31.  Every day carries all three tracks. A typical day is ~119 verses (range 76–175).
 
 The schedule is pure deterministic Ruby (`Bible270::Plan`) — none of it is stored. Portions come from per-chapter verse counts in `Bible270::Versification`. The DB only holds readers, check-offs, comments, and sign-in tokens.
 

data/app/controllers/bible270/readers_controller.rb

@@ -7,7 +7,8 @@ module Bible270
       counts = Checkoff.group(:reader_id, :day).count
       @days_completed = Hash.new(0)
       counts.each { |(rid, day), n| @days_completed[rid] += 1 if n >= Plan.total_parts(day) }
-      @readers.sort_by! { |r| [-@days_completed[r.id], r.display_name.to_s] }
+      # Progress first, then by name — the same name ordering the admin list uses.
+      @readers.sort_by! { |r| [-@days_completed[r.id], r.sort_name] }
     end
 
     # The reader's own progress. Deliberately open to visitors: the panel shows an

data/app/helpers/bible270/plan_helper.rb

@@ -51,6 +51,19 @@ module Bible270
       end
     end
 
+    # 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.
+    def b270_mark(size: 38)
+      configured = Bible270.config.header_mark
+      return nil if configured == false
+
+      if configured.is_a?(String) && configured.present?
+        return image_tag(configured, width: size, height: size, alt: '', class: 'b270-mark')
+      end
+
+      content_tag :span, Favicon.inline_svg(size: size).html_safe, class: 'b270-mark'
+    end
+
     def b270_favicon_tag
       favicon = Bible270.config.favicon
       return if favicon == false

data/app/models/bible270/reader.rb

@@ -136,8 +136,12 @@ module Bible270
       update(bible_version: Translations.normalize(code))
     end
 
+    # 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
+    # order was inconsistent with the community page and read oddly next to names
+    # displayed first-name-first.
     def sort_name
-      [last_name, first_name].map { |n| n.to_s.strip.downcase }.join(' ').strip.presence || display_name.to_s.downcase
+      display_name.to_s.strip.downcase
     end
 
     # ---- staying signed in -------------------------------------------------

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

@@ -1,7 +1,12 @@
 <header class="b270-topbar">
   <div class="b270-brand">
-    <%= link_to Bible270.config.app_name, root_path, class: "b270-title" %>
-    <span class="b270-tagline"><%= Bible270.config.tagline %></span>
+    <%= link_to root_path, class: "b270-brandlink" do %>
+      <%= b270_mark %>
+      <span class="b270-brandtext">
+        <span class="b270-title"><%= Bible270.config.app_name %></span>
+        <span class="b270-tagline"><%= Bible270.config.tagline %></span>
+      </span>
+    <% end %>
   </div>
   <nav class="b270-nav">
     <%= link_to "Plan", root_path %>

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

@@ -14,7 +14,12 @@
   .b270-wrap{max-width:820px;margin:0 auto;padding:clamp(14px,3.5vw,36px) clamp(14px,4vw,40px) 64px}
 
   .b270-topbar{display:flex;align-items:center;gap:16px;flex-wrap:wrap;padding-bottom:20px;border-bottom:1px solid var(--line-soft);margin-bottom:26px}
-  .b270-brand{display:flex;flex-direction:column;margin-right:auto}
+  .b270-brand{display:flex;margin-right:auto}
+  /* The whole brand is one link, so the mark and the words highlight together. */
+  .b270-brandlink{display:flex;align-items:center;gap:12px;text-decoration:none}
+  .b270-brandtext{display:flex;flex-direction:column}
+  .b270-mark{display:flex;align-items:center;flex:none;line-height:0}
+  .b270-mark svg,.b270-mark img{display:block;border-radius:8px}
   .b270-title{font-family:"Spectral",Georgia,serif;font-weight:600;font-size:22px;text-decoration:none}
   .b270-tagline{font-size:12px;color:var(--faint);letter-spacing:.04em}
   .b270-nav{display:flex;align-items:center;gap:16px;font-size:14px}

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, :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, :remember_for, :require_sign_in_to_participate
 
     # Public labels.
     attr_accessor :app_name
@@ -318,7 +318,10 @@ module Bible270
     #
     # Expressed in seconds rather than 1.year because this file has to load
     # without ActiveSupport.
-    attr_accessor :remember_for
+    # 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
 
     def remember_signed_in?
       remember_for.to_i.positive?
@@ -340,6 +343,7 @@ module Bible270
       end
       @app_name = 'Daily Bread'
       @tagline = 'Journeying through Scripture in 9 months'
+      @header_mark = nil
       @remember_for = 365 * 24 * 60 * 60
       @require_sign_in_to_participate = true
       self.mount_at = '/daily-bread'

data/lib/bible270/favicon.rb

@@ -32,5 +32,16 @@ module Bible270
       compact = SVG.gsub(%r{\s+}, ' ').strip
       "data:image/svg+xml,#{compact.gsub(' ', '%20')}"
     end
+
+    # The same mark for inline use in a page, at whatever size. The percent
+    # encoding above is only correct inside a data URI: inlined into HTML,
+    # '%23231f18' is not a colour, so it is decoded here.
+    def inline_svg(size: nil)
+      markup = SVG.gsub('%23', '#').strip
+      return markup if size.nil?
+
+      pixels = size.to_i
+      markup.sub('<svg ', "<svg width='#{pixels}' height='#{pixels}' ")
+    end
   end
 end

data/lib/bible270/version.rb

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

metadata

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