bible270 0.17.0 → 0.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2e0821b84cb0bc7ece339c39775d9b7b814b4f274e721f112cc393aabfc5093
-  data.tar.gz: 53f7e5d9386bfd4f9ae14ed6ac56daedab5df0139c0043e4bac6576bde257ed2
+  metadata.gz: 70091a35da0211de345d0a946f8fe25aea94c7656d7f9fb7b305aa63c6a1b7e6
+  data.tar.gz: 98e6db18fb16bdb784b7b2ad095b05860a43a81cb3111279f33b7285345bcbd0
 SHA512:
-  metadata.gz: ef8060ffe3f6a7c99e35978886609c580e091a0bb0b6f86b809ef7bf8afa8bdda919f7e94c97f04ca5bf69e30b5b70b79b37333fb0850073864d40ed3bf8b909
-  data.tar.gz: c17db24c8ca3ab97e950f2fa516f5366b9d98dcbaa0422a4130acab6031bdeeb1a7faefed1d28e6f4ea44f77404ea3a50a28c041b8bba48edab4936bf158313c
+  metadata.gz: e03f11e9596c52e59413478a3c5c615ce5bc9f4289ecbed3a037906d51d70e515d56767d18324ba331dded40de502d0d6b7c741c603836d7e351d147375187df
+  data.tar.gz: f2496c1342b3be1625927fdbbecd333c1792d96c8c52742359bdfc9cb66e9de7ac0f3617b20b291ee081811e4d937a92e3dbbecc9c5ee29a3c3d0788db9f473a

data/app/controllers/bible270/comments_controller.rb

@@ -92,7 +92,9 @@ module Bible270
       end
 
       ids = roots.sort_by { |_root, at| -at.to_i }.first(wanted).map(&:first)
-      threads = Comment.approved.where(id: ids).includes(:reader, replies: :reader).index_by(&:id)
+      threads = Comment.approved.where(id: ids)
+        .includes(:reader, { likes: :reader }, { replies: [:reader, { likes: :reader }] })
+        .index_by(&:id)
       ids.filter_map { |id| threads[id] }
     end
 

data/app/controllers/bible270/likes_controller.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Bible270
+  # A heart on someone's reflection. One route, because liking and unliking are
+  # the same gesture — tapping the heart again takes it back.
+  class LikesController < ApplicationController
+    def toggle
+      return unless require_reader!
+
+      @comment = Comment.approved.find_by(id: params[:id])
+      head :not_found and return unless @comment
+
+      @comment.toggle_like!(current_reader)
+      @comment.reload
+
+      respond_to do |format|
+        format.turbo_stream
+        format.html { redirect_to day_path(@comment.day, anchor: "comment-#{@comment.id}") }
+      end
+    end
+  end
+end

data/app/helpers/bible270/plan_helper.rb

@@ -137,6 +137,18 @@ module Bible270
       end
     end
 
+    # Timestamps in the plan's zone rather than UTC. Dates — started_on and the
+    # like — need no conversion and are formatted inline.
+    def b270_date(time)
+      local = Bible270.local_time(time)
+      local&.strftime('%b %-d, %Y')
+    end
+
+    def b270_datetime(time)
+      local = Bible270.local_time(time)
+      local&.strftime('%b %-d, %Y at %-I:%M %p')
+    end
+
     # Only the writer may change their own words. An admin can remove a reflection
     # but not rewrite it: putting words in someone's mouth is worse than taking
     # them away, and taking them away is already the moderator's job.

data/app/models/bible270/comment.rb

@@ -3,6 +3,15 @@
 module Bible270
   # A publicly visible reflection attached to a plan day (optionally a track).
   class Comment < ApplicationRecord
+    # One heart for both states. An unliked one is the same emoji shown grey by
+    # CSS, so it cannot drift in size from a real like, and hovering it previews
+    # exactly what clicking will produce.
+    #
+    # The white heart this replaced was legible on white but nearly invisible on
+    # the paper background; an outline glyph like U+2661 is drawn by the font
+    # rather than the emoji set and needs hand-tuning to match.
+    HEART = '❤️'
+
     self.table_name = 'bible270_comments'
 
     belongs_to :reader, class_name: 'Bible270::Reader'
@@ -12,6 +21,7 @@ module Bible270
     belongs_to :parent, class_name: 'Bible270::Comment', optional: true
     has_many :replies, class_name: 'Bible270::Comment', foreign_key: :parent_id,
                        dependent: :destroy, inverse_of: :parent
