Upgrade to Rails 7.0.6

Whew! Seems like a pretty clean one? Ran `rails app:upgrade` and stuff, and made some corrections to keyword arguments for `translate` calls. There might be more such problems elsewhere? But that's hard to search for, and we'll have to see.

Gemfile

@@ -1,7 +1,7 @@
 source 'http://rubygems.org'
 ruby '3.0.6'
 
-gem 'rails', '= 6.1.7.4'
+gem 'rails', '= 7.0.6'
 
 # The HTTP server running the Rails instance.
 gem 'webrick', '~> 1.7'

Gemfile.lock

@@ -7,65 +7,71 @@ GIT
 GEM
   remote: http://rubygems.org/
   specs:
-    actioncable (6.1.7.4)
+    actioncable (7.0.6)
-      actionpack (= 6.1.7.4)
+      actionpack (= 7.0.6)
-      activesupport (= 6.1.7.4)
+      activesupport (= 7.0.6)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.7.4)
+    actionmailbox (7.0.6)
-      actionpack (= 6.1.7.4)
+      actionpack (= 7.0.6)
-      activejob (= 6.1.7.4)
+      activejob (= 7.0.6)
-      activerecord (= 6.1.7.4)
+      activerecord (= 7.0.6)
-      activestorage (= 6.1.7.4)
+      activestorage (= 7.0.6)
-      activesupport (= 6.1.7.4)
+      activesupport (= 7.0.6)
       mail (>= 2.7.1)
-    actionmailer (6.1.7.4)
+      net-imap
-      actionpack (= 6.1.7.4)
+      net-pop
-      actionview (= 6.1.7.4)
+      net-smtp
-      activejob (= 6.1.7.4)
+    actionmailer (7.0.6)
-      activesupport (= 6.1.7.4)
+      actionpack (= 7.0.6)
+      actionview (= 7.0.6)
+      activejob (= 7.0.6)
+      activesupport (= 7.0.6)
       mail (~> 2.5, >= 2.5.4)
+      net-imap
+      net-pop
+      net-smtp
       rails-dom-testing (~> 2.0)
-    actionpack (6.1.7.4)
+    actionpack (7.0.6)
-      actionview (= 6.1.7.4)
+      actionview (= 7.0.6)
-      activesupport (= 6.1.7.4)
+      activesupport (= 7.0.6)
-      rack (~> 2.0, >= 2.0.9)
+      rack (~> 2.0, >= 2.2.4)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.1.7.4)
+    actiontext (7.0.6)
-      actionpack (= 6.1.7.4)
+      actionpack (= 7.0.6)
-      activerecord (= 6.1.7.4)
+      activerecord (= 7.0.6)
-      activestorage (= 6.1.7.4)
+      activestorage (= 7.0.6)
-      activesupport (= 6.1.7.4)
+      activesupport (= 7.0.6)
+      globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (6.1.7.4)
+    actionview (7.0.6)
-      activesupport (= 6.1.7.4)
+      activesupport (= 7.0.6)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.1.7.4)
+    activejob (7.0.6)
-      activesupport (= 6.1.7.4)
+      activesupport (= 7.0.6)
       globalid (>= 0.3.6)
-    activemodel (6.1.7.4)
+    activemodel (7.0.6)
-      activesupport (= 6.1.7.4)
+      activesupport (= 7.0.6)
-    activerecord (6.1.7.4)
+    activerecord (7.0.6)
-      activemodel (= 6.1.7.4)
+      activemodel (= 7.0.6)
-      activesupport (= 6.1.7.4)
+      activesupport (= 7.0.6)
-    activestorage (6.1.7.4)
+    activestorage (7.0.6)
-      actionpack (= 6.1.7.4)
+      actionpack (= 7.0.6)
-      activejob (= 6.1.7.4)
+      activejob (= 7.0.6)
-      activerecord (= 6.1.7.4)
+      activerecord (= 7.0.6)
-      activesupport (= 6.1.7.4)
+      activesupport (= 7.0.6)
       marcel (~> 1.0)
       mini_mime (>= 1.1.0)
