Upgrade Rails to 8.0.5

Author: steve-sullivan

.rubocop.yml

@@ -1,7 +1,8 @@
-require:
+plugins:
   - rubocop-rails
 
 AllCops:
+  TargetRailsVersion: 8.0
   UseCache: false
   Exclude:
     # Exclude generated files
@@ -185,7 +186,7 @@ Lint/TripleQuotes: # (new in 1.9)
   Enabled: true
 Style/IfWithBooleanLiteralBranches: # (new in 1.9)
   Enabled: true
-Gemspec/DateAssignment: # (new in 1.10)
+Gemspec/DeprecatedAttributeAssignment:
   Enabled: true
 Style/HashConversion: # (new in 1.10)
   Enabled: true

Gemfile

@@ -5,18 +5,19 @@ ruby '~> 3.3'
 
 gem 'berkeley_library-alma', '~> 0.1.1'
 gem 'berkeley_library-logging', '~> 0.3'
-gem 'berkeley_library-util', '~> 0.2.0'
+gem 'berkeley_library-util', '~> 0.3'
 gem 'drb'
 gem 'image_processing', '~> 1.12'
 gem 'jsonapi.rb', '~> 2.0'
 gem 'jsonapi-serializer', '~> 2.2'
 gem 'jwt', '~> 2.4'
 gem 'mutex_m'
-gem 'omniauth', '~> 1.9', '>= 1.9.2'
-gem 'omniauth-cas', '~> 2.0'
+gem 'omniauth', '~> 2.1'
+gem 'omniauth-cas', '~> 3.0'
+gem 'omniauth-rails_csrf_protection', '~> 1.0'
 gem 'pg', '~> 1.4'
 gem 'pg_search', '~> 2.3'
-gem 'puma', '~> 5.0'
+gem 'puma', '~> 7.2'
 gem 'rack-cors'
 gem 'rails', '~> 8.0.4'
 gem 'ransack', '~> 4.2'
@@ -30,9 +31,10 @@ end
 
 group :development do
   gem 'hashdiff', '~> 1.0.1'
-  gem 'rubocop', '~> 1.26.0'
-  gem 'rubocop-rails', '~> 2.13.2', require: false
-  gem 'rubocop-rspec', '~> 2.4.0', require: false
+  gem 'rubocop', '~> 1.86'
+  gem 'rubocop-rails', '~> 2.34', require: false
+  gem 'rubocop-rspec', '~> 3.6', require: false
+  gem 'rubocop-rspec_rails', '~> 2.30', require: false
 end
 
 group :test do

Gemfile.lock

@@ -72,8 +72,8 @@ GEM
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
       uri (>= 0.13.1)
-    addressable (2.8.7)
-      public_suffix (>= 2.0.2, < 7.0)
+    addressable (2.8.9)
+      public_suffix (>= 2.0.2, < 8.0)
     amazing_print (1.8.1)
     ast (2.4.3)
     base64 (0.3.0)
@@ -93,7 +93,7 @@ GEM
       marc (~> 1.0)
       parslet (~> 2.0)
       ruby-marc-spec (~> 0.1)
-    berkeley_library-util (0.2.0)
+    berkeley_library-util (0.3.0)
       berkeley_library-logging (~> 0.3)
       rest-client (~> 2.1)
       typesafe_enum (~> 0.3)
@@ -136,9 +136,10 @@ GEM
     globalid (1.3.0)
       activesupport (>= 6.1)
     hashdiff (1.0.1)
-    hashie (5.0.0)
+    hashie (5.1.0)
+      logger
     http-accept (1.7.0)
-    http-cookie (1.0.8)
+    http-cookie (1.1.0)
       domain_name (~> 0.5)
     i18n (1.14.8)
       concurrent-ruby (~> 1.0)
