upgrade ruby/rails

.ruby-version

@@ -1 +1 @@
-3.1.2
+3.3.5

Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:3.1.2-bullseye
+FROM ruby:3.3.5-bookworm
 
 RUN curl -sL https://deb.nodesource.com/setup_lts.x | bash - && \
     curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \

Gemfile

@@ -1,29 +1,29 @@
 source 'https://rubygems.org'
 
-gem 'rails', '7.0.4'
+gem 'rails', '7.2.1'
-gem 'pg', '~> 1.4.5'
+gem 'pg', '~> 1.5.8'
 
 gem 'shakapacker', '6.5.4'
 gem 'bootsnap', '>= 1.1.0', require: false
 
-gem 'oj', '~> 3.13.23'
+gem 'oj', '~> 3.16.6'
 
 gem 'kaminari', '~> 1.2.2'
 gem 'unitwise', '~> 2.3.0'
-gem 'redcarpet', '~> 3.5.1'
+gem 'redcarpet', '~> 3.6.0'
 
-gem 'dalli', '~> 3.2.3'
+gem 'dalli', '~> 3.2.8'
-gem 'puma', '~> 5.6'
+gem 'puma', '~> 6.4'
 gem 'bcrypt', '~> 3.1.18'
 gem 'tzinfo-data'
 
 group :development, :test do
-  gem 'sqlite3', '~> 1.5.4'
+  gem 'sqlite3', '~> 2.1.0'
 
   gem 'guard', '~> 2.18.0'
   gem 'guard-rspec', require: false
-  gem 'rspec-rails', '~> 6.0.1'
+  gem 'rspec-rails', '~> 7.0.1'
   gem 'rails-controller-testing'
-  gem 'factory_bot_rails', '~> 6.2.0'
+  gem 'factory_bot_rails', '~> 6.4.3'
-  gem 'database_cleaner', '~> 2.0.1'
+  gem 'database_cleaner', '~> 2.0.2'
 end

Gemfile.lock

@@ -1,97 +1,107 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.0.4)
+    actioncable (7.2.1)
-      actionpack (= 7.0.4)
+      actionpack (= 7.2.1)
-      activesupport (= 7.0.4)
+      activesupport (= 7.2.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (7.0.4)
+      zeitwerk (~> 2.6)
-      actionpack (= 7.0.4)
+    actionmailbox (7.2.1)
-      activejob (= 7.0.4)
+      actionpack (= 7.2.1)
-      activerecord (= 7.0.4)
+      activejob (= 7.2.1)
-      activestorage (= 7.0.4)
+      activerecord (= 7.2.1)
-      activesupport (= 7.0.4)
+      activestorage (= 7.2.1)
-      mail (>= 2.7.1)
+      activesupport (= 7.2.1)
-      net-imap
+      mail (>= 2.8.0)
-      net-pop
+    actionmailer (7.2.1)
-      net-smtp
+      actionpack (= 7.2.1)
-    actionmailer (7.0.4)
+      actionview (= 7.2.1)
-      actionpack (= 7.0.4)
+      activejob (= 7.2.1)
-      actionview (= 7.0.4)
+      activesupport (= 7.2.1)
-      activejob (= 7.0.4)
+      mail (>= 2.8.0)
-      activesupport (= 7.0.4)
+      rails-dom-testing (~> 2.2)
-      mail (~> 2.5, >= 2.5.4)
+    actionpack (7.2.1)
-      net-imap
+      actionview (= 7.2.1)
-      net-pop
+      activesupport (= 7.2.1)
-      net-smtp
+      nokogiri (>= 1.8.5)
-      rails-dom-testing (~> 2.0)
+      racc
-    actionpack (7.0.4)
+      rack (>= 2.2.4, < 3.2)
-      actionview (= 7.0.4)
+      rack-session (>= 1.0.1)
-      activesupport (= 7.0.4)
-      rack (~> 2.0, >= 2.2.0)
       rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
+      rails-dom-testing (~> 2.2)
-      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+      rails-html-sanitizer (~> 1.6)
-    actiontext (7.0.4)
+      useragent (~> 0.16)
-      actionpack (= 7.0.4)
+    actiontext (7.2.1)
-      activerecord (= 7.0.4)
+      actionpack (= 7.2.1)
-      activestorage (= 7.0.4)
+      activerecord (= 7.2.1)
-      activesupport (= 7.0.4)
+      activestorage (= 7.2.1)
+      activesupport (= 7.2.1)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.0.4)
+    actionview (7.2.1)
-      activesupport (= 7.0.4)
+      activesupport (= 7.2.1)
       builder (~> 3.1)
-      erubi (~> 1.4)
+      erubi (~> 1.11)
-      rails-dom-testing (~> 2.0)
+      rails-dom-testing (~> 2.2)
-      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+      rails-html-sanitizer (~> 1.6)
-    activejob (7.0.4)
+    activejob (7.2.1)
-      activesupport (= 7.0.4)
+      activesupport (= 7.2.1)
       globalid (>= 0.3.6)
-    activemodel (7.0.4)
+    activemodel (7.2.1)
-      activesupport (= 7.0.4)
+      activesupport (= 7.2.1)
-    activerecord (7.0.4)
+    activerecord (7.2.1)
-      activemodel (= 7.0.4)
+      activemodel (= 7.2.1)
-      activesupport (= 7.0.4)
+      activesupport (= 7.2.1)
-    activestorage (7.0.4)
+      timeout (>= 0.4.0)
-      actionpack (= 7.0.4)
+    activestorage (7.2.1)
-      activejob (= 7.0.4)
+      actionpack (= 7.2.1)
-      activerecord (= 7.0.4)
+      activejob (= 7.2.1)
-      activesupport (= 7.0.4)
+      activerecord (= 7.2.1)
+      activesupport (= 7.2.1)
       marcel (~> 1.0)
-      mini_mime (>= 1.1.0)
+    activesupport (7.2.1)
-    activesupport (7.0.4)
+      base64
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.3.1)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
       minitest (>= 5.1)