-    activesupport (6.1.7.4)
+    activesupport (7.0.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
     addressable (2.8.4)
       public_suffix (>= 2.0.2, < 6.0)
     babel-source (5.8.35)
@@ -184,8 +190,8 @@ GEM
       net-ssh (>= 2.6.5)
     netrc (0.11.0)
     nio4r (2.5.9)
-    nokogiri (1.13.10)
+    nokogiri (1.15.3)
-      mini_portile2 (~> 2.8.0)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     openneo-auth-signatory (0.1.0)
       ruby-hmac
@@ -198,36 +204,37 @@ GEM
       rack (>= 1.0, < 4)
     rack-test (2.1.0)
       rack (>= 1.3)
-    rails (6.1.7.4)
+    rails (7.0.6)
-      actioncable (= 6.1.7.4)
+      actioncable (= 7.0.6)
-      actionmailbox (= 6.1.7.4)
+      actionmailbox (= 7.0.6)
-      actionmailer (= 6.1.7.4)
+      actionmailer (= 7.0.6)
-      actionpack (= 6.1.7.4)
+      actionpack (= 7.0.6)
-      actiontext (= 6.1.7.4)
+      actiontext (= 7.0.6)
-      actionview (= 6.1.7.4)
+      actionview (= 7.0.6)
-      activejob (= 6.1.7.4)
+      activejob (= 7.0.6)
-      activemodel (= 6.1.7.4)
+      activemodel (= 7.0.6)
-      activerecord (= 6.1.7.4)
+      activerecord (= 7.0.6)
-      activestorage (= 6.1.7.4)
+      activestorage (= 7.0.6)
-      activesupport (= 6.1.7.4)
+      activesupport (= 7.0.6)
       bundler (>= 1.15.0)
-      railties (= 6.1.7.4)
+      railties (= 7.0.6)
-      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.2.0)
-    rails-dom-testing (2.1.1)
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.5.0)
+    rails-html-sanitizer (1.6.0)
-      loofah (~> 2.19, >= 2.19.1)
+      loofah (~> 2.21)
+      nokogiri (~> 1.14)
     rails-i18n (7.0.7)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 8)
-    railties (6.1.7.4)
+    railties (7.0.6)
-      actionpack (= 6.1.7.4)
+      actionpack (= 7.0.6)
-      activesupport (= 6.1.7.4)
+      activesupport (= 7.0.6)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
+      zeitwerk (~> 2.5)
     rake (13.0.6)
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
@@ -330,7 +337,7 @@ DEPENDENCIES
   openneo-auth-signatory (~> 0.1.0)
   parallel (~> 1.23)
   rack-attack (~> 6.7)
-  rails (= 6.1.7.4)
+  rails (= 7.0.6)
   rails-i18n (~> 7.0, >= 7.0.7)
   rdiscount (~> 2.2, >= 2.2.7.1)
   react-rails (~> 2.7, >= 2.7.1)

app/helpers/application_helper.rb

@@ -199,7 +199,7 @@ module ApplicationHelper
   end
   
   def translate_markdown(key, options={})
-    md translate("#{key}_markdown", options)
+    md translate("#{key}_markdown", **options)
   end
   
   alias_method :tmd, :translate_markdown
@@ -220,12 +220,12 @@ module ApplicationHelper
     
     link_options = {}
     link_urls.each do |link_key, url|
-      content = translate("#{key}.#{link_key}_content", nonlink_options)
+      content = translate("#{key}.#{link_key}_content", **nonlink_options)
       link_options[link_key.to_sym] = link_to(content, url)
     end
     
     converted_options = link_options.merge(nonlink_options)
-    translate("#{key}.main_html", converted_options)
+    translate("#{key}.main_html", **converted_options)
   end
   
   alias_method :twl, :translate_with_links

app/helpers/outfits_helper.rb

@@ -11,9 +11,9 @@ module OutfitsHelper
       :contributed_description => contributed_description(contributed, false)
   end
 
-  def link_to_edit_outfit(content_or_outfit, outfit_or_options, options={})
+  def link_to_edit_outfit(content_or_outfit, outfit_or_options, options={}, &block)
     if block_given?
-      content = capture_haml(&Proc.new)
+      content = capture_haml(&block)
       outfit = content_or_outfit
       options = outfit_or_options
     else
@@ -100,9 +100,9 @@ module OutfitsHelper
       :created_at_ago => created_at_ago
   end
 
-  def outfit_li_for(outfit)
+  def outfit_li_for(outfit, &block)
     class_name = outfit.starred? ? 'starred' : nil
-    content_tag :li, :class => class_name, &Proc.new
+    content_tag :li, :class => class_name, &block
   end
 
   def pet_attribute_select(name, collection, value=nil)

app/views/layouts/application.html.haml

@@ -27,7 +27,7 @@
       = yield :before_title
       - if content_for?(:title) && show_title_header?
         %h1#title= yield :title
-      = render 'static/announcement.html'
+      = render 'static/announcement'
       = yield :before_flashes
       = flashes
 

bin/rails

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
-APP_PATH = File.expand_path('../config/application', __dir__)
+APP_PATH = File.expand_path("../config/application", __dir__)
 require_relative "../config/boot"
 require "rails/commands"

