bible270 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84d3ca14b2813767c7f837ec1844feaaff31b1ac12e37d691c95b8975313a9e9
-  data.tar.gz: 69374a41cfaed437a5bb0367ac66b7500949cda2654e9f80e5ab46f9f8822547
+  metadata.gz: 67906d69eea518bcb8153f7510c86ada862bf55aad58a89cdd1279033f91ed7c
+  data.tar.gz: a8ca91bbd8a8ea72e53f07c0ac6e508b8f7997ad0ed789c4d19921240802798f
 SHA512:
-  metadata.gz: 71c2ef21eb61bb68359ed3cd202ecc0278082cc97a18e4f9886093799d065409fd0529775edeb1a42f33d25a6ceaac702f44d7c53b59fda82e2c91d894cb704f
-  data.tar.gz: 1cbd38d2f361892bb1cab9f981986598d3d03bc2c04ce63506d60907aca58b57ffd96f2dc9f607ead5dc1c6966086954898e60b7826955b9960c769aa8b8c26e
+  metadata.gz: af14bd94dbda0373bb668e04f2538a5a85a3083cf5b959532cfc01300f1cdb3eba55b6cd91dda931ba9f47960a75d57512c009ceab547661534cb34850136197
+  data.tar.gz: 2b5ca2cad90026e4bda8ebc28ed201e027da09b3a8e7e4bbb1af7a482260e390f9ff345b591abd82bcd7748cc93494518dee2d9bc53b24306742626f06c1eb2a

data/README.md

@@ -1,6 +1,6 @@
 # Bible 270
 
-[![Gem Version](https://badge.fury.io/rb/bible270.svg?refresh=1)](https://badge.fury.io/rb/bible270) [![Gem Downloads](https://img.shields.io/gem/dt/bible270.svg?style=flat)](http://rubygems.org/gems/bible270) [![GitHub Release Date - Published_At](https://img.shields.io/github/release-date/avonderluft/bible270?label=last%20release&color=seagreen)](https://github.com/avonderluft/bible270/releases)
+[![Gem Version](https://img.shields.io/gem/v/bible270)](https://rubygems.org/gems/bible270) [![Downloads](https://img.shields.io/gem/dt/bible270)](https://rubygems.org/gems/bible270) [![GitHub Release Date - Published_At](https://img.shields.io/github/release-date/avonderluft/bible270?label=last%20release&color=seagreen)](https://github.com/avonderluft/bible270/releases)
 
 A mountable **Rails engine** that drops a 270-day (9 month) interactive Bible reading plan into any Rails app, built with [ComfortableMediaSurfer](https://github.com/shakacode/comfortable-media-surfer) CMS in mind. Readers tick off each day's readings, post reflections, and see how everyone else is getting on, much like the social plans on Bible.com.
 

data/app/controllers/bible270/sessions_controller.rb

@@ -35,7 +35,7 @@ module Bible270
       session[:bible270_reader_id] = reader.id
       @current_reader = reader
 
-      redirect_to destination, notice: "Welcome, #{reader.display_name}."
+      redirect_to destination, notice: "Welcome #{reader.first_name}."
     end
 
     def destroy
@@ -71,7 +71,7 @@ module Bible270
       names = Names.normalize(params[:first_name], params[:last_name])
 
       _record, raw = SignInToken.issue!(address, first_name: names&.dig(:first_name),
-                                                last_name: names&.dig(:last_name))
+                                                 last_name: names&.dig(:last_name))
 
       if raw && enrollment_closed? && !Reader.email_reader_exists?(address)
         Rails.logger.info("[bible270] enrolment closed; no link sent to #{address}")
@@ -102,7 +102,7 @@ module Bible270
       end
 
       reader = Reader.from_email(token.email, first_name: token.first_name,
-                                 last_name: token.last_name, display_name: token.display_name)
+                                              last_name: token.last_name, display_name: token.display_name)
       redirect_to(sign_in_path, alert: "We couldn't set up your reader profile.") and return unless reader&.persisted?
 
       destination = safe_origin(params[:origin]) || after_sign_in_path
@@ -117,7 +117,7 @@ module Bible270
         return
       end
 
-      redirect_to destination, notice: "Welcome, #{reader.display_name}."
+      redirect_to destination, notice: "Welcome #{reader.first_name}."
     end
 
   private

data/app/models/bible270/reader.rb

@@ -106,6 +106,14 @@ module Bible270
       [first_name, last_name].map { |n| n.to_s.strip }.reject(&:empty?).join(' ').presence
     end
 
+    # Shorter than the full name, for lists where a surname is more than needed.
+    # Falls back to the display name for readers who arrived with only one.
+    def first_with_last_initial
+      return display_name if first_name.blank?
+
+      Names.first_with_last_initial(first_name, last_name).presence || display_name
+    end
+
     def sort_name
       [last_name, first_name].map { |n| n.to_s.strip.downcase }.join(' ').strip.presence || display_name.to_s.downcase
     end

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

@@ -1,7 +1,7 @@
 <% content_for :title, "Community — #{Bible270.config.app_name}" %>
 <p class="b270-eyebrow">Reading together</p>
 <h1>The community</h1>
-<p class="lede">Everyone journeying through the plan, and how far each has come.</p>
+<p class="lede">Everyone walking through the Word, seeing each pilgrim's progress.</p>
 
 <% if @readers.any? %>
   <div class="b270-list">

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

@@ -5,10 +5,10 @@
   </div>
   <nav class="b270-nav">
     <%= link_to "Plan", root_path %>
-    <%= link_to "Community", community_path %>
+    <%= link_to "People", community_path %>
     <% if signed_in? %>
       <% if Bible270.config.admin?(current_reader) %><%= link_to "Admin", admin_path %><% end %>
-      <%= link_to current_reader.display_name, reader_path(current_reader), class: "b270-me" %>
+      <%= link_to current_reader.first_with_last_initial, reader_path(current_reader), class: "b270-me" %>
       <%= link_to "Profile", profile_path %>
       <%= button_to "Sign out", sign_out_path, method: :delete, class: "b270-linkbtn",
             form: { style: "display:inline" } %>

data/lib/bible270/names.rb

@@ -23,6 +23,9 @@ module Bible270
       last_name  = squish(last)
       return nil if first_name.empty? || last_name.empty?
 
+      # Only persisted columns belong here — this hash is assigned straight onto
+      # the model. Anything derived (see first_with_last_initial) is computed on
+      # demand, so it can't go stale when a name is edited.
       {
         first_name: first_name,
         last_name: last_name,
@@ -30,6 +33,22 @@ module Bible270
       }
     end
 
+    # "Andrew vonderLuft" -> "Andrew v."
+    # Particles are kept out of the initial: "von der Luft" gives "L.", not "v.",
+    # since the last word is the one people are known by.
+    def first_with_last_initial(first, last)
+      first_name = squish(first)
+      surname    = squish(last)
+      return first_name if surname.empty?
+
+      initial = surname.split.last[0]
+      return first_name if initial.nil?
+
+      # Not upcased: a lowercase surname is usually deliberate (vonderLuft), and
+      # forcing "V." would override how someone writes their own name.
+      "#{first_name} #{initial}.".strip
+    end
+
     def valid?(first, last)
       !normalize(first, last).nil?
     end

data/lib/bible270/version.rb

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

metadata

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