-      tzinfo (~> 2.0)
+      securerandom (>= 0.3)
-    bcrypt (3.1.18)
+      tzinfo (~> 2.0, >= 2.0.5)
-    bootsnap (1.15.0)
+    base64 (0.2.0)
+    bcrypt (3.1.20)
+    bigdecimal (3.1.8)
+    bootsnap (1.18.4)
       msgpack (~> 1.2)
-    builder (3.2.4)
+    builder (3.3.0)
     coderay (1.1.3)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.3.4)
+    connection_pool (2.4.1)
     crass (1.0.6)
-    dalli (3.2.3)
+    dalli (3.2.8)
-    database_cleaner (2.0.1)
+    database_cleaner (2.0.2)
-      database_cleaner-active_record (~> 2.0.0)
+      database_cleaner-active_record (>= 2, < 3)
-    database_cleaner-active_record (2.0.1)
+    database_cleaner-active_record (2.2.0)
       activerecord (>= 5.a)
       database_cleaner-core (~> 2.0.0)
     database_cleaner-core (2.0.1)
-    diff-lcs (1.5.0)
+    date (3.3.4)
-    erubi (1.11.0)
+    diff-lcs (1.5.1)
-    factory_bot (6.2.1)
+    drb (2.2.1)
+    erubi (1.13.0)
+    factory_bot (6.5.0)
       activesupport (>= 5.0.0)
-    factory_bot_rails (6.2.0)
+    factory_bot_rails (6.4.3)
-      factory_bot (~> 6.2.0)
+      factory_bot (~> 6.4)
       railties (>= 5.0.0)
-    ffi (1.15.5)
+    ffi (1.17.0)
     formatador (1.1.0)
-    globalid (1.0.0)
+    globalid (1.2.1)
-      activesupport (>= 5.0)
+      activesupport (>= 6.1)
-    guard (2.18.0)
+    guard (2.18.1)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
       lumberjack (>= 1.0.12, < 2.0)
@@ -105,8 +115,12 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    i18n (1.12.0)
+    i18n (1.14.6)
       concurrent-ruby (~> 1.0)
+    io-console (0.7.2)
+    irb (1.14.1)
+      rdoc (>= 4.0.0)
+      reline (>= 0.4.2)
     kaminari (1.2.2)
       activesupport (>= 4.1.0)
       kaminari-actionview (= 1.2.2)
@@ -120,109 +134,132 @@ GEM
       kaminari-core (= 1.2.2)
     kaminari-core (1.2.2)
     liner (0.2.4)
-    listen (3.7.1)
+    listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    loofah (2.19.0)
+    logger (1.6.1)
+    loofah (2.22.0)
       crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
+      nokogiri (>= 1.12.0)
-    lumberjack (1.2.8)
+    lumberjack (1.2.10)
-    mail (2.7.1)
+    mail (2.8.1)
       mini_mime (>= 0.1.1)
-    marcel (1.0.2)
+      net-imap
+      net-pop
+      net-smtp
+    marcel (1.0.4)
     memoizable (0.4.2)
       thread_safe (~> 0.3, >= 0.3.1)
-    method_source (1.0.0)
+    method_source (1.1.0)
-    mini_mime (1.1.2)
+    mini_mime (1.1.5)
-    mini_portile2 (2.8.0)
+    mini_portile2 (2.8.7)
-    minitest (5.16.3)
+    minitest (5.25.1)
-    msgpack (1.6.0)
+    msgpack (1.7.2)
     nenv (0.3.0)
-    net-imap (0.3.1)
+    net-imap (0.4.16)
+      date
       net-protocol
     net-pop (0.1.2)
       net-protocol
-    net-protocol (0.1.3)
+    net-protocol (0.2.2)
       timeout
-    net-smtp (0.3.3)
+    net-smtp (0.5.0)
       net-protocol
-    nio4r (2.5.8)
+    nio4r (2.7.3)
-    nokogiri (1.13.9)
+    nokogiri (1.16.7)
-      mini_portile2 (~> 2.8.0)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    oj (3.13.23)
+    oj (3.16.6)
+      bigdecimal (>= 3.0)
+      ostruct (>= 0.2)
+    ostruct (0.6.0)
     parslet (2.0.0)
-    pg (1.4.5)
+    pg (1.5.8)
-    pry (0.14.1)
+    pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    puma (5.6.5)
+    psych (5.1.2)
+      stringio
+    puma (6.4.3)
       nio4r (~> 2.0)
-    racc (1.6.0)
+    racc (1.8.1)
-    rack (2.2.4)
+    rack (3.1.7)
-    rack-proxy (0.7.4)
+    rack-proxy (0.7.7)
       rack
-    rack-test (2.0.2)
+    rack-session (2.0.0)
+      rack (>= 3.0.0)
+    rack-test (2.1.0)
       rack (>= 1.3)
-    rails (7.0.4)
+    rackup (2.1.0)
-      actioncable (= 7.0.4)
+      rack (>= 3)
-      actionmailbox (= 7.0.4)
+      webrick (~> 1.8)
-      actionmailer (= 7.0.4)
+    rails (7.2.1)
-      actionpack (= 7.0.4)
+      actioncable (= 7.2.1)
-      actiontext (= 7.0.4)
+      actionmailbox (= 7.2.1)
-      actionview (= 7.0.4)
+      actionmailer (= 7.2.1)
-      activejob (= 7.0.4)
+      actionpack (= 7.2.1)
-      activemodel (= 7.0.4)
+      actiontext (= 7.2.1)
-      activerecord (= 7.0.4)
+      actionview (= 7.2.1)
-      activestorage (= 7.0.4)
+      activejob (= 7.2.1)
-      activesupport (= 7.0.4)
+      activemodel (= 7.2.1)
+      activerecord (= 7.2.1)
+      activestorage (= 7.2.1)
+      activesupport (= 7.2.1)
       bundler (>= 1.15.0)