+    has_many :likes, class_name: 'Bible270::Like', dependent: :destroy, inverse_of: :comment
 
     validates :day, inclusion: { in: 1..Plan::DAYS }
     validates :body, presence: true, length: { maximum: 4000 }
@@ -37,7 +47,9 @@ module Bible270
     # Only the reflections themselves: replies are rendered under their parent, so
     # listing them again at the top level would show each twice.
     scope :for_day,  ->(d) { approved.where(day: d, parent_id: nil).order(created_at: :asc) }
-    scope :threads_for_day, ->(d) { for_day(d).includes(:reader, replies: :reader) }
+    scope :threads_for_day, ->(d) {
+      for_day(d).includes(:reader, { likes: :reader }, { replies: [:reader, { likes: :reader }] })
+    }
     scope :recent, -> { approved.order(created_at: :desc) }
 
     # Every reflection is visible when written; these are the moderation actions.
@@ -46,9 +58,30 @@ module Bible270
     def hidden?  = !approved
     def reply?   = parent_id.present?
 
+    def liked_by?(reader)
+      return false if reader.nil?
+
+      likes.any? { |like| like.reader_id == reader.id }
+    end
+
+    # Toggling returns the new state, so a caller can say what happened without
+    # asking again.
+    def toggle_like!(reader)
+      existing = likes.find { |like| like.reader_id == reader.id }
+      if existing
+        existing.destroy
+        likes.reload
+        false
+      else
+        likes.create(reader: reader)
+        likes.reload
+        true
+      end
+    end
+
     # A second's grace: created_at and updated_at differ by microseconds on
     # insert, which would mark every reflection as edited.
-    def edited?  = updated_at - created_at > 1
+    def edited? = updated_at - created_at > 1
 
     # Visible replies, oldest first: a conversation reads forwards.
     def visible_replies = replies.approved.order(created_at: :asc)

data/app/models/bible270/like.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Bible270
+  # A reader's heart on a reflection. There is nothing to a like but who gave it
+  # and when — the count is the number of rows, and the hover text is the name.
+  class Like < ApplicationRecord
+    self.table_name = 'bible270_likes'
+
+    belongs_to :reader, class_name: 'Bible270::Reader'
+    belongs_to :comment, class_name: 'Bible270::Comment'
+
+    validates :reader_id, uniqueness: { scope: :comment_id }
+  end
+end

data/app/models/bible270/reader.rb

@@ -8,6 +8,7 @@ module Bible270
 
     has_many :checkoffs, class_name: 'Bible270::Checkoff', dependent: :destroy
     has_many :comments,  class_name: 'Bible270::Comment',  dependent: :destroy
+    has_many :likes,     class_name: 'Bible270::Like',     dependent: :destroy, inverse_of: :reader
     belongs_to :owner, polymorphic: true, optional: true
 
     # Active Storage is optional: an app may have it disabled, and the engine has

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

@@ -18,7 +18,7 @@
         <div class="b270-cmeta">
           <strong><%= comment.reader.display_name %></strong>
           · <%= link_to "day #{comment.day}", day_path(comment.day) %>
-          · <%= comment.created_at.strftime('%b %-d, %Y') %>
+          · <%= b270_date(comment.created_at) %>
           <% if comment.reply? %>· reply to <strong><%= comment.parent&.reader&.display_name || 'a deleted reflection' %></strong><% end %>
           <% if comment.hidden? %><span class="b270-badge">Hidden</span><% end %>
         </div>

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

@@ -9,7 +9,7 @@
   <% if @enrollment_closed %>
     <% if @enrollment_closed_at %>
       <p class="b270-startline">Enrollment closed
-      on <%= @enrollment_closed_at.strftime('%B %-d, %Y') %><% end %>.
+      on <%= b270_date(@enrollment_closed_at) %><% end %>.
       The <%= @readers.size %> reader<%= 's' unless @readers.size == 1 %> already taking part can
       still sign in and carry on.</p>
     <%= button_to 'Open to new readers', admin_enrollment_path, method: :patch,

data/app/views/bible270/comments/_comment.html.erb

@@ -11,9 +11,9 @@
   <div style="flex:1">
     <div class="b270-cmeta">
       <strong><%= link_to comment.reader.display_name, reader_path(comment.reader), style: "text-decoration:none" %></strong>
