From 51dcf8b25f8c87bc5c37599bfbed54b0a0c50ed1 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Mon, 2 Jun 2025 13:08:43 +0200
Subject: [PATCH 1/7] Invalidate card caches when editing workflows

https://37s.fizzy.37signals.com/collections/2/cards/607
---
 app/models/workflow/stage.rb                     | 2 +-
 app/views/cards/display/_preview.html.erb        | 2 +-
 app/views/cards/index/engagement/_doing.html.erb | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/models/workflow/stage.rb b/app/models/workflow/stage.rb
index 2cc0eb78f..8966d0000 100644
--- a/app/models/workflow/stage.rb
+++ b/app/models/workflow/stage.rb
@@ -1,5 +1,5 @@
 class Workflow::Stage < ApplicationRecord
-  belongs_to :workflow
+  belongs_to :workflow, touch: true
 
   before_validation :assign_random_color, on: :create
 
diff --git a/app/views/cards/display/_preview.html.erb b/app/views/cards/display/_preview.html.erb
index 071630a8d..f976117a8 100644
--- a/app/views/cards/display/_preview.html.erb
+++ b/app/views/cards/display/_preview.html.erb
@@ -1,4 +1,4 @@
-<% cache card do %>
+<% cache [ card, card.collection.workflow ] do %>
   <%= card_article_tag card, class: "card" do %>
     <div class="flex gap">
       <div class="flex flex-column flex-item-grow">
diff --git a/app/views/cards/index/engagement/_doing.html.erb b/app/views/cards/index/engagement/_doing.html.erb
index 216866e85..fe652ac8c 100644
--- a/app/views/cards/index/engagement/_doing.html.erb
+++ b/app/views/cards/index/engagement/_doing.html.erb
@@ -8,7 +8,7 @@
   <% end %>
 
   <% if page.used? %>
-    <%= render partial: "cards/display/preview", collection: page.records, as: :card, cached: true %>
+    <%= render partial: "cards/display/preview", collection: page.records, as: :card, cached: ->(record) { [ record, record.collection.workflow ] } %>
 
     <% unless page.last? %>
       <%= cards_next_page_link "doing-cards", page: page, filter: filter %>

From 08c5abfbdb07dfccfe8d645bf31be815ffb89ff6 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Mon, 2 Jun 2025 18:03:14 +0200
Subject: [PATCH 2/7] Extract common method to query when entropy is cleaned

We were always quering auto_close_at
https://37s.fizzy.37signals.com/collections/2/cards/743
---
 .../controllers/navigable_list_controller.js   |  2 +-
 app/models/card/entropy.rb                     | 18 +++++++++++++++---
 .../cards/display/preview/_bubble.html.erb     |  2 +-
 test/models/card/entropy_test.rb               | 10 ++++++++++
 4 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/app/javascript/controllers/navigable_list_controller.js b/app/javascript/controllers/navigable_list_controller.js