-      railties (= 7.0.4)
+      railties (= 7.2.1)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
       activesupport (>= 5.0.1.rc1)
-    rails-dom-testing (2.0.3)
+    rails-dom-testing (2.2.0)
-      activesupport (>= 4.2.0)
+      activesupport (>= 5.0.0)
+      minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.3)
+    rails-html-sanitizer (1.6.0)
-      loofah (~> 2.3)
+      loofah (~> 2.21)
-    railties (7.0.4)
+      nokogiri (~> 1.14)
-      actionpack (= 7.0.4)
+    railties (7.2.1)
-      activesupport (= 7.0.4)
+      actionpack (= 7.2.1)
-      method_source
+      activesupport (= 7.2.1)
+      irb (~> 1.13)
+      rackup (>= 1.0.0)
       rake (>= 12.2)
-      thor (~> 1.0)
+      thor (~> 1.0, >= 1.2.2)
-      zeitwerk (~> 2.5)
+      zeitwerk (~> 2.6)
-    rake (13.0.6)
+    rake (13.2.1)
     rb-fsevent (0.11.2)
-    rb-inotify (0.10.1)
+    rb-inotify (0.11.1)
       ffi (~> 1.0)
-    redcarpet (3.5.1)
+    rdoc (6.7.0)
-    rspec (3.12.0)
+      psych (>= 4.0.0)
-      rspec-core (~> 3.12.0)
+    redcarpet (3.6.0)
-      rspec-expectations (~> 3.12.0)
+    reline (0.5.10)
-      rspec-mocks (~> 3.12.0)
+      io-console (~> 0.5)
-    rspec-core (3.12.0)
+    rspec (3.13.0)
-      rspec-support (~> 3.12.0)
+      rspec-core (~> 3.13.0)
-    rspec-expectations (3.12.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.1)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
+      rspec-support (~> 3.13.0)
-    rspec-mocks (3.12.0)
+    rspec-mocks (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
+      rspec-support (~> 3.13.0)
-    rspec-rails (6.0.1)
+    rspec-rails (7.0.1)
-      actionpack (>= 6.1)
+      actionpack (>= 7.0)
-      activesupport (>= 6.1)
+      activesupport (>= 7.0)
-      railties (>= 6.1)
+      railties (>= 7.0)
-      rspec-core (~> 3.11)
+      rspec-core (~> 3.13)
-      rspec-expectations (~> 3.11)
+      rspec-expectations (~> 3.13)
-      rspec-mocks (~> 3.11)
+      rspec-mocks (~> 3.13)
-      rspec-support (~> 3.11)
+      rspec-support (~> 3.13)
-    rspec-support (3.12.0)
+    rspec-support (3.13.1)
+    securerandom (0.3.1)
     semantic_range (3.0.0)
     shakapacker (6.5.4)
       activesupport (>= 5.2)
@@ -231,24 +268,27 @@ GEM
       semantic_range (>= 2.3.0)
     shellany (0.0.1)
     signed_multiset (0.2.1)
-    sqlite3 (1.5.4)
+    sqlite3 (2.1.0)
       mini_portile2 (~> 2.8.0)
-    thor (1.2.1)
+    stringio (3.1.1)
+    thor (1.3.2)
     thread_safe (0.3.6)
-    timeout (0.3.0)
+    timeout (0.4.1)
-    tzinfo (2.0.5)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    tzinfo-data (1.2022.7)
+    tzinfo-data (1.2024.2)
       tzinfo (>= 1.0.0)
     unitwise (2.3.0)
       liner (~> 0.2)
       memoizable (~> 0.4)
       parslet (~> 2.0)
       signed_multiset (~> 0.2)
-    websocket-driver (0.7.5)
+    useragent (0.16.10)
+    webrick (1.8.2)
+    websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    zeitwerk (2.6.6)
+    zeitwerk (2.6.18)
 
 PLATFORMS
   ruby
@@ -256,23 +296,23 @@ PLATFORMS
 DEPENDENCIES
   bcrypt (~> 3.1.18)
   bootsnap (>= 1.1.0)
-  dalli (~> 3.2.3)
+  dalli (~> 3.2.8)
-  database_cleaner (~> 2.0.1)
+  database_cleaner (~> 2.0.2)
-  factory_bot_rails (~> 6.2.0)
+  factory_bot_rails (~> 6.4.3)
   guard (~> 2.18.0)
   guard-rspec
   kaminari (~> 1.2.2)
-  oj (~> 3.13.23)
+  oj (~> 3.16.6)
-  pg (~> 1.4.5)
+  pg (~> 1.5.8)
-  puma (~> 5.6)
+  puma (~> 6.4)
-  rails (= 7.0.4)
+  rails (= 7.2.1)
   rails-controller-testing
-  redcarpet (~> 3.5.1)
+  redcarpet (~> 3.6.0)
-  rspec-rails (~> 6.0.1)
+  rspec-rails (~> 7.0.1)
   shakapacker (= 6.5.4)
-  sqlite3 (~> 1.5.4)
+  sqlite3 (~> 2.1.0)
   tzinfo-data
   unitwise (~> 2.3.0)
 
 BUNDLED WITH
-   2.3.22
+   2.5.20

app/controllers/notes_controller.rb

@@ -1,5 +1,5 @@
 class NotesController < ApplicationController
-  before_action :set_note, only: [:show, :edit, :update, :destroy]
+  before_action :set_note, only: [:show, :update, :destroy]
   before_action :ensure_valid_user
 
   # GET /notes

bin/setup

@@ -1,11 +1,11 @@
 #!/usr/bin/env ruby
 require "fileutils"
 
-# path to your application root.
 APP_ROOT = File.expand_path("..", __dir__)
+APP_NAME = "parsley"
 
 def system!(*args)
-  system(*args) || abort("\n== Command #{args} failed ==")
+  system(*args, exception: true)
 end
 
 FileUtils.chdir APP_ROOT do
@@ -17,9 +17,6 @@ FileUtils.chdir APP_ROOT do
   system! "gem install bundler --conservative"
   system("bundle check") || system!("bundle install")
 
-  # Install JavaScript dependencies
-  system! "bin/yarn"
-
   # puts "\n== Copying sample files =="
   # unless File.exist?("config/database.yml")
   #   FileUtils.cp "config/database.yml.sample", "config/database.yml"
@@ -33,4 +30,8 @@ FileUtils.chdir APP_ROOT do
 
   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"
 end

config/application.rb

@@ -22,7 +22,9 @@ Bundler.require(*Rails.groups)
 module Parsley
   class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.
-    config.load_defaults 7.0
+    config.load_defaults 7.2
+
+    config.autoload_lib(ignore: %w(assets tasks unit_conversion))
 
     config.action_dispatch.cookies_same_site_protection = :lax
     config.active_record.collection_cache_versioning = true

config/environments/development.rb

@@ -6,7 +6,7 @@ Rails.application.configure do
   # In the development environment your application's code is reloaded any time
   # it changes. This slows down response time but is perfect for development
   # since you don't have to restart the web server when you make code changes.
-  config.cache_classes = false
+  config.enable_reloading = true
 
   # Do not eager load code on boot.
   config.eager_load = false
@@ -14,7 +14,7 @@ Rails.application.configure do
   # Show full error reports.
   config.consider_all_requests_local = true
 
-  # Enable server timing
+  # Enable server timing.
   config.server_timing = true
 
   # Enable/disable caching. By default caching is disabled.
@@ -24,9 +24,7 @@ Rails.application.configure do
     config.action_controller.enable_fragment_cache_logging = true
 
     config.cache_store = :memory_store
-    config.public_file_server.headers = {
+    config.public_file_server.headers = { "Cache-Control" => "public, max-age=#{2.days.to_i}" }
-      "Cache-Control" => "public, max-age=#{2.days.to_i}"
-    }
   else
     config.action_controller.perform_caching = false
 
@@ -36,8 +34,12 @@ Rails.application.configure do
   # Don't care if the mailer can't send.
   config.action_mailer.raise_delivery_errors = false
 
+  # Disable caching for Action Mailer templates even if Action Controller
+  # caching is enabled.
   config.action_mailer.perform_caching = false
 
+  config.action_mailer.default_url_options = { host: "localhost", port: 3000 }
+
   # Print deprecation notices to the Rails logger.
   config.active_support.deprecation = :log
 
@@ -53,13 +55,18 @@ Rails.application.configure do
   # Highlight code that triggered database queries in logs.
   config.active_record.verbose_query_logs = true
 
+  # Highlight code that enqueued background job in logs.
+  config.active_job.verbose_enqueue_logs = true
 
   # Raises error for missing translations.
   # config.i18n.raise_on_missing_translations = true
 
   # Annotate rendered view with file names.
-  # config.action_view.annotate_rendered_view_with_filenames = true
+  config.action_view.annotate_rendered_view_with_filenames = true
 
   # Uncomment if you wish to allow Action Cable access from any origin.
   # config.action_cable.disable_request_forgery_protection = true
+
+  # Raise error when a before_action's only/except options reference missing actions.
+  config.action_controller.raise_on_missing_callback_actions = true
 end

config/environments/production.rb

@@ -4,7 +4,7 @@ Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 
   # Code is not reloaded between requests.
-  config.cache_classes = true
+  config.enable_reloading = false
 
   # Eager load code on boot. This eager loads most of Rails and
   # your application in memory, allowing both threaded web servers
@@ -13,16 +13,15 @@ Rails.application.configure do
   config.eager_load = true
 
   # Full error reports are disabled and caching is turned on.
-  config.consider_all_requests_local       = false
+  config.consider_all_requests_local = false
   config.action_controller.perform_caching = true
 
-  # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"]
+  # Ensures that a master key has been made available in ENV["RAILS_MASTER_KEY"], config/master.key, or an environment
-  # or in config/master.key. This key is used to decrypt credentials (and other encrypted files).
+  # key such as config/credentials/production.key. This key is used to decrypt credentials (and other encrypted files).
   # config.require_master_key = true
 
-  # Disable serving static files from the `/public` folder by default since
+  # Disable serving static files from `public/`, relying on NGINX/Apache to do so instead.
-  # Apache or NGINX already handles this.
+  # config.public_file_server.enabled = false
-  config.public_file_server.enabled = ENV["RAILS_SERVE_STATIC_FILES"].present?
 
   # Enable serving of images, stylesheets, and JavaScripts from an asset server.
   # config.asset_host = "http://assets.example.com"
@@ -36,23 +35,38 @@ Rails.application.configure do
   # config.action_cable.url = "wss://example.com/cable"
   # config.action_cable.allowed_request_origins = [ "http://example.com", /http:\/\/example.*/ ]
 
-  # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
+  # Assume all access to the app is happening through a SSL-terminating reverse proxy.
-  # config.force_ssl = true
+  # Can be used together with config.force_ssl for Strict-Transport-Security and secure cookies.
+  # config.assume_ssl = true
 
-  # Include generic and useful information about system operation, but avoid logging too much
+  # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
-  # information to avoid inadvertent exposure of personally identifiable information (PII).
+  config.force_ssl = true
-  config.log_level = :info
+
+  # Skip http-to-https redirect for the default health check endpoint.
+  # config.ssl_options = { redirect: { exclude: ->(request) { request.path == "/up" } } }
+
+  # Log to STDOUT by default
+  config.logger = ActiveSupport::Logger.new(STDOUT)
+    .tap  { |logger| logger.formatter = ::Logger::Formatter.new }
+    .then { |logger| ActiveSupport::TaggedLogging.new(logger) }
 
   # Prepend all log lines with the following tags.
   config.log_tags = [ :request_id ]
 
+  # "info" includes generic and useful information about system operation, but avoids logging too much
+  # information to avoid inadvertent exposure of personally identifiable information (PII). If you
+  # want to log everything, set the level to "debug".
+  config.log_level = ENV.fetch("RAILS_LOG_LEVEL", "info")
+
   # Use a different cache store in production.
   # config.cache_store = :mem_cache_store
 
   # Use a real queuing backend for Active Job (and separate queues per environment).
-  # config.active_job.queue_adapter     = :resque
+  # config.active_job.queue_adapter = :resque
   # config.active_job.queue_name_prefix = "parsley_production"
 
+  # Disable caching for Action Mailer templates even if Action Controller
+  # caching is enabled.
   config.action_mailer.perform_caching = false
 
   # Ignore bad email addresses and do not raise email delivery errors.
@@ -66,19 +80,14 @@ Rails.application.configure do
   # Don't log any deprecations.
   config.active_support.report_deprecations = false
 
-  # Use default logging formatter so that PID and timestamp are not suppressed.
-  config.log_formatter = ::Logger::Formatter.new
-
-  # Use a different logger for distributed setups.
-  # require "syslog/logger"
-  # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new "app-name")
-
-  if ENV["RAILS_LOG_TO_STDOUT"].present?
-    logger           = ActiveSupport::Logger.new(STDOUT)
-    logger.formatter = config.log_formatter
-    config.logger    = ActiveSupport::TaggedLogging.new(logger)
-  end
-
   # Do not dump schema after migrations.
   config.active_record.dump_schema_after_migration = false
+
+  # Enable DNS rebinding protection and other `Host` header attacks.
+  # config.hosts = [
+  #   "example.com",     # Allow requests from example.com
+  #   /.*\.example\.com/ # Allow requests from subdomains like `www.example.com`
+  # ]
+  # Skip DNS rebinding protection for the default health check endpoint.
+  # config.host_authorization = { exclude: ->(request) { request.path == "/up" } }
 end

config/environments/test.rb

@@ -8,31 +8,31 @@ 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.
+  # While tests run files are not watched, reloading is not necessary.
-  config.cache_classes = true
+  config.enable_reloading = false
 
-  # Eager loading loads your whole application. When running a single test locally,
+  # Eager loading loads your entire application. When running a single test locally,
-  # this probably isn't necessary. It's a good idea to do in a continuous integration
+  # this is usually not necessary, and can slow down your test suite. However, it's
-  # system, or in some way before deploying your code.
+  # recommended that you enable it in continuous integration systems to ensure eager
+  # loading is working properly before deploying your code.
   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}" }