-      · <%= comment.created_at.strftime("%b %-d, %Y") %>
+      · <%= b270_date(comment.created_at) %>
       <% if comment.track.present? %>· <%= b270_track(comment.track)[:label] %><% end %>
-      <% if comment.edited? %>· <span class="b270-edited" title="<%= comment.updated_at.strftime('%b %-d, %Y at %-I:%M %p') %>">edited</span><% end %>
+      <% if comment.edited? %>· <span class="b270-edited" title="<%= b270_datetime(comment.updated_at) %>">edited</span><% end %>
       <% if b270_can_edit?(comment) %>
         <%= link_to "edit", day_path(comment.day, edit: comment.id, anchor: "comment-#{comment.id}"),
               class: "b270-cedit" %>
@@ -37,13 +37,16 @@
 
     <%# Only a top-level reflection can be replied to: one level deep, so a reply
         offers no Reply of its own. %>
-    <% unless reply %>
-      <% if signed_in? && comment.reader_id != current_reader.id %>
-        <div class="b270-creply">
-          <%= link_to "Reply", day_path(comment.day, reply_to: comment.id, anchor: "new_comment_form"),
-                class: "b270-linkbtn" %>
-        </div>
+    <div class="b270-cactions">
+      <%= render partial: "bible270/likes/likes", locals: { comment: comment } %>
+      <%# A reply may be liked but not replied to: one level deep. %>
+      <% if !reply && signed_in? && comment.reader_id != current_reader.id %>
+        <%= link_to "Reply", day_path(comment.day, reply_to: comment.id, anchor: "new_comment_form"),
+              class: "b270-linkbtn" %>
       <% end %>
+    </div>
+
+    <% unless reply %>
 
       <div class="b270-replies" id="replies-<%= comment.id %>">
         <%= render partial: "bible270/comments/comment",

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

@@ -2,7 +2,7 @@
 <% content_for :hide_day_index, true %><%# this page has its own, filtered grid %>
 
 <p class="b270-eyebrow">Reflections</p>
-<h1>What people are saying</h1>
+<h1>Shared gleanings</h1>
 
 <% if @days_with_reflections.any? %>
   <div class="b270-panel">

data/app/views/bible270/likes/_likes.html.erb

@@ -0,0 +1,27 @@
+<%# locals: (comment:) %>
+<%#
+  One heart per like, each carrying its giver's name — so a row of hearts is both
+  the count and, on hover, the list of who.
+
+  Your own like is not drawn in the row: the button is your heart, filled, and
+  saying so. Drawing both gave a reader two hearts for one like.
+%>
+<%
+  liked = signed_in? && comment.liked_by?(current_reader)
+  others = signed_in? ? comment.likes.reject { |like| like.reader_id == current_reader.id } : comment.likes
+%>
+<span class="b270-likes" id="likes-<%= comment.id %>">
+  <% others.each do |like| %><span class="b270-heart"
+      title="<%= like.reader.display_name %>"><%= Bible270::Comment::HEART %></span><% end %>
+
+  <% if signed_in? %>
+    <%= button_to like_comment_path(comment), method: :post, class: "b270-likebtn#{' liked' if liked}",
+          form: { style: "display:inline", data: { turbo_stream: true } },
+          aria: { label: liked ? "Take back your like" : "Like this reflection" },
+          title: liked ? "You liked this — tap to take it back" : "Like this reflection" do %>
+      <%= Bible270::Comment::HEART %>
+    <% end %>
+  <% elsif comment.likes.any? %>
+    <span class="b270-likecount"><%= comment.likes.size %></span>
+  <% end %>
+</span>

data/app/views/bible270/likes/toggle.turbo_stream.erb

@@ -0,0 +1,3 @@
+<%= turbo_stream.replace "likes-#{@comment.id}" do %>
+  <%= render partial: "bible270/likes/likes", locals: { comment: @comment } %>
+<% end %>

data/app/views/bible270/notice_mailer/new_reader.html.erb

@@ -11,7 +11,7 @@
         <tr><td style="padding:3px 12px 3px 0;color:#6d6558">Name</td><td><%= @reader.display_name %></td></tr>
         <tr><td style="padding:3px 12px 3px 0;color:#6d6558">Email</td><td><%= @reader.email.presence || '(none given)' %></td></tr>
         <tr><td style="padding:3px 12px 3px 0;color:#6d6558">Signed in with</td><td><%= @reader.provider.presence || 'the host application' %></td></tr>