@@ -151,13 +152,16 @@ GEM
       prism (>= 1.3.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
+    json (2.19.2)
     jsonapi-serializer (2.2.0)
       activesupport (>= 4.2)
     jsonapi.rb (2.1.1)
       jsonapi-serializer
       rack
     jwt (2.10.2)
       base64
+    language_server-protocol (3.17.0.5)
+    lint_roller (1.1.0)
     logger (1.7.0)
     lograge (0.14.0)
       actionpack (>= 4)
@@ -180,7 +184,7 @@ GEM
     mime-types (3.7.0)
       logger
       mime-types-data (~> 3.2025, >= 3.2025.0507)
-    mime-types-data (3.2025.0819)
+    mime-types-data (3.2026.0317)
     mini_magick (5.3.1)
       logger
     mini_mime (1.1.5)
@@ -209,21 +213,26 @@ GEM
       racc (~> 1.4)
     nokogiri (1.19.2-x86_64-linux-gnu)
       racc (~> 1.4)
-    oj (3.16.11)
+    oj (3.16.16)
       bigdecimal (>= 3.0)
       ostruct (>= 0.2)
-    omniauth (1.9.2)
+    omniauth (2.1.4)
       hashie (>= 3.4.6)
-      rack (>= 1.6.2, < 3)
-    omniauth-cas (2.0.0)
-      addressable (~> 2.3)
-      nokogiri (~> 1.5)
-      omniauth (~> 1.2)
+      logger
+      rack (>= 2.2.3)
+      rack-protection
+    omniauth-cas (3.0.2)
+      addressable (~> 2.8)
+      nokogiri (~> 1.12)
+      omniauth (~> 2.1)
+    omniauth-rails_csrf_protection (1.0.2)
+      actionpack (>= 4.2)
+      omniauth (~> 2.0)
     ostruct (0.6.3)
     ougai (2.0.0)
       oj (~> 3.10)
     parallel (1.27.0)
-    parser (3.3.9.0)
+    parser (3.3.10.2)
       ast (~> 2.4.1)
       racc
     parslet (2.0.0)
@@ -241,20 +250,24 @@ GEM
     psych (5.3.1)
       date
       stringio
-    public_suffix (6.0.2)
-    puma (5.6.9)
+    public_suffix (7.0.5)
+    puma (7.2.0)
       nio4r (~> 2.0)
     racc (1.8.1)
-    rack (2.2.22)
+    rack (3.2.5)
     rack-cors (2.0.2)
       rack (>= 2.0.0)
-    rack-session (1.0.2)
-      rack (< 3)
+    rack-protection (4.2.1)
+      base64 (>= 0.1.0)
+      logger (>= 1.6.0)
+      rack (>= 3.0.0, < 4)
+    rack-session (2.1.1)
+      base64 (>= 0.1.0)
+      rack (>= 3.0.0)
     rack-test (2.2.0)
       rack (>= 1.3)
-    rackup (1.0.1)
-      rack (< 3)
-      webrick
+    rackup (2.3.1)
+      rack (>= 3)
     rails (8.0.5)
       actioncable (= 8.0.5)
       actionmailbox (= 8.0.5)
@@ -299,7 +312,7 @@ GEM
       erb
       psych (>= 4.0.0)
       tsort
-    regexp_parser (2.11.2)
+    regexp_parser (2.11.3)
     reline (0.6.3)
       io-console (~> 0.5)
     request_store (1.7.0)
@@ -309,7 +322,7 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    rexml (3.4.1)
+    rexml (3.4.4)
     rspec (3.13.1)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
@@ -333,25 +346,33 @@ GEM
     rspec-support (3.13.7)
     rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (1.26.1)
+    rubocop (1.86.0)
+      json (~> 2.3)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
       parallel (~> 1.10)
-      parser (>= 3.1.0.0)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.16.0, < 2.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.49.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.46.0)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.49.1)
       parser (>= 3.3.7.2)
-      prism (~> 1.4)
-    rubocop-rails (2.13.2)
+      prism (~> 1.7)
+    rubocop-rails (2.34.3)
       activesupport (>= 4.2.0)
+      lint_roller (~> 1.1)
       rack (>= 1.1)
-      rubocop (>= 1.7.0, < 2.0)
-    rubocop-rspec (2.4.0)
-      rubocop (~> 1.0)
-      rubocop-ast (>= 1.1.0)
+      rubocop (>= 1.75.0, < 2.0)
+      rubocop-ast (>= 1.44.0, < 2.0)
+    rubocop-rspec (3.9.0)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.81)
+    rubocop-rspec_rails (2.32.0)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
+      rubocop-rspec (~> 3.5)
     ruby-marc-spec (0.1.3)
       marc (~> 1.1)
       parslet (~> 2.0)
@@ -376,14 +397,15 @@ GEM
     typesafe_enum (0.3.1)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.6.0)