-  config.public_file_server.headers = {
-    "Cache-Control" => "public, max-age=#{1.hour.to_i}"
-  }
 
   # Show full error reports and disable caching.
-  config.consider_all_requests_local       = true
+  config.consider_all_requests_local = true
   config.action_controller.perform_caching = false
   config.cache_store = :null_store
 
-  # Raise exceptions instead of rendering exception templates.
+  # Render exception templates for rescuable exceptions and raise for other exceptions.
-  config.action_dispatch.show_exceptions = false
+  config.action_dispatch.show_exceptions = :rescuable
 
   # Disable request forgery protection in test environment.
   config.action_controller.allow_forgery_protection = false
 
+  # Disable caching for Action Mailer templates even if Action Controller
+  # caching is enabled.
   config.action_mailer.perform_caching = false
 
   # Tell Action Mailer not to deliver emails to the real world.
@@ -40,6 +40,10 @@ Rails.application.configure do
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
 
+  # Unlike controllers, the mailer instance doesn't have any context about the
+  # incoming request so you'll need to provide the :host parameter yourself.
+  config.action_mailer.default_url_options = { host: "www.example.com" }
+
   # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr
 
@@ -54,4 +58,7 @@ Rails.application.configure do
 
   # Annotate rendered view with file names.
   # config.action_view.annotate_rendered_view_with_filenames = true