index 44f3faef6..9b96c1b08 100644
--- a/app/javascript/controllers/navigable_list_controller.js
+++ b/app/javascript/controllers/navigable_list_controller.js
@@ -3,7 +3,7 @@ import { nextFrame } from "helpers/timing_helpers"
 
 export default class extends Controller {
   static targets = [ "item" ]
-  static values = { selectionAttribute: { type: String, default: "aria-selected" } }
+  static values = { selectionAttribute: { type: String, default: "aria-current" } }
 
   connect() {
     this.selectLast()
diff --git a/app/models/card/entropy.rb b/app/models/card/entropy.rb
index b0eded7a3..511832513 100644
--- a/app/models/card/entropy.rb
+++ b/app/models/card/entropy.rb
@@ -26,11 +26,19 @@ module Card::Entropy
   end
 
   def subject_to_entropy?
-    doing? || (auto_closing? && considering?)
+    auto_reconsidering? || auto_closing?
+  end
+
+  def auto_reconsidering?
+    doing? && last_active_at
+  end
+
+  def auto_closing?
+    considering? && collection.auto_closing? && last_active_at
   end
 
   def auto_close_at
-    last_active_at + auto_close_period if auto_closing? && last_active_at
+    last_active_at + auto_close_period if auto_closing?
   end
 
   def days_until_close
@@ -38,10 +46,14 @@ module Card::Entropy
   end
 
   def auto_reconsider_at
-    last_active_at + AUTO_RECONSIDER_PERIOD if last_active_at
+    last_active_at + AUTO_RECONSIDER_PERIOD if auto_reconsidering?
   end
 
   def days_until_reconsider
     (auto_reconsider_at.to_date - Date.current).to_i if auto_reconsider_at
   end
+
+  def entropy_cleaned_at
+    auto_close_at || auto_reconsider_at
+  end
 end
diff --git a/app/views/cards/display/preview/_bubble.html.erb b/app/views/cards/display/preview/_bubble.html.erb
index c05989755..f0e3df352 100644
--- a/app/views/cards/display/preview/_bubble.html.erb
+++ b/app/views/cards/display/preview/_bubble.html.erb
@@ -1,7 +1,7 @@
 <div hidden class="bubble bubble--<%= card.engagement_status %>"
      data-controller="bubble" data-action="turbo:morph-element->bubble#update"
      data-bubble-reminder-before-value="<%= Card::ENTROPY_REMINDER_BEFORE.in_days.to_i %>"
-     data-bubble-closes-at-value="<%= card.auto_close_at.iso8601 %>"
+     data-bubble-closes-at-value="<%= card.entropy_cleaned_at.iso8601 %>"
      data-bubble-entropy-action-value="<%= card_entropy_action(card) %>">
   <svg viewBox="0 0 200 100">
     <path id="top-half" fill="transparent" d="M 20,100 A 80,80 0 0,1 180,100" />
diff --git a/test/models/card/entropy_test.rb b/test/models/card/entropy_test.rb
index 8858052b2..1456cec19 100644
--- a/test/models/card/entropy_test.rb
+++ b/test/models/card/entropy_test.rb
@@ -47,4 +47,14 @@ class Card::EntropyTest < ActiveSupport::TestCase
     assert cards(:logo).reload.considering?
     assert_equal Time.current, cards(:logo).last_active_at
   end
+
+  test "entropy_cleaned_at returns when the entropy will be cleaned" do
+    cards(:logo).reconsider
+    assert_equal cards(:logo).auto_close_at, cards(:logo).entropy_cleaned_at
+    assert_not_nil cards(:logo).entropy_cleaned_at
+
+    cards(:logo).engage
+    assert_equal cards(:logo).auto_reconsider_at, cards(:logo).entropy_cleaned_at
+    assert_not_nil cards(:logo).entropy_cleaned_at
+  end
 end

From 3a5ce1ca4c67a18aaccdcbfc7463d7d456673283 Mon Sep 17 00:00:00 2001
From: Mike Dalessio <mike@37signals.com>
Date: Mon, 2 Jun 2025 12:26:45 -0400
Subject: [PATCH 3/7] No need to delegate auto_closing? anymore

Related to #568
---
 app/models/card/entropy.rb         |  2 +-
 test/models/card/closeable_test.rb |  8 --------
 test/models/card/entropy_test.rb   | 14 ++++++++++----
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/app/models/card/entropy.rb b/app/models/card/entropy.rb
index 511832513..0b6f6e4aa 100644
--- a/app/models/card/entropy.rb
+++ b/app/models/card/entropy.rb
@@ -10,7 +10,7 @@ module Card::Entropy
     scope :stagnated,        -> { doing.where(last_active_at: ..AUTO_RECONSIDER_PERIOD.ago) }
     scope :due_to_be_closed, -> { considering.in_auto_closing_collection.where("last_active_at <= DATETIME('now', '-' || auto_close_period || ' seconds')") }
 
-    delegate :auto_closing?, :auto_close_period, to: :collection
+    delegate :auto_close_period, to: :collection
   end
 
   class_methods do
diff --git a/test/models/card/closeable_test.rb b/test/models/card/closeable_test.rb
index ddf298d29..11b454eec 100644
--- a/test/models/card/closeable_test.rb
+++ b/test/models/card/closeable_test.rb
@@ -18,12 +18,4 @@ class Card::CloseableTest < ActiveSupport::TestCase
     assert cards(:logo).closed?
     assert_equal users(:kevin), cards(:logo).closed_by
   end
-
-  test "autoclose_at infers the period from the collection" do
-    freeze_time
-
-    collections(:writebook).update! auto_close_period: 123.days
-    cards(:logo).update! last_active_at: 2.day.ago
-    assert_equal (123-2).days.from_now, cards(:logo).auto_close_at
-  end
 end
diff --git a/test/models/card/entropy_test.rb b/test/models/card/entropy_test.rb
index 1456cec19..2c20f58a8 100644
--- a/test/models/card/entropy_test.rb
+++ b/test/models/card/entropy_test.rb
@@ -5,6 +5,14 @@ class Card::EntropyTest < ActiveSupport::TestCase
     Current.session = sessions(:david)
   end
 
+  test "auto_close_at infers the period from the collection" do
+    freeze_time
+
+    collections(:writebook).update! auto_close_period: 123.days
+    cards(:layout).update! last_active_at: 2.day.ago
+    assert_equal (123-2).days.from_now, cards(:layout).auto_close_at
+  end
+
   test "auto close all due" do
     cards(:logo, :shipping).each(&:reconsider)
 
@@ -49,11 +57,9 @@ class Card::EntropyTest < ActiveSupport::TestCase
   end
 
   test "entropy_cleaned_at returns when the entropy will be cleaned" do
-    cards(:logo).reconsider
-    assert_equal cards(:logo).auto_close_at, cards(:logo).entropy_cleaned_at
-    assert_not_nil cards(:logo).entropy_cleaned_at
+    assert_equal cards(:layout).auto_close_at, cards(:layout).entropy_cleaned_at
+    assert_not_nil cards(:layout).entropy_cleaned_at
 
-    cards(:logo).engage
     assert_equal cards(:logo).auto_reconsider_at, cards(:logo).entropy_cleaned_at
     assert_not_nil cards(:logo).entropy_cleaned_at
   end

From 1f694cf7f10cbaed45561af869474cac2768d178 Mon Sep 17 00:00:00 2001
From: Mike Dalessio <mike@37signals.com>
Date: Mon, 2 Jun 2025 13:25:28 -0400
Subject: [PATCH 4/7] dep: update kamal to edge

so we can use KAMAL_HOST
---
 Gemfile      |  2 +-
 Gemfile.lock | 30 ++++++++++++++++++------------
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/Gemfile b/Gemfile
index 1984dc71d..8c43ff533 100644
--- a/Gemfile
+++ b/Gemfile
@@ -12,7 +12,7 @@ gem "turbo-rails"
 # Deployment and drivers
 gem "active_record-tenanted", bc: "active_record-tenanted"
 gem "bootsnap", require: false
-gem "kamal", require: false
+gem "kamal", bc: "kamal", ref: "344e2d79", require: false
 gem "puma", ">= 5.0"
 gem "solid_cable", ">= 3.0"
 gem "solid_cache", "~> 1.0"
diff --git a/Gemfile.lock b/Gemfile.lock
index d761017df..701715d6d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -15,6 +15,23 @@ GIT
       railties (>= 8.1.alpha)
       zeitwerk
 
+GIT
+  remote: https://github.com/basecamp/kamal
+  revision: 344e2d7995e0134aa52f195a984d8d5e24e31d94
+  ref: 344e2d79
+  specs:
+    kamal (2.6.1)
+      activesupport (>= 7.0)
+      base64 (~> 0.2)
+      bcrypt_pbkdf (~> 1.0)
+      concurrent-ruby (~> 1.2)
+      dotenv (~> 3.1)
+      ed25519 (~> 1.4)
+      net-ssh (~> 7.3)
+      sshkit (>= 1.23.0, < 2.0)
+      thor (~> 1.3)
+      zeitwerk (>= 2.6.18, < 3.0)
+
 GIT
   remote: https://github.com/basecamp/rails-structured-logging
   revision: 76960cb5c15fc2b6b5f7542e05d7dcc031cef9e6
@@ -246,17 +263,6 @@ GEM
       activesupport (>= 5.0.0)
     jmespath (1.6.2)
     json (2.12.2)
-    kamal (2.6.1)
-      activesupport (>= 7.0)
-      base64 (~> 0.2)
-      bcrypt_pbkdf (~> 1.0)
-      concurrent-ruby (~> 1.2)
-      dotenv (~> 3.1)
-      ed25519 (~> 1.4)
-      net-ssh (~> 7.3)
-      sshkit (>= 1.23.0, < 2.0)
-      thor (~> 1.3)
-      zeitwerk (>= 2.6.18, < 3.0)
     language_server-protocol (3.17.0.5)
     lint_roller (1.1.0)
     logger (1.7.0)
@@ -511,7 +517,7 @@ DEPENDENCIES
   image_processing (~> 1.14)
   importmap-rails
   jbuilder
-  kamal
+  kamal!
   mission_control-jobs
   platform_agent
   propshaft

From 1302fe9da299a8906d598e1f15977411dc0b0ec8 Mon Sep 17 00:00:00 2001
From: Mike Dalessio <mike@37signals.com>
Date: Mon, 2 Jun 2025 14:10:04 -0400
Subject: [PATCH 5/7] Autolinking shouldn't include final punctuation.

---
 app/helpers/html_helper.rb       | 11 ++++++++++-
 test/helpers/html_helper_test.rb | 24 ++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/app/helpers/html_helper.rb b/app/helpers/html_helper.rb
index f61da26c1..82a18722d 100644
--- a/app/helpers/html_helper.rb
+++ b/app/helpers/html_helper.rb
@@ -34,7 +34,16 @@ module HtmlHelper
 
     def auto_link_urls(linked_content)
       linked_content.gsub!(URL_REGEXP) do |match|
-        %(<a href="#{match}" rel="noreferrer">#{match}</a>)
+        url, trailing_punct = extract_url_and_punctuation(match)
+        %(<a href="#{url}" rel="noreferrer">#{url}</a>#{trailing_punct})
+      end
+    end
+
+    def extract_url_and_punctuation(url_match)
+      if url_match.end_with?(".", "?", ",", ":")
+        [ url_match[..-2], url_match[-1] ]
+      else
+        [ url_match, "" ]
       end
     end
 
diff --git a/test/helpers/html_helper_test.rb b/test/helpers/html_helper_test.rb
index 818ffa57b..b2536b5c4 100644
--- a/test/helpers/html_helper_test.rb
+++ b/test/helpers/html_helper_test.rb
@@ -5,6 +5,30 @@ class HtmlHelperTest < ActionView::TestCase
     assert_equal_html \
       %(<p>Check this: <a href="https://example.com" rel="noreferrer">https://example.com</a></p>),
       format_html("<p>Check this: https://example.com</p>")
+    assert_equal_html \
+      %(<p>Check this: <a href="https://example.com/" rel="noreferrer">https://example.com/</a></p>),
+      format_html("<p>Check this: https://example.com/</p>")
+  end
+
+  test "does not include punctuation in URL autolinking" do
+    assert_equal_html \
+      %(<p>Check this: <a href="https://example.com" rel="noreferrer">https://example.com</a>!</p>),
+      format_html("<p>Check this: https://example.com!</p>")
+    assert_equal_html \
+      %(<p>Check this: <a href="https://example.com" rel="noreferrer">https://example.com</a>.</p>),
+      format_html("<p>Check this: https://example.com.</p>")
+    assert_equal_html \
+      %(<p>Check this: <a href="https://example.com" rel="noreferrer">https://example.com</a>?</p>),
+      format_html("<p>Check this: https://example.com?</p>")
+    assert_equal_html \
+      %(<p>Check this: <a href="https://example.com" rel="noreferrer">https://example.com</a>,</p>),
+      format_html("<p>Check this: https://example.com,</p>")
+    assert_equal_html \
+      %(<p>Check this: <a href="https://example.com" rel="noreferrer">https://example.com</a>:</p>),
+      format_html("<p>Check this: https://example.com:</p>")
+    assert_equal_html \
+      %(<p>Check this: <a href="https://example.com" rel="noreferrer">https://example.com</a>;</p>),
+      format_html("<p>Check this: https://example.com;</p>")
   end
 
   test "respect existing links" do

From e2939e846cbbd2546beb01d56f01ebe679bb1f88 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@37signals.com>
Date: Tue, 3 Jun 2025 02:53:03 +0200
Subject: [PATCH 6/7] Consistent verb forms

---
 test/helpers/html_helper_test.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/helpers/html_helper_test.rb b/test/helpers/html_helper_test.rb
index b2536b5c4..e6389a5fa 100644
--- a/test/helpers/html_helper_test.rb
+++ b/test/helpers/html_helper_test.rb
@@ -1,7 +1,7 @@
 require "test_helper"
 
 class HtmlHelperTest < ActionView::TestCase
-  test "converts URLs into anchor tags" do
+  test "convert URLs into anchor tags" do
     assert_equal_html \
       %(<p>Check this: <a href="https://example.com" rel="noreferrer">https://example.com</a></p>),
       format_html("<p>Check this: https://example.com</p>")
@@ -10,7 +10,7 @@ class HtmlHelperTest < ActionView::TestCase
       format_html("<p>Check this: https://example.com/</p>")
   end
 
-  test "does not include punctuation in URL autolinking" do
+  test "don't' include punctuation in URL autolinking" do
     assert_equal_html \
       %(<p>Check this: <a href="https://example.com" rel="noreferrer">https://example.com</a>!</p>),
       format_html("<p>Check this: https://example.com!</p>")
@@ -37,7 +37,7 @@ class HtmlHelperTest < ActionView::TestCase
       format_html("<p>Check this: <a href=\"https://example.com\">https://example.com</a></p>")
   end
 
-  test "converts email addresses into mailto links" do
+  test "convert email addresses into mailto links" do
     assert_equal_html \
       %(<p>Contact us at <a href="mailto:support@example.com">support@example.com</a></p>),
       format_html("<p>Contact us at support@example.com</p>")

From 8072a74562434ad92347fde5b7d93da6c0623103 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Mon, 2 Jun 2025 22:37:58 -0500
Subject: [PATCH 7/7] `event.assignees` collection doesn't include
 `event.creator` when self-assigning

---
 app/helpers/notifications_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/helpers/notifications_helper.rb b/app/helpers/notifications_helper.rb
index 8dab7c110..53a3a0797 100644
--- a/app/helpers/notifications_helper.rb
+++ b/app/helpers/notifications_helper.rb
@@ -2,7 +2,7 @@ module NotificationsHelper
   def event_notification_title(event)
     case event_notification_action(event)
     when "comment_created" then "RE: #{card_notification_title(event.eventable.card)}"
-    when "card_assigned" then "Assigned to #{event.assignees.pluck(:name).to_sentence}: #{card_notification_title(event.eventable)}"
+    when "card_assigned" then "Assigned to #{event.assignees.none? ? "self" : event.assignees.pluck(:name).to_sentence}: #{card_notification_title(event.eventable)}"
     else card_notification_title(event.eventable)
     end
   end