+    unicode-display_width (3.2.0)
+      unicode-emoji (~> 4.1)
+    unicode-emoji (4.2.0)
     uri (1.1.1)
     useragent (0.16.11)
     webmock (3.25.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    webrick (1.9.2)
     websocket-driver (0.8.0)
       base64
       websocket-extensions (>= 0.1.0)
@@ -400,7 +422,7 @@ PLATFORMS
 DEPENDENCIES
   berkeley_library-alma (~> 0.1.1)
   berkeley_library-logging (~> 0.3)
-  berkeley_library-util (~> 0.2.0)
+  berkeley_library-util (~> 0.3)
   brakeman
   bundle-audit
   colorize
@@ -413,21 +435,23 @@ DEPENDENCIES
   jsonapi.rb (~> 2.0)
   jwt (~> 2.4)
   mutex_m
-  omniauth (~> 1.9, >= 1.9.2)
-  omniauth-cas (~> 2.0)
+  omniauth (~> 2.1)
+  omniauth-cas (~> 3.0)
+  omniauth-rails_csrf_protection (~> 1.0)
   pg (~> 1.4)
   pg_search (~> 2.3)
-  puma (~> 5.0)
+  puma (~> 7.2)
   rack-cors
   rails (~> 8.0.4)
   rails-controller-testing
   ransack (~> 4.2)
   rspec (~> 3.13)
   rspec-rails (~> 8.0)
   rspec_junit_formatter (~> 0.6)
-  rubocop (~> 1.26.0)
-  rubocop-rails (~> 2.13.2)
-  rubocop-rspec (~> 2.4.0)
+  rubocop (~> 1.86)
+  rubocop-rails (~> 2.34)
+  rubocop-rspec (~> 3.6)
+  rubocop-rspec_rails (~> 2.30)
   simplecov (~> 0.22)
   simplecov-rcov (~> 0.3)
   webmock

app/controllers/application_controller.rb

@@ -33,7 +33,7 @@ def authenticate!
   #
   # @return [User] the user
   def current_user
-    @current_user ||= (user_from_token || default_user)
+    @current_user ||= user_from_token || default_user
   end
 
   # Require an authenticated user with admin privileges

app/controllers/concerns/exception_handlers.rb

@@ -10,7 +10,7 @@ module ExceptionHandlers
   #
   # - StandardError -> render_jsonapi_internal_server_error
   # - ActiveRecord::RecordNotFound -> render_jsonapi_not_found
-  # - ActionController::ParameterMissing -> render_jsonapi_unprocessable_entity
+  # - ActionController::ParameterMissing -> render_jsonapi_unprocessable_content
 
   # rubocop:disable Metrics/BlockLength
   included do
@@ -21,8 +21,8 @@ module ExceptionHandlers
     rescue_from Error::ForbiddenError, with: :render_jsonapi_forbidden_error
     rescue_from ActionController::ParameterMissing, with: :render_jsonapi_parameter_missing
     rescue_from ActiveRecord::DeleteRestrictionError, with: :render_jsonapi_conflict
-    rescue_from ActiveRecord::RecordInvalid, with: :render_validation_errors_as_unprocessable_entity
-    rescue_from ActiveModel::ValidationError, with: :render_validation_errors_as_unprocessable_entity
+    rescue_from ActiveRecord::RecordInvalid, with: :render_validation_errors_as_unprocessable_content
+    rescue_from ActiveModel::ValidationError, with: :render_validation_errors_as_unprocessable_content
 
     # ------------------------------------------------------------
     # Error handlers
@@ -40,13 +40,13 @@ def render_jsonapi_unauthorized_error(exception)
 
     def render_jsonapi_parameter_missing(exception)
       logger.error(exception)
-      render_jsonapi_error(:unprocessable_entity, detail: exception.message)
+      render_jsonapi_error(:unprocessable_content, detail: exception.message)
     end
 
-    def render_validation_errors_as_unprocessable_entity(exception)
+    def render_validation_errors_as_unprocessable_content(exception)
       logger.error(exception)
       errors = validation_errors_from(exception) || [exception]
-      render jsonapi_errors: errors, status: :unprocessable_entity
+      render jsonapi_errors: errors, status: :unprocessable_content
     end
 
     # ------------------------------------------------------------
@@ -87,7 +87,8 @@ def render_jsonapi_conflict(exception)
     def validation_errors_from(exception)
       return unless (record = record_from(exception))
       return unless record.respond_to?(:errors) && (errors = record.errors)
-      return errors if errors.is_a?(Enumerable)
+
+      errors if errors.is_a?(Enumerable)
     end
 
     def render_jsonapi_error(status, detail: nil, meta: nil)

app/lib/cors_helper.rb

@@ -12,7 +12,7 @@ def allow?(source, env = Rails.env)
 
     def allowed_hosts
       config = Rails.application.config
-      cors_hosts = (config.cors_hosts || [])
+      cors_hosts = config.cors_hosts || []
       cors_hosts + config.hosts # TODO: should we only do this in dev?
     end
   end

app/models/closure.rb

@@ -67,7 +67,7 @@ def start_date_before_end_date
 
   FILTER_QUERIES.each do |scope_name, query|
     scope scope_name, -> { where("id IN (#{query})").order(**DEFAULT_ORDER) }
-    scope "not_#{scope_name}".to_sym, -> { where("id NOT IN (#{query})").order(**DEFAULT_ORDER) }
+    scope :"not_#{scope_name}", -> { where("id NOT IN (#{query})").order(**DEFAULT_ORDER) }
   end
 
   scope :filter_by, ->(filters) {

app/models/image.rb

@@ -127,7 +127,7 @@ def mime_type_of(uploaded_file)
 
     def jpeg_tempfile_from(uploaded_file)
       mime_type = mime_type_of(uploaded_file)
-      return uploaded_file if (mime_type) == JPEG_MIME_TYPE
+      return uploaded_file if mime_type == JPEG_MIME_TYPE
 
       logger.info("#{uploaded_file.path} (#{uploaded_file.original_filename}) is #{mime_type}; converting to #{JPEG_MIME_TYPE}")
       ImageProcessing::Vips.source(uploaded_file).convert('jpeg').call

app/services/availability_service.rb

@@ -90,7 +90,7 @@ def fetch_and_cache_availability_for(ids)
   # @param ids Array<String> a list of MMS IDs
   # @return Hash<String, Boolean> a hash from MMS IDs to availability.
   def fetch_availability_for(ids)
-    records = get_marc_records(*ids, max_records: (max_records || ids.size))
+    records = get_marc_records(*ids, max_records: max_records || ids.size)
 
     # TODO: do we need to cache this?
     records.each_with_object({}) do |marc_record, availability|