+
+  # Raise error when a before_action's only/except options reference missing actions.
+  config.action_controller.raise_on_missing_callback_actions = true
 end

config/initializers/assets.rb

@@ -1,12 +0,0 @@
-# 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"
-
-# Add additional assets to the asset load path.
-# Rails.application.config.assets.paths << Emoji.images_path
-
-# Precompile additional assets.
-# application.js, application.css, and all non-JS/CSS in the app/assets
-# folder are already added.
-# Rails.application.config.assets.precompile += %w( admin.js admin.css )

config/initializers/content_security_policy.rb

@@ -16,9 +16,9 @@
 #     # policy.report_uri "/csp-violation-report-endpoint"
 #   end
 #
-#   # Generate session nonces for permitted importmap and inline scripts
+#   # Generate session nonces for permitted importmap, inline scripts, and inline styles.
 #   config.content_security_policy_nonce_generator = ->(request) { request.session.id.to_s }
-#   config.content_security_policy_nonce_directives = %w(script-src)
+#   config.content_security_policy_nonce_directives = %w(script-src style-src)
 #
 #   # Report violations without enforcing the policy.
 #   # config.content_security_policy_report_only = true

config/initializers/filter_parameter_logging.rb

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

config/initializers/lib.rb

@@ -1,4 +0,0 @@
-
-require 'markdown_processor'
-require 'unit_conversion'
-require 'yield_parser'

config/initializers/new_framework_defaults_7_0.rb