bin/setup

@@ -2,7 +2,7 @@
 require "fileutils"
 
 # path to your application root.
-APP_ROOT = File.expand_path('..', __dir__)
+APP_ROOT = File.expand_path("..", __dir__)
 
 def system!(*args)
   system(*args) || abort("\n== Command #{args} failed ==")
@@ -13,24 +13,21 @@ FileUtils.chdir APP_ROOT do
   # This script is idempotent, so that you can run it at any time and get an expectable outcome.
   # Add necessary setup steps to this file.
 
-  puts '== Installing dependencies =='
+  puts "== Installing dependencies =="
-  system! 'gem install bundler --conservative'
+  system! "gem install bundler --conservative"
-  system('bundle check') || system!('bundle install')
+  system("bundle check") || system!("bundle install")
-
-  # Install JavaScript dependencies
-  system! 'bin/yarn'
 
   # puts "\n== Copying sample files =="
-  # unless File.exist?('config/database.yml')
+  # unless File.exist?("config/database.yml")
-  #   FileUtils.cp 'config/database.yml.sample', 'config/database.yml'
+  #   FileUtils.cp "config/database.yml.sample", "config/database.yml"
   # end
 
   puts "\n== Preparing database =="
-  system! 'bin/rails db:prepare'
+  system! "bin/rails db:prepare"
 
   puts "\n== Removing old logs and tempfiles =="
-  system! 'bin/rails log:clear tmp:clear'
+  system! "bin/rails log:clear tmp:clear"
 
   puts "\n== Restarting application server =="
-  system! 'bin/rails restart'
+  system! "bin/rails restart"
 end

config/application.rb

@@ -9,7 +9,7 @@ Bundler.require(*Rails.groups)
 module OpenneoImpressItems
   class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.
-    config.load_defaults 6.1
+    config.load_defaults 7.0
 
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers

config/boot.rb

@@ -1,4 +1,4 @@
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
 
 require "bundler/setup" # Set up gems listed in the Gemfile.
 require "bootsnap/setup" # Speed up boot time by caching expensive operations.

config/environments/development.rb

@@ -14,9 +14,12 @@ Rails.application.configure do
   # Show full error reports.
   config.consider_all_requests_local = true
 
+  # Enable server timing
+  config.server_timing = true
+  
   # Enable/disable caching. By default caching is disabled.
   # Run rails dev:cache to toggle caching.
-  if Rails.root.join('tmp', 'caching-dev.txt').exist?
+  if Rails.root.join("tmp/caching-dev.txt").exist?
     config.action_controller.perform_caching = true
     config.action_controller.enable_fragment_cache_logging = true
 

config/environments/production.rb

@@ -47,8 +47,6 @@ Rails.application.configure do
   # Enable threaded mode
   # config.threadsafe!
 
-  config.active_support.deprecation = :log
-
   # Disable serving static files from the `/public` folder by default since
   # Apache or NGINX already handles this.
   config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present?
@@ -71,9 +69,9 @@ Rails.application.configure do
   # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
   # config.force_ssl = true
 
-  # Use the lowest log level to ensure availability of diagnostic information
+  # Include generic and useful information about system operation, but avoid logging too much
-  # when problems arise.
+  # information to avoid inadvertent exposure of personally identifiable information (PII).
-  config.log_level = :debug
+  config.log_level = :info
 
   # Prepend all log lines with the following tags.
   config.log_tags = [ :request_id ]
@@ -101,7 +99,7 @@ Rails.application.configure do
   config.i18n.fallbacks = true
 
   # Send deprecation notices to registered listeners.
-  config.active_support.deprecation = :notify
+  config.active_support.report_deprecations = false
 
   # Use default logging formatter so that PID and timestamp are not suppressed.
   config.log_formatter = ::Logger::Formatter.new

config/environments/test.rb

@@ -8,17 +8,18 @@ require "active_support/core_ext/integer/time"
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 
+  # Turn false under Spring and add config.action_view.cache_template_loading = true.
   config.cache_classes = true
 
-  # Do not eager load code on boot. This avoids loading your whole application
+  # Eager loading loads your whole application. When running a single test locally,
-  # just for the purpose of running a single test. If you are using a tool that
+  # this probably isn't necessary. It's a good idea to do in a continuous integration
-  # preloads Rails for running tests, you may have to set it to true.
+  # system, or in some way before deploying your code.
-  config.eager_load = false
+  config.eager_load = ENV["CI"].present?
 
   # Configure public file server for tests with Cache-Control for performance.
   config.public_file_server.enabled = true
   config.public_file_server.headers = {
-    'Cache-Control' => "public, max-age=#{1.hour.to_i}"
+    "Cache-Control" => "public, max-age=#{1.hour.to_i}"
   }
 
   # Show full error reports and disable caching.