-        <tr><td style="padding:3px 12px 3px 0;color:#6d6558">Joined</td><td><%= @reader.created_at.strftime('%B %-d, %Y at %-I:%M %p') %></td></tr>
+        <tr><td style="padding:3px 12px 3px 0;color:#6d6558">Joined</td><td><%= Bible270.local_time(@reader.created_at).strftime('%B %-d, %Y at %-I:%M %p') %></td></tr>
       </table>
 
       <p style="margin:18px 0 0;font-size:14px;color:#6d6558">

data/app/views/bible270/notice_mailer/new_reader.text.erb

@@ -3,7 +3,7 @@
   Name:        <%= @reader.display_name %>
   Email:       <%= @reader.email.presence || '(none given)' %>
   Signed in with: <%= @reader.provider.presence || 'the host application' %>
-  Joined:      <%= @reader.created_at.strftime('%B %-d, %Y at %-I:%M %p') %>
+  Joined:      <%= Bible270.local_time(@reader.created_at).strftime('%B %-d, %Y at %-I:%M %p') %>
 
 That makes <%= @total %> reader<%= 's' unless @total == 1 %> taking part.
 <% if @admin_url %>

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

@@ -11,7 +11,7 @@
         <%= b270_avatar(r, size: 40) %>
         <div>
           <div class="name"><%= link_to r.display_name, reader_path(r), style: "text-decoration:none" %></div>
-          <div class="sub"><%= @days_completed[r.id] %> of <%= Bible270::Plan::DAYS %> days · joined <%= r.created_at.strftime("%b %Y") %></div>
+          <div class="sub"><%= @days_completed[r.id] %> of <%= Bible270::Plan::DAYS %> days · joined <%= Bible270.local_time(r.created_at).strftime("%b %Y") %></div>
         </div>
         <div class="stat">
           <span class="big"><%= (@days_completed[r.id].to_f / Bible270::Plan::DAYS * 100).round %>%</span>

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

@@ -12,11 +12,11 @@
     <!--<%= link_to "Plan", root_path %>-->
     <%= link_to "People", community_path %>
     <%# Public, like the community page: anyone may read reflections. %>
-    <%= link_to "Reflections", reflections_path %>
+    <%= link_to "Posts", reflections_path %>
     <% if signed_in? %>
-      <% if Bible270.config.admin?(current_reader) %><%= link_to "Admin", admin_path %><% end %>
       <%= link_to "Progress", progress_path %>
       <%= link_to "Profile", profile_path %>
+      <% if Bible270.config.admin?(current_reader) %><%= link_to "Admin", admin_path %><% end %>
       <%= button_to "Sign out", sign_out_path, method: :delete, class: "b270-linkbtn",
             form: { style: "display:inline" } %>
     <% elsif Bible270.config.any_sign_in_method? %>

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

@@ -19,7 +19,7 @@
       <div style="flex:1">
         <div class="b270-cmeta">
           <%= link_to "Day #{comment.day}", day_path(comment.day) %>
-          · <%= comment.created_at.strftime("%b %-d, %Y") %>
+          · <%= b270_date(comment.created_at) %>
           <% if moderate && comment.hidden? %><span class="b270-badge">Hidden</span><% end %>
         </div>
 

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

@@ -161,6 +161,17 @@
   .b270-replying strong{color:var(--ink)}
   .b270-mention{color:var(--teal);font-weight:600;text-decoration:none}
   .b270-mention:hover{text-decoration:underline}
+  .b270-cactions{display:flex;align-items:center;gap:12px;margin-top:6px;flex-wrap:wrap}
+  .b270-likes{display:inline-flex;align-items:center;gap:2px}
+  .b270-heart{font-size:13px;line-height:1;cursor:default}
+  /* Same size as a heart in the row: the button is one of the hearts, not a
+     control sitting beside them. Unliked, it is the same emoji desaturated —
+     visible against the paper, and hovering shows what clicking will give. */
+  .b270-likebtn{background:none;border:0;padding:0 2px;font-size:13px;line-height:1;cursor:pointer;
+                filter:grayscale(1);opacity:.5;transition:filter .12s,opacity .12s}
+  .b270-likebtn:hover{filter:none;opacity:1}
+  .b270-likebtn.liked{filter:none;opacity:1}
+  .b270-likecount{font-size:11.5px;color:var(--faint);margin-left:2px}
   .b270-creply{margin-top:6px}
   .b270-cbody{margin:3px 0 0;white-space:pre-wrap}
   .b270-editform{margin-top:6px}