@@ -1,135 +0,0 @@
-# Be sure to restart your server when you modify this file.
-#
-# This file eases your Rails 7.0 framework defaults upgrade.
-#
-# Uncomment each configuration one by one to switch to the new default.
-# Once your application is ready to run with all new defaults, you can remove
-# this file and set the `config.load_defaults` to `7.0`.
-#
-# Read the Guide for Upgrading Ruby on Rails for more info on each option.
-# https://guides.rubyonrails.org/upgrading_ruby_on_rails.html
-
-# `button_to` view helper will render `<button>` element, regardless of whether
-# or not the content is passed as the first argument or as a block.
-# Rails.application.config.action_view.button_to_generates_button_tag = true
-
-# `stylesheet_link_tag` view helper will not render the media attribute by default.
-# Rails.application.config.action_view.apply_stylesheet_media_default = false
-
-# Change the digest class for the key generators to `OpenSSL::Digest::SHA256`.
-# Changing this default means invalidate all encrypted messages generated by
-# your application and, all the encrypted cookies. Only change this after you
-# rotated all the messages using the key rotator.
-#
-# See upgrading guide for more information on how to build a rotator.
-# https://guides.rubyonrails.org/v7.0/upgrading_ruby_on_rails.html
-# Rails.application.config.active_support.key_generator_hash_digest_class = OpenSSL::Digest::SHA256
-
-# Change the digest class for ActiveSupport::Digest.
-# Changing this default means that for example Etags change and
-# various cache keys leading to cache invalidation.
-# Rails.application.config.active_support.hash_digest_class = OpenSSL::Digest::SHA256
-
-# Don't override ActiveSupport::TimeWithZone.name and use the default Ruby
-# implementation.
-# Rails.application.config.active_support.remove_deprecated_time_with_zone_name = true
-
-# Calls `Rails.application.executor.wrap` around test cases.
-# This makes test cases behave closer to an actual request or job.
-# Several features that are normally disabled in test, such as Active Record query cache
-# and asynchronous queries will then be enabled.
-# Rails.application.config.active_support.executor_around_test_case = true
-
-# Define the isolation level of most of Rails internal state.
-# If you use a fiber based server or job processor, you should set it to `:fiber`.
-# Otherwise the default of `:thread` if preferable.
-# Rails.application.config.active_support.isolation_level = :thread
-
-# Set both the `:open_timeout` and `:read_timeout` values for `:smtp` delivery method.
-# Rails.application.config.action_mailer.smtp_timeout = 5
-
-# The ActiveStorage video previewer will now use scene change detection to generate
-# better preview images (rather than the previous default of using the first frame
-# of the video).
-# Rails.application.config.active_storage.video_preview_arguments =
-#   "-vf 'select=eq(n\\,0)+eq(key\\,1)+gt(scene\\,0.015),loop=loop=-1:size=2,trim=start_frame=1' -frames:v 1 -f image2"
-
-# Automatically infer `inverse_of` for associations with a scope.
-# Rails.application.config.active_record.automatic_scope_inversing = true
-
-# Raise when running tests if fixtures contained foreign key violations
-# Rails.application.config.active_record.verify_foreign_keys_for_fixtures = true
-
-# Disable partial inserts.
-# This default means that all columns will be referenced in INSERT queries
-# regardless of whether they have a default or not.
-# Rails.application.config.active_record.partial_inserts = false
-
-# Protect from open redirect attacks in `redirect_back_or_to` and `redirect_to`.
-# Rails.application.config.action_controller.raise_on_open_redirects = true
-
-# Change the variant processor for Active Storage.
-# Changing this default means updating all places in your code that
-# generate variants to use image processing macros and ruby-vips
-# operations. See the upgrading guide for detail on the changes required.
-# The `:mini_magick` option is not deprecated; it's fine to keep using it.
-# Rails.application.config.active_storage.variant_processor = :vips
-
-# Enable parameter wrapping for JSON.
-# Previously this was set in an initializer. It's fine to keep using that initializer if you've customized it.
-# To disable parameter wrapping entirely, set this config to `false`.
-# Rails.application.config.action_controller.wrap_parameters_by_default = true
-
-# Specifies whether generated namespaced UUIDs follow the RFC 4122 standard for namespace IDs provided as a
-# `String` to `Digest::UUID.uuid_v3` or `Digest::UUID.uuid_v5` method calls.
-#
-# See https://guides.rubyonrails.org/configuring.html#config-active-support-use-rfc4122-namespaced-uuids for
-# more information.
-# Rails.application.config.active_support.use_rfc4122_namespaced_uuids = true
-
-# Change the default headers to disable browsers' flawed legacy XSS protection.
-# Rails.application.config.action_dispatch.default_headers = {
-#   "X-Frame-Options" => "SAMEORIGIN",
-#   "X-XSS-Protection" => "0",
-#   "X-Content-Type-Options" => "nosniff",
-#   "X-Download-Options" => "noopen",
-#   "X-Permitted-Cross-Domain-Policies" => "none",
-#   "Referrer-Policy" => "strict-origin-when-cross-origin"
-# }
-
-
-# ** Please read carefully, this must be configured in config/application.rb **
-# Change the format of the cache entry.
-# Changing this default means that all new cache entries added to the cache
-# will have a different format that is not supported by Rails 6.1 applications.
-# Only change this value after your application is fully deployed to Rails 7.0
-# and you have no plans to rollback.
-# When you're ready to change format, add this to `config/application.rb` (NOT this file):
-#  config.active_support.cache_format_version = 7.0
-
-
-# Cookie serializer: 2 options
-# 
-# If you're upgrading and haven't set `cookies_serializer` previously, your cookie serializer
-# is `:marshal`. The default for new apps is `:json`.
-#
-# Rails.application.config.action_dispatch.cookies_serializer = :json
-#
-#
-# To migrate an existing application to the `:json` serializer, use the `:hybrid` option.
-# 
-# Rails transparently deserializes existing (Marshal-serialized) cookies on read and
-# re-writes them in the JSON format.
-# 
-# It is fine to use `:hybrid` long term; you should do that until you're confident *all* your cookies
-# have been converted to JSON. To keep using `:hybrid` long term, move this config to its own
-# initializer or to `config/application.rb`.
-#
-# Rails.application.config.action_dispatch.cookies_serializer = :hybrid
-#
-#
-# If your cookies can't yet be serialized to JSON, keep using `:marshal` for backward-compatibility.
-#
-# If you have configured the serializer elsewhere, you can remove this section of the file.
-# 
-# See https://guides.rubyonrails.org/action_controller_overview.html#cookies for more information.

config/initializers/permissions_policy.rb

@@ -1,11 +1,13 @@
+# Be sure to restart your server when you modify this file.
+
 # Define an application-wide HTTP permissions policy. For further