config/initializers/assets.rb

@@ -1,12 +1,10 @@
 # Be sure to restart your server when you modify this file.
 
 # Version of your assets, change this if you want to expire all your assets.
-Rails.application.config.assets.version = '1.0'
+Rails.application.config.assets.version = "1.0"
 
 # Add additional assets to the asset load path.
 # Rails.application.config.assets.paths << Emoji.images_path
-# Add Yarn node_modules folder to the asset load path.
-Rails.application.config.assets.paths << Rails.root.join('node_modules')
 
 # Precompile additional assets.
 # application.js, application.css, and all non-JS/CSS in the app/assets

config/initializers/content_security_policy.rb

@@ -1,30 +1,25 @@
 # Be sure to restart your server when you modify this file.
 
-# Define an application-wide content security policy
+# Define an application-wide content security policy.
-# For further information see the following documentation
+# See the Securing Rails Applications Guide for more information:
-# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy
+# https://guides.rubyonrails.org/security.html#content-security-policy-header
 
-# Rails.application.config.content_security_policy do |policy|
+# Rails.application.configure do
-#   policy.default_src :self, :https
+#   config.content_security_policy do |policy|
-#   policy.font_src    :self, :https, :data
+#     policy.default_src :self, :https
-#   policy.img_src     :self, :https, :data
+#     policy.font_src    :self, :https, :data
-#   policy.object_src  :none
+#     policy.img_src     :self, :https, :data
-#   policy.script_src  :self, :https
+#     policy.object_src  :none
-#   policy.style_src   :self, :https
+#     policy.script_src  :self, :https
-#   # If you are using webpack-dev-server then specify webpack-dev-server host
+#     policy.style_src   :self, :https
-#   policy.connect_src :self, :https, "http://localhost:3035", "ws://localhost:3035" if Rails.env.development?
+#     # Specify URI for violation reports
-
+#     # policy.report_uri "/csp-violation-report-endpoint"
-#   # Specify URI for violation reports
+#   end
-#   # policy.report_uri "/csp-violation-report-endpoint"
+#
+#   # Generate session nonces for permitted importmap and inline scripts
+#   config.content_security_policy_nonce_generator = ->(request) { request.session.id.to_s }
+#   config.content_security_policy_nonce_directives = %w(script-src)
+#
+#   # Report violations without enforcing the policy.
+#   # config.content_security_policy_report_only = true
 # end
-
-# If you are using UJS then enable automatic nonce generation
-# Rails.application.config.content_security_policy_nonce_generator = -> request { SecureRandom.base64(16) }
-
-# Set the nonce only to specific directives
-# Rails.application.config.content_security_policy_nonce_directives = %w(script-src)
-
-# Report CSP violations to a specified URI
-# For further information see the following documentation:
-# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy-Report-Only
-# Rails.application.config.content_security_policy_report_only = true

config/initializers/filter_parameter_logging.rb

@@ -1,6 +1,8 @@
 # Be sure to restart your server when you modify this file.
 
-# Configure sensitive parameters which will be filtered from the log file.
+# Configure parameters to be filtered from the log file. Use this to limit dissemination of
+# sensitive information. See the ActiveSupport::ParameterFilter documentation for supported
+# notations and behaviors.
 Rails.application.config.filter_parameters += [
   :passw, :secret, :token, :_key, :crypt, :salt, :certificate, :otp, :ssn
 ]

config/initializers/inflections.rb

@@ -4,13 +4,13 @@
 # are locale specific, and you may define rules for as many different
 # locales as you wish. All of these examples are active by default:
 # ActiveSupport::Inflector.inflections(:en) do |inflect|
-#   inflect.plural /^(ox)$/i, '\1en'
+#   inflect.plural /^(ox)$/i, "\\1en"
-#   inflect.singular /^(ox)en/i, '\1'
+#   inflect.singular /^(ox)en/i, "\\1"
-#   inflect.irregular 'person', 'people'
+#   inflect.irregular "person", "people"
 #   inflect.uncountable %w( fish sheep )
 # end
 
 # These inflection rules are supported but not enabled by default:
 # ActiveSupport::Inflector.inflections(:en) do |inflect|
-#   inflect.acronym 'RESTful'
+#   inflect.acronym "RESTful"
 # end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20230802195548) do
+ActiveRecord::Schema[6.1].define(version: 20230802195548) do
 
   create_table "auth_servers", force: true do |t|
     t.string "short_name", limit: 10,       null: false