From 8eb01da05769fd6de39f0c95bfa17fd76fc71d9a Mon Sep 17 00:00:00 2001
From: Jeremy Daer <jeremy@37signals.com>
Date: Mon, 8 Dec 2025 15:26:42 -0800
Subject: [PATCH] Process blob variants using local files

Rails does post-upload variant processing using the same file upload
in https://github.com/rails/rails/pull/56327

Unrelated Lexxy bump:
Pulls in https://github.com/basecamp/lexxy/pull/493 to work around `dom_id`
removal from ActionText tag in https://github.com/rails/rails/pull/51238
---
 Gemfile                               |  5 +++--
 Gemfile.lock                          | 15 ++++++++++-----
 Gemfile.saas.lock                     | 15 ++++++++++-----
 config/initializers/active_storage.rb |  7 +++----
 4 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/Gemfile b/Gemfile
index 7f7a463bb..e8a5f8514 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,8 +1,9 @@
 source "https://rubygems.org"
 
-gem "rails", github: "rails/rails", branch: "main"
 git_source(:bc) { |repo| "https://github.com/basecamp/#{repo}" }
 
+gem "rails", github: "rails/rails", branch: "ast-immediate-variants-process-locally"
+
 # Assets & front end
 gem "importmap-rails"
 gem "propshaft"
@@ -27,7 +28,7 @@ gem "rqrcode"
 gem "redcarpet"
 gem "rouge"
 gem "jbuilder"
-gem "lexxy"
+gem "lexxy", bc: "lexxy"
 gem "image_processing", "~> 1.14"
 gem "platform_agent"
 gem "aws-sdk-s3", require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index e4f364c1c..ea4794b5a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,3 +1,10 @@
+GIT
+  remote: https://github.com/basecamp/lexxy
+  revision: d292280b6d2c5d8a924327adf8bb9f0b25953539
+  specs:
+    lexxy (0.1.23.beta)
+      rails (>= 8.0.2)
+
 GIT
   remote: https://github.com/basecamp/useragent
   revision: 433ca320a42db1266c4b89df74d0abdb9a880c5e
@@ -6,8 +13,8 @@ GIT
 
 GIT
   remote: https://github.com/rails/rails.git
-  revision: 3d105fc346fbb3121bbcf6340f2b19104bf326f0
-  branch: main
+  revision: bf81d40a91880c059ce9d0447219385a2c8e4a15
+  branch: ast-immediate-variants-process-locally
   specs:
     actioncable (8.2.0.alpha)
       actionpack (= 8.2.0.alpha)
@@ -237,8 +244,6 @@ GEM
       logger (~> 1.6)
     letter_opener (1.10.0)
       launchy (>= 2.2, < 4)
-    lexxy (0.1.23.beta)
-      rails (>= 8.0.2)
     lint_roller (1.1.0)
     logger (1.7.0)
     loofah (2.24.1)
@@ -518,7 +523,7 @@ DEPENDENCIES
   jbuilder
   kamal
   letter_opener
-  lexxy
+  lexxy!
   mission_control-jobs
   mittens
   mocha
diff --git a/Gemfile.saas.lock b/Gemfile.saas.lock
index f093ac677..aabe04258 100644
--- a/Gemfile.saas.lock
+++ b/Gemfile.saas.lock
@@ -41,6 +41,13 @@ GIT
       yabeda-puma-plugin
       yabeda-rails (>= 0.10)
 
+GIT
+  remote: https://github.com/basecamp/lexxy
+  revision: d292280b6d2c5d8a924327adf8bb9f0b25953539
+  specs:
+    lexxy (0.1.23.beta)
+      rails (>= 8.0.2)
+
 GIT
   remote: https://github.com/basecamp/queenbee-plugin
   revision: 15faf03a876c5e66b67753d2e1ddb24f1eb5abb2
@@ -75,8 +82,8 @@ GIT
 
 GIT
   remote: https://github.com/rails/rails.git
-  revision: 3d105fc346fbb3121bbcf6340f2b19104bf326f0
-  branch: main
+  revision: bf81d40a91880c059ce9d0447219385a2c8e4a15
+  branch: ast-immediate-variants-process-locally
   specs:
     actioncable (8.2.0.alpha)
       actionpack (= 8.2.0.alpha)
@@ -313,8 +320,6 @@ GEM
       logger (~> 1.6)
     letter_opener (1.10.0)
       launchy (>= 2.2, < 4)
-    lexxy (0.1.23.beta)
-      rails (>= 8.0.2)
     lint_roller (1.1.0)
     logger (1.7.0)
     loofah (2.24.1)
@@ -653,7 +658,7 @@ DEPENDENCIES
   jbuilder
   kamal
   letter_opener
-  lexxy
+  lexxy!
   mission_control-jobs
   mittens
   mocha
diff --git a/config/initializers/active_storage.rb b/config/initializers/active_storage.rb
index 4a4a0343d..74461c795 100644
--- a/config/initializers/active_storage.rb
+++ b/config/initializers/active_storage.rb
@@ -11,10 +11,9 @@ end
 # before the User model's upload callback, causing FileNotFoundError when
 # using `process: :immediately` for variants.
 # See: https://github.com/rails/rails/issues/53694
-#
-# ActiveSupport.on_load(:active_storage_record) do
-#   configure_replica_connections
-# end
+ActiveSupport.on_load(:active_storage_record) do
+  configure_replica_connections
+end
 
 module ActiveStorageControllerExtensions
   extend ActiveSupport::Concern