AO3-7231 Upgrade gems and configs to Rails 8.0.x

Gemfile

@@ -6,8 +6,8 @@ gem 'test-unit', '~> 3.2'
 
 gem 'bundler'
 
-gem "rails", "~> 7.2"
-gem "rails-i18n"
+gem "rails", "~> 8.0.0"
+gem "rails-i18n", "~> 8.0", git: "https://github.com/marcus8448/rails-i18n", ref: "1d120cc3b2c02793e7cab4ff5951d3a9e0b316a4"
 gem "rack", "~> 2.2"
 gem "sprockets", "< 4"
 
@@ -107,13 +107,13 @@ gem 'kgio', '2.10.0'
 gem "marcel", "1.0.2"
 
 # Library for helping run pt-online-schema-change commands:
-gem "departure", "~> 6.8"
+gem "departure", "~> 8.0"
 
 gem "rack-timeout"
 gem "puma_worker_killer"
 
 group :test do
-  gem "rspec-rails", "~> 6.0"
+  gem "rspec-rails", "~> 8.0"
   gem 'pickle'
   gem 'shoulda'
   gem "capybara"

Gemfile.lock

@@ -1,3 +1,12 @@
+GIT
+  remote: https://github.com/marcus8448/rails-i18n
+  revision: 1d120cc3b2c02793e7cab4ff5951d3a9e0b316a4
+  ref: 1d120cc3b2c02793e7cab4ff5951d3a9e0b316a4
+  specs:
+    rails-i18n (8.1.0)
+      i18n (>= 0.7, < 2)
+      railties (>= 8.0.0, < 9)
+
 GIT
   remote: https://github.com/rails/rails-observers
   revision: 389b577322d8b17336730b2dc4e179060a23c8e7
@@ -15,70 +24,69 @@ GEM
   remote: https://rubygems.org/
   specs:
     aaronh-chronic (0.3.9)
-    actioncable (7.2.2.2)
-      actionpack (= 7.2.2.2)
-      activesupport (= 7.2.2.2)
+    actioncable (8.0.4)
+      actionpack (= 8.0.4)
+      activesupport (= 8.0.4)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (7.2.2.2)
-      actionpack (= 7.2.2.2)
-      activejob (= 7.2.2.2)
-      activerecord (= 7.2.2.2)
-      activestorage (= 7.2.2.2)
-      activesupport (= 7.2.2.2)
+    actionmailbox (8.0.4)
+      actionpack (= 8.0.4)
+      activejob (= 8.0.4)
+      activerecord (= 8.0.4)
+      activestorage (= 8.0.4)
+      activesupport (= 8.0.4)
       mail (>= 2.8.0)
-    actionmailer (7.2.2.2)
-      actionpack (= 7.2.2.2)
-      actionview (= 7.2.2.2)
-      activejob (= 7.2.2.2)
-      activesupport (= 7.2.2.2)
+    actionmailer (8.0.4)
+      actionpack (= 8.0.4)
+      actionview (= 8.0.4)
+      activejob (= 8.0.4)
+      activesupport (= 8.0.4)
       mail (>= 2.8.0)
       rails-dom-testing (~> 2.2)
-    actionpack (7.2.2.2)
-      actionview (= 7.2.2.2)
-      activesupport (= 7.2.2.2)
+    actionpack (8.0.4)
+      actionview (= 8.0.4)
+      activesupport (= 8.0.4)
       nokogiri (>= 1.8.5)
-      racc
-      rack (>= 2.2.4, < 3.2)
+      rack (>= 2.2.4)
       rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
       useragent (~> 0.16)
     actionpack-page_caching (1.2.4)
       actionpack (>= 4.0.0)
-    actiontext (7.2.2.2)
-      actionpack (= 7.2.2.2)
-      activerecord (= 7.2.2.2)
-      activestorage (= 7.2.2.2)
-      activesupport (= 7.2.2.2)
+    actiontext (8.0.4)
+      actionpack (= 8.0.4)
+      activerecord (= 8.0.4)
+      activestorage (= 8.0.4)
+      activesupport (= 8.0.4)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.2.2.2)
-      activesupport (= 7.2.2.2)
+    actionview (8.0.4)
+      activesupport (= 8.0.4)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
     active_record_query_trace (1.8.3)
       activerecord (>= 6.0.0)
-    activejob (7.2.2.2)
-      activesupport (= 7.2.2.2)
+    activejob (8.0.4)
+      activesupport (= 8.0.4)
       globalid (>= 0.3.6)