-# information see https://developers.google.com/web/updates/2018/06/feature-policy
+# information see: https://developers.google.com/web/updates/2018/06/feature-policy
-#
+
-# Rails.application.config.permissions_policy do |f|
+# Rails.application.config.permissions_policy do |policy|
-#   f.camera      :none
+#   policy.camera      :none
-#   f.gyroscope   :none
+#   policy.gyroscope   :none
-#   f.microphone  :none
+#   policy.microphone  :none
-#   f.usb         :none
+#   policy.usb         :none
-#   f.fullscreen  :self
+#   policy.fullscreen  :self
-#   f.payment     :self, "https://secure.example.com"
+#   policy.payment     :self, "https://secure.example.com"
 # end

config/puma.rb

@@ -1,38 +1,34 @@
-# Puma can serve each request in a thread from an internal thread pool.
+# This configuration file will be evaluated by Puma. The top-level methods that
-# The `threads` method setting takes two numbers: a minimum and maximum.
+# are invoked here are part of Puma's configuration DSL. For more information
-# Any libraries that use thread pools should be configured to match
+# about methods provided by the DSL, see https://puma.io/puma/Puma/DSL.html.
-# the maximum value specified for Puma. Default is set to 5 threads for minimum
+
-# and maximum; this matches the default thread size of Active Record.
+# Puma starts a configurable number of processes (workers) and each process
+# serves each request in a thread from an internal thread pool.
 #
-max_threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 }
+# The ideal number of threads per worker depends both on how much time the
-min_threads_count = ENV.fetch("RAILS_MIN_THREADS") { max_threads_count }
+# application spends waiting for IO operations and on how much you wish to
-threads min_threads_count, max_threads_count
+# to prioritize throughput over latency.
+#
+# As a rule of thumb, increasing the number of threads will increase how much
+# traffic a given process can handle (throughput), but due to CRuby's
+# Global VM Lock (GVL) it has diminishing returns and will degrade the
+# response time (latency) of the application.
+#
+# The default is set to 3 threads as it's deemed a decent compromise between
+# throughput and latency for the average Rails application.
+#
+# Any libraries that use a connection pool or another resource pool should
+# be configured to provide at least as many connections as the number of
+# threads. This includes Active Record's `pool` parameter in `database.yml`.
+threads_count = ENV.fetch("RAILS_MAX_THREADS", 3)
+threads threads_count, threads_count
 
 # Specifies the `port` that Puma will listen on to receive requests; default is 3000.
-#
+port ENV.fetch("PORT", 3000)
-port        ENV.fetch("PORT") { 3000 }
 
-# Specifies the `environment` that Puma will run in.
+# Allow puma to be restarted by `bin/rails restart` command.
-#
-environment ENV.fetch("RAILS_ENV") { "development" }
-
-# Specifies the `pidfile` that Puma will use.
-pidfile ENV.fetch("PIDFILE") { "tmp/pids/server.pid" }
-
-# Specifies the number of `workers` to boot in clustered mode.
-# Workers are forked web server processes. If using threads and workers together
-# the concurrency of the application would be max `threads` * `workers`.
-# Workers do not work on JRuby or Windows (both of which do not support
-# processes).
-#
-# workers ENV.fetch("WEB_CONCURRENCY") { 2 }
-
-# Use the `preload_app!` method when specifying a `workers` number.
-# This directive tells Puma to first boot the application and load code
-# before forking the application. This takes advantage of Copy On Write
-# process behavior so workers use less memory.
-#
-# preload_app!
-
-# Allow puma to be restarted by `rails restart` command.
 plugin :tmp_restart
+
+# Specify the PID file. Defaults to tmp/pids/server.pid in development.
+# In other environments, only set the PID file if requested.
+pidfile ENV["PIDFILE"] if ENV["PIDFILE"]

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.0].define(version: 2018_09_15_134841) do
+ActiveRecord::Schema[7.2].define(version: 2018_09_15_134841) do
   create_table "food_units", force: :cascade do |t|
     t.integer "food_id", null: false
     t.string "name", null: false
@@ -157,7 +157,7 @@ ActiveRecord::Schema[7.0].define(version: 2018_09_15_134841) do
   end
 
   create_table "usda_foods", force: :cascade do |t|
-    t.string "ndbn", limit: 25, null: false
+    t.string "ndbn", limit: 25
     t.string "long_description"
     t.string "short_description"
     t.decimal "water", precision: 10, scale: 2
@@ -211,5 +211,4 @@ ActiveRecord::Schema[7.0].define(version: 2018_09_15_134841) do
     t.datetime "created_at", precision: nil, null: false
     t.datetime "updated_at", precision: nil, null: false
   end
-
 end

package.json

@@ -46,5 +46,6 @@
   },
   "browserslist": [
     "defaults"
-  ]
+  ],
+  "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
 }

public/404.html

@@ -4,7 +4,7 @@
   <title>The page you were looking for doesn't exist (404)</title>
   <meta name="viewport" content="width=device-width,initial-scale=1">
   <style>