data/config/routes.rb

@@ -12,6 +12,7 @@ Bible270::Engine.routes.draw do
                                    constraints: { day: %r{\d+} }
   post   'day/:day/comments',      to: 'comments#create',  as: :day_comments,
                                    constraints: { day: %r{\d+} }
+  post   'comments/:id/like',      to: 'likes#toggle',     as: :like_comment
   patch  'comments/:id',           to: 'comments#update'
   delete 'comments/:id',           to: 'comments#destroy', as: :comment
 

data/db/migrate/20260101000013_create_bible270_likes.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class CreateBible270Likes < ActiveRecord::Migration[7.0]
+  def change
+    create_table :bible270_likes do |t|
+      t.references :reader, null: false, index: false,
+                            foreign_key: { to_table: :bible270_readers }
+      t.references :comment, null: false, index: false,
+                             foreign_key: { to_table: :bible270_comments }
+      t.timestamps
+    end
+
+    # One like per reader per reflection, enforced by the database as well as the
+    # model: a double-tap should not become two hearts.
+    add_index :bible270_likes, %i[reader_id comment_id], unique: true,
+                               name: 'idx_b270_likes_unique'
+    # Reading a thread asks for a comment's likes, so that is the index that earns
+    # its keep.
+    add_index :bible270_likes, :comment_id, name: 'idx_b270_likes_comment'
+  end
+end

data/lib/bible270/version.rb

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

data/lib/bible270.rb

@@ -22,10 +22,24 @@ module_function
   # it; Date.today follows the machine. A self-hosted reading plan wants the
   # latter, so that is the default, with config.time_zone to override.
   def today
-    zone = config.time_zone
-    return Date.today if zone.nil? || zone.to_s.empty?
+    local_time(Time.now).to_date
+  end
 
-    found = Time.respond_to?(:find_zone) ? Time.find_zone(zone) : nil
-    found ? found.today : Date.today
+  # A stored timestamp in the plan's own zone.
+  #
+  # created_at and friends come back in Rails' Time.zone, which is UTC unless the
+  # host app sets it — so a reflection written at 5pm in Los Angeles was being
+  # shown as the next day. This is the same rule Bible270.today follows: the
+  # machine's zone, or config.time_zone when one is given.
+  def local_time(time)
+    return nil if time.nil?
+
+    zone = config.time_zone
+    if zone.to_s.empty?
+      time.getlocal
+    else
+      found = Time.respond_to?(:find_zone) ? Time.find_zone(zone) : nil
+      found ? time.in_time_zone(found) : time.getlocal
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bible270
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.17.1
 platform: ruby
 authors:
 - Andrew vonderLuft
@@ -85,6 +85,7 @@ files:
 - app/controllers/bible270/checkoffs_controller.rb
 - app/controllers/bible270/comments_controller.rb
 - app/controllers/bible270/days_controller.rb
+- app/controllers/bible270/likes_controller.rb
 - app/controllers/bible270/profiles_controller.rb
 - app/controllers/bible270/readers_controller.rb
 - app/controllers/bible270/sessions_controller.rb
@@ -95,6 +96,7 @@ files:
 - app/models/bible270/application_record.rb
 - app/models/bible270/checkoff.rb
 - app/models/bible270/comment.rb
+- app/models/bible270/like.rb
 - app/models/bible270/reader.rb
 - app/models/bible270/setting.rb
 - app/models/bible270/sign_in_token.rb
@@ -115,6 +117,8 @@ files:
 - app/views/bible270/days/_start_date.html.erb
 - app/views/bible270/days/index.html.erb
 - app/views/bible270/days/show.html.erb
+- app/views/bible270/likes/_likes.html.erb
+- app/views/bible270/likes/toggle.turbo_stream.erb
 - app/views/bible270/notice_mailer/mentioned.html.erb
 - app/views/bible270/notice_mailer/mentioned.text.erb
 - app/views/bible270/notice_mailer/new_reader.html.erb
@@ -148,6 +152,7 @@ files:
 - db/migrate/20260101000010_add_remember_token_to_bible270_readers.rb
 - db/migrate/20260101000011_add_mention_notices_to_bible270_readers.rb
 - db/migrate/20260101000012_add_parent_to_bible270_comments.rb
+- db/migrate/20260101000013_create_bible270_likes.rb
 - lib/bible270.rb
 - lib/bible270/avatars.rb
 - lib/bible270/configuration.rb