-    activemodel (7.2.2.2)
-      activesupport (= 7.2.2.2)
-    activerecord (7.2.2.2)
-      activemodel (= 7.2.2.2)
-      activesupport (= 7.2.2.2)
+    activemodel (8.0.4)
+      activesupport (= 8.0.4)
+    activerecord (8.0.4)
+      activemodel (= 8.0.4)
+      activesupport (= 8.0.4)
       timeout (>= 0.4.0)
-    activestorage (7.2.2.2)
-      actionpack (= 7.2.2.2)
-      activejob (= 7.2.2.2)
-      activerecord (= 7.2.2.2)
-      activesupport (= 7.2.2.2)
+    activestorage (8.0.4)
+      actionpack (= 8.0.4)
+      activejob (= 8.0.4)
+      activerecord (= 8.0.4)
+      activesupport (= 8.0.4)
       marcel (~> 1.0)
-    activesupport (7.2.2.2)
+    activesupport (8.0.4)
       base64
       benchmark (>= 0.3)
       bigdecimal
@@ -90,6 +98,7 @@ GEM
       minitest (>= 5.1)
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
     acts_as_list (0.9.19)
       activerecord (>= 3.0)
     addressable (2.8.7)
@@ -217,10 +226,10 @@ GEM
       database_cleaner-core (~> 2.0.0)
     database_cleaner-core (2.0.1)
     date (3.4.1)
-    departure (6.8.0)
-      activerecord (>= 6.0.0, < 7.3.0, != 7.0.0)
+    departure (8.0.0)
+      activerecord (>= 7.2.0)
       mysql2 (>= 0.4.0, < 0.6.0)
-      railties (>= 6.0.0, < 7.3.0, != 7.0.0)
+      railties (>= 7.2.0)
     devise (4.9.3)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
@@ -456,20 +465,20 @@ GEM
     rackup (1.0.1)
       rack (< 3)
       webrick
-    rails (7.2.2.2)
-      actioncable (= 7.2.2.2)
-      actionmailbox (= 7.2.2.2)
-      actionmailer (= 7.2.2.2)
-      actionpack (= 7.2.2.2)
-      actiontext (= 7.2.2.2)
-      actionview (= 7.2.2.2)
-      activejob (= 7.2.2.2)
-      activemodel (= 7.2.2.2)
-      activerecord (= 7.2.2.2)
-      activestorage (= 7.2.2.2)
-      activesupport (= 7.2.2.2)
+    rails (8.0.4)
+      actioncable (= 8.0.4)
+      actionmailbox (= 8.0.4)
+      actionmailer (= 8.0.4)
+      actionpack (= 8.0.4)
+      actiontext (= 8.0.4)
+      actionview (= 8.0.4)
+      activejob (= 8.0.4)
+      activemodel (= 8.0.4)
+      activerecord (= 8.0.4)
+      activestorage (= 8.0.4)
+      activesupport (= 8.0.4)
       bundler (>= 1.15.0)
-      railties (= 7.2.2.2)
+      railties (= 8.0.4)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
@@ -481,16 +490,14 @@ GEM
     rails-html-sanitizer (1.6.2)
       loofah (~> 2.21)
       nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
-    rails-i18n (7.0.9)
-      i18n (>= 0.7, < 2)
-      railties (>= 6.0.0, < 8)
-    railties (7.2.2.2)
-      actionpack (= 7.2.2.2)
-      activesupport (= 7.2.2.2)
+    railties (8.0.4)
+      actionpack (= 8.0.4)
+      activesupport (= 8.0.4)
       irb (~> 1.13)
       rackup (>= 1.0.0)
       rake (>= 12.2)
       thor (~> 1.0, >= 1.2.2)
+      tsort (>= 0.2)
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
     raindrops (0.20.1)