-  body {
+  .rails-default-error-page {
     background-color: #EFEFEF;
     color: #2E2F30;
     text-align: center;
@@ -12,13 +12,13 @@
     margin: 0;
   }
 
-  div.dialog {
+  .rails-default-error-page div.dialog {
     width: 95%;
     max-width: 33em;
     margin: 4em auto 0;
   }
 
-  div.dialog > div {
+  .rails-default-error-page div.dialog > div {
     border: 1px solid #CCC;
     border-right-color: #999;
     border-left-color: #999;
@@ -31,13 +31,13 @@
     box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
   }
 
-  h1 {
+  .rails-default-error-page h1 {
     font-size: 100%;
     color: #730E15;
     line-height: 1.5em;
   }
 
-  div.dialog > p {
+  .rails-default-error-page div.dialog > p {
     margin: 0 0 1em;
     padding: 1em;
     background-color: #F7F7F7;
@@ -54,7 +54,7 @@
   </style>
 </head>
 
-<body>
+<body class="rails-default-error-page">
   <!-- This file lives in public/404.html -->
   <div class="dialog">
     <div>

public/406-unsupported-browser.html

@@ -0,0 +1,66 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Your browser is not supported (406)</title>
+  <meta name="viewport" content="width=device-width,initial-scale=1">
+  <style>
+  .rails-default-error-page {
+    background-color: #EFEFEF;
+    color: #2E2F30;
+    text-align: center;
+    font-family: arial, sans-serif;
+    margin: 0;
+  }
+
+  .rails-default-error-page div.dialog {
+    width: 95%;
+    max-width: 33em;
+    margin: 4em auto 0;
+  }
+
+  .rails-default-error-page div.dialog > div {
+    border: 1px solid #CCC;
+    border-right-color: #999;
+    border-left-color: #999;
+    border-bottom-color: #BBB;
+    border-top: #B00100 solid 4px;
+    border-top-left-radius: 9px;
+    border-top-right-radius: 9px;
+    background-color: white;
+    padding: 7px 12% 0;
+    box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
+  }
+
+  .rails-default-error-page h1 {
+    font-size: 100%;
+    color: #730E15;
+    line-height: 1.5em;
+  }
+
+  .rails-default-error-page div.dialog > p {
+    margin: 0 0 1em;
+    padding: 1em;
+    background-color: #F7F7F7;
+    border: 1px solid #CCC;
+    border-right-color: #999;
+    border-left-color: #999;
+    border-bottom-color: #999;
+    border-bottom-left-radius: 4px;
+    border-bottom-right-radius: 4px;
+    border-top-color: #DADADA;
+    color: #666;
+    box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
+  }
+  </style>
+</head>
+
+<body class="rails-default-error-page">
+  <!-- This file lives in public/406-unsupported-browser.html -->
+  <div class="dialog">
+    <div>
+      <h1>Your browser is not supported.</h1>
+      <p>Please upgrade your browser to continue.</p>
+    </div>
+  </div>
+</body>
+</html>

public/422.html

@@ -4,7 +4,7 @@
   <title>The change you wanted was rejected (422)</title>
   <meta name="viewport" content="width=device-width,initial-scale=1">
   <style>
-  body {
+  .rails-default-error-page {
     background-color: #EFEFEF;
     color: #2E2F30;
     text-align: center;
@@ -12,13 +12,13 @@
     margin: 0;
   }
 
-  div.dialog {
+  .rails-default-error-page div.dialog {
     width: 95%;
     max-width: 33em;
     margin: 4em auto 0;
   }
 
-  div.dialog > div {
+  .rails-default-error-page div.dialog > div {
     border: 1px solid #CCC;
     border-right-color: #999;
     border-left-color: #999;
@@ -31,13 +31,13 @@
     box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
   }
 
-  h1 {
+  .rails-default-error-page h1 {
     font-size: 100%;
     color: #730E15;
     line-height: 1.5em;
   }
 
-  div.dialog > p {
+  .rails-default-error-page div.dialog > p {
     margin: 0 0 1em;
     padding: 1em;
     background-color: #F7F7F7;
@@ -54,7 +54,7 @@
   </style>
 </head>
 
-<body>
+<body class="rails-default-error-page">
   <!-- This file lives in public/422.html -->
   <div class="dialog">
     <div>

public/500.html

@@ -4,7 +4,7 @@
   <title>We're sorry, but something went wrong (500)</title>
   <meta name="viewport" content="width=device-width,initial-scale=1">
   <style>
-  body {
+  .rails-default-error-page {
     background-color: #EFEFEF;
     color: #2E2F30;
     text-align: center;
@@ -12,13 +12,13 @@
     margin: 0;
   }
 
-  div.dialog {
+  .rails-default-error-page div.dialog {
     width: 95%;
     max-width: 33em;
     margin: 4em auto 0;
   }
 
-  div.dialog > div {
+  .rails-default-error-page div.dialog > div {
     border: 1px solid #CCC;
     border-right-color: #999;
     border-left-color: #999;
@@ -31,13 +31,13 @@
     box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
   }
 
-  h1 {
+  .rails-default-error-page h1 {
     font-size: 100%;
     color: #730E15;
     line-height: 1.5em;
   }
 
-  div.dialog > p {
+  .rails-default-error-page div.dialog > p {
     margin: 0 0 1em;
     padding: 1em;
     background-color: #F7F7F7;
@@ -54,7 +54,7 @@
   </style>
 </head>
 
-<body>
+<body class="rails-default-error-page">
   <!-- This file lives in public/500.html -->
   <div class="dialog">
     <div>

public/icon.svg

@@ -0,0 +1,3 @@
+<svg width="100" height="100" xmlns="http://www.w3.org/2000/svg">
+  <rect width="100%" height="100%" fill="red"/>
+</svg>

public/robots.txt

@@ -1,5 +1 @@
-# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file
+# See https://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file
-#
-# To ban all spiders from the entire site uncomment the next two lines:
-# User-agent: *
-# Disallow: /

spec/lib/usda_importer_spec.rb

@@ -1,7 +1,7 @@
 require 'rails_helper'
 require 'usda_importer'
 
-RSpec.describe UsdaImporter, :skip_db_cleaner do
+RSpec.describe UsdaImporter do
 
   it 'imports' do
     i = UsdaImporter.new(Rails.root.join('spec', 'test_data'))

spec/rails_helper.rb

@@ -27,8 +27,6 @@ require 'rspec/rails'
 ActiveRecord::Migration.maintain_test_schema!
 
 RSpec.configure do |config|
-
-
   config.include FactoryBot::Syntax::Methods
 
   config.before(:suite) do
@@ -44,12 +42,8 @@ RSpec.configure do |config|
   end
 
   config.around(:each) do |example|
-    if example.metadata[:skip_db_cleaner]
+    DatabaseCleaner.cleaning do
       example.run
-    else
-      DatabaseCleaner.cleaning do
-        example.run
-      end
     end
   end