@@ -535,10 +542,10 @@ GEM
     rspec-mocks (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-rails (6.1.5)
-      actionpack (>= 6.1)
-      activesupport (>= 6.1)
-      railties (>= 6.1)
+    rspec-rails (8.0.2)
+      actionpack (>= 7.2)
+      activesupport (>= 7.2)
+      railties (>= 7.2)
       rspec-core (~> 3.13)
       rspec-expectations (~> 3.13)
       rspec-mocks (~> 3.13)
@@ -698,7 +705,7 @@ DEPENDENCIES
   cucumber-timecop
   dalli
   database_cleaner
-  departure (~> 6.8)
+  departure (~> 8.0)
   devise
   devise-async
   devise-pwned_password
@@ -740,17 +747,17 @@ DEPENDENCIES
   rack-attack
   rack-dev-mark (>= 0.7.8)
   rack-timeout
-  rails (~> 7.2)
+  rails (~> 8.0.0)
   rails-controller-testing
-  rails-i18n
+  rails-i18n (~> 8.0)!
   rails-observers!
   redis (< 5.0)
   redis-namespace
   resque (>= 1.14.0)
   resque-scheduler
   rest-client (~> 2.1.0)
   rollout
-  rspec-rails (~> 6.0)
+  rspec-rails (~> 8.0)
   rubocop (= 1.22.3)
   rubocop-rails (= 2.12.4)
   rubocop-rspec (= 2.6.0)

app/controllers/errors_controller.rb

@@ -1,5 +1,5 @@
 class ErrorsController < ApplicationController
-  %w[403 404 422 500].each do |error_code|
+  %w[400 403 404 422 500].each do |error_code|
     define_method error_code.to_sym do
       render error_code, status: error_code.to_i, formats: :html
     end

app/jobs/application_job.rb

@@ -1,4 +1,6 @@
 class ApplicationJob < ActiveJob::Base
+  self.enqueue_after_transaction_commit = true
+
   include AfterCommitEverywhere
   extend AfterCommitEverywhere
 

app/jobs/application_mailer_job.rb

@@ -1,4 +1,6 @@
 class ApplicationMailerJob < ActionMailer::MailDeliveryJob
+  self.enqueue_after_transaction_commit = true
+
   # TODO: We have a mix of mailers that take ActiveRecords as arguments, and
   # mailers that take IDs as arguments. If an item is unavailable when the
   # notification is sent, it'll produce an ActiveJob::DeserializationError in

app/models/tagset_models/tag_set.rb

@@ -116,7 +116,7 @@ def remove_from_set(tags_to_remove)
     return unless tags_to_remove.present?
     self.set_taggings.where(tag_id: tags_to_remove.map(&:id)).delete_all
     remove_tags_from_autocomplete(tags_to_remove)
-    owned_tag_set&.touch
+    owned_tag_set.touch if owned_tag_set&.persisted?
   end
 
   def add_to_set(tags_to_add)
@@ -127,7 +127,7 @@ def add_to_set(tags_to_add)
       self.set_taggings.create(tag_id: tag.id)
     end
     add_tags_to_autocomplete(tags_to_add)
-    owned_tag_set&.touch
+    owned_tag_set.touch if owned_tag_set&.persisted?
   end
 
   # Tags must already exist unless they are being added to an owned tag set

app/views/errors/400.html.erb

@@ -0,0 +1,3 @@
+<h2 class="heading">Error 400</h2>
+<h3 class="heading">Bad Request</h3>
+<p>The server cannot process the request due to a client error.</p>

bin/dev

@@ -0,0 +1,2 @@
+#!/usr/bin/env ruby
+exec "./bin/rails", "server", *ARGV

bin/setup

@@ -2,7 +2,6 @@
 require "fileutils"
 
 APP_ROOT = File.expand_path("..", __dir__)
-APP_NAME = "otwarchive"
 
 def system!(*args)
   system(*args, exception: true)
@@ -14,7 +13,6 @@ FileUtils.chdir APP_ROOT do
   # Add necessary setup steps to this file.
 
   puts "== Installing dependencies =="
-  system! "gem install bundler --conservative"
   system("bundle check") || system!("bundle install")
 
   # puts "\n== Copying sample files =="
@@ -28,10 +26,9 @@ FileUtils.chdir APP_ROOT do
   puts "\n== Removing old logs and tempfiles =="
   system! "bin/rails log:clear tmp:clear"
 
-  puts "\n== Restarting application server =="
-  system! "bin/rails restart"
-
-  # puts "\n== Configuring puma-dev =="
-  # system "ln -nfs #{APP_ROOT} ~/.puma-dev/#{APP_NAME}"
-  # system "curl -Is https://#{APP_NAME}.test/up | head -n 1"
+  unless ARGV.include?("--skip-server")
+    puts "\n== Starting development server =="
+    STDOUT.flush # flush the output before exec(2) so that it displays
+    exec "bin/dev"
+  end
 end

config/application.rb

@@ -22,7 +22,7 @@ class Application < Rails::Application
     # These settings can be overridden in specific environments using the files
     # in config/environments, which are processed later.
 
-    config.load_defaults 7.2
+    config.load_defaults 8.0
 
     %w[
       app/models/challenge_models
@@ -105,9 +105,6 @@ class Application < Rails::Application
     # Use Resque to run ActiveJobs (including sending delayed mail):
     config.active_job.queue_adapter = :resque
 
-    # TODO: Remove with Rails 8.0 where this option will be deprecated
-    config.active_job.enqueue_after_transaction_commit = :always
-
     config.active_model.i18n_customize_full_message = true
 
     config.action_mailer.default_url_options = { host: ArchiveConfig.APP_HOST, protocol: "https" }