Merge pull request #5464 from pulibrary/rails-8.1.1

Rails 8.1.1

Author: christinach

Gemfile

@@ -2,7 +2,7 @@
 
 source 'https://gem.coop'
 
-gem 'rails', '~> 7.2.2'
+gem 'rails', '~> 8.1.1'
 
 gem 'alma'
 gem 'babel-transpiler'

Gemfile.lock

@@ -8,79 +8,80 @@ GIT
 GEM
   remote: https://gem.coop/
   specs:
-    actioncable (7.2.3)
-      actionpack (= 7.2.3)
-      activesupport (= 7.2.3)
+    action_text-trix (2.1.15)
+      railties
+    actioncable (8.1.1)
+      actionpack (= 8.1.1)
+      activesupport (= 8.1.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (7.2.3)
-      actionpack (= 7.2.3)
-      activejob (= 7.2.3)
-      activerecord (= 7.2.3)
-      activestorage (= 7.2.3)
-      activesupport (= 7.2.3)
+    actionmailbox (8.1.1)
+      actionpack (= 8.1.1)
+      activejob (= 8.1.1)
+      activerecord (= 8.1.1)
+      activestorage (= 8.1.1)
+      activesupport (= 8.1.1)
       mail (>= 2.8.0)
-    actionmailer (7.2.3)
-      actionpack (= 7.2.3)
-      actionview (= 7.2.3)
-      activejob (= 7.2.3)
-      activesupport (= 7.2.3)
+    actionmailer (8.1.1)
+      actionpack (= 8.1.1)
+      actionview (= 8.1.1)
+      activejob (= 8.1.1)
+      activesupport (= 8.1.1)
       mail (>= 2.8.0)
       rails-dom-testing (~> 2.2)
-    actionpack (7.2.3)
-      actionview (= 7.2.3)
-      activesupport (= 7.2.3)
-      cgi
+    actionpack (8.1.1)
+      actionview (= 8.1.1)
+      activesupport (= 8.1.1)
       nokogiri (>= 1.8.5)
-      racc
-      rack (>= 2.2.4, < 3.3)
+      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)
-    actiontext (7.2.3)
-      actionpack (= 7.2.3)
-      activerecord (= 7.2.3)
-      activestorage (= 7.2.3)
-      activesupport (= 7.2.3)
+    actiontext (8.1.1)
+      action_text-trix (~> 2.1.15)
+      actionpack (= 8.1.1)
+      activerecord (= 8.1.1)
+      activestorage (= 8.1.1)
+      activesupport (= 8.1.1)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.2.3)
-      activesupport (= 7.2.3)
+    actionview (8.1.1)
+      activesupport (= 8.1.1)
       builder (~> 3.1)
-      cgi
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    activejob (7.2.3)
-      activesupport (= 7.2.3)
+    activejob (8.1.1)
+      activesupport (= 8.1.1)
       globalid (>= 0.3.6)
-    activemodel (7.2.3)
-      activesupport (= 7.2.3)
-    activerecord (7.2.3)
-      activemodel (= 7.2.3)
-      activesupport (= 7.2.3)
+    activemodel (8.1.1)
+      activesupport (= 8.1.1)
+    activerecord (8.1.1)
+      activemodel (= 8.1.1)
+      activesupport (= 8.1.1)
       timeout (>= 0.4.0)
-    activestorage (7.2.3)
-      actionpack (= 7.2.3)
-      activejob (= 7.2.3)
-      activerecord (= 7.2.3)
-      activesupport (= 7.2.3)
+    activestorage (8.1.1)
+      actionpack (= 8.1.1)
+      activejob (= 8.1.1)
+      activerecord (= 8.1.1)
+      activesupport (= 8.1.1)
       marcel (~> 1.0)
-    activesupport (7.2.3)
+    activesupport (8.1.1)
       base64
-      benchmark (>= 0.3)
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
       drb
       i18n (>= 1.6, < 2)
+      json
       logger (>= 1.4.2)
       minitest (>= 5.1)
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
     addressable (2.8.8)
       public_suffix (>= 2.0.2, < 8.0)
     airbrussh (1.5.3)
@@ -111,11 +112,10 @@ GEM
     base64 (0.3.0)
     bcrypt (3.1.20)
     bcrypt_pbkdf (1.1.1)
-    benchmark (0.5.0)
     benchmark-ips (2.14.0)
-    better_html (2.1.1)
-      actionview (>= 6.0)
-      activesupport (>= 6.0)
+    better_html (2.2.0)
+      actionview (>= 7.0)
+      activesupport (>= 7.0)
       ast (~> 2.0)
       erubi (~> 1.4)
       parser (>= 2.4)
@@ -134,7 +134,7 @@ GEM
       blacklight (>= 7.18, < 9)
       deprecation
       rails (>= 7.1, < 9)
-    blacklight-marc (8.1.4)
+    blacklight-marc (8.2.0)
       blacklight (>= 7.11, < 9)
       library_stdnums
       marc (>= 0.4.3, < 2.0)
@@ -175,7 +175,6 @@ GEM
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
-    cgi (0.5.1)
     chronic (0.10.2)
     citeproc (1.1.0)
       date
@@ -218,10 +217,10 @@ GEM
       sprockets (> 3.0)
       sprockets-rails
       tilt
-    datadog (2.17.0)
+    datadog (2.21.0)
       datadog-ruby_core_source (~> 3.4, >= 3.4.1)
       libdatadog (~> 18.1.0.1.0)
-      libddwaf (~> 1.22.0.0.2)
+      libddwaf (~> 1.24.1.2.1)
       logger
       msgpack
     datadog-ruby_core_source (3.4.1)
@@ -361,7 +360,7 @@ GEM
       actionview (>= 7.0.0)
       activesupport (>= 7.0.0)
     jquery-datatables (1.10.20)
-    jquery-rails (4.6.0)
+    jquery-rails (4.6.1)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
@@ -389,13 +388,11 @@ GEM
     libdatadog (18.1.0.1.0)
     libdatadog (18.1.0.1.0-aarch64-linux)
     libdatadog (18.1.0.1.0-x86_64-linux)
-    libddwaf (1.22.0.0.2)
+    libddwaf (1.24.1.2.1)
       ffi (~> 1.0)
-    libddwaf (1.22.0.0.2-aarch64-linux)
+    libddwaf (1.24.1.2.1-aarch64-linux)
       ffi (~> 1.0)
-    libddwaf (1.22.0.0.2-x86_64-linux)
-      ffi (~> 1.0)
-    libddwaf (1.22.0.0.2-x86_64-linux-musl)
+    libddwaf (1.24.1.2.1-x86_64-linux)
       ffi (~> 1.0)
     library_stdnums (1.6.0)
     lint_roller (1.1.0)
@@ -472,7 +469,7 @@ GEM
       addressable (~> 2.8)
       nokogiri (~> 1.12)
       omniauth (~> 2.1)
-    omniauth-rails_csrf_protection (1.0.2)
+    omniauth-rails_csrf_protection (2.0.1)
       actionpack (>= 4.2)
       omniauth (~> 2.0)
     open-uri (0.5.0)
@@ -519,20 +516,20 @@ GEM
       rack (>= 1.3)
     rackup (2.3.1)
       rack (>= 3)
-    rails (7.2.3)
-      actioncable (= 7.2.3)
-      actionmailbox (= 7.2.3)
-      actionmailer (= 7.2.3)
-      actionpack (= 7.2.3)
-      actiontext (= 7.2.3)
-      actionview (= 7.2.3)
-      activejob (= 7.2.3)
-      activemodel (= 7.2.3)
-      activerecord (= 7.2.3)
-      activestorage (= 7.2.3)
-      activesupport (= 7.2.3)
+    rails (8.1.1)
+      actioncable (= 8.1.1)
+      actionmailbox (= 8.1.1)
+      actionmailer (= 8.1.1)
+      actionpack (= 8.1.1)
+      actiontext (= 8.1.1)
+      actionview (= 8.1.1)
+      activejob (= 8.1.1)
+      activemodel (= 8.1.1)
+      activerecord (= 8.1.1)
+      activestorage (= 8.1.1)
+      activesupport (= 8.1.1)
       bundler (>= 1.15.0)
-      railties (= 7.2.3)
+      railties (= 8.1.1)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
@@ -544,10 +541,9 @@ 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)
-    railties (7.2.3)
-      actionpack (= 7.2.3)
-      activesupport (= 7.2.3)
-      cgi
+    railties (8.1.1)
+      actionpack (= 8.1.1)
+      activesupport (= 8.1.1)
       irb (~> 1.13)
       rackup (>= 1.0.0)
       rake (>= 12.2)
@@ -576,9 +572,9 @@ GEM
       io-console (~> 0.5)
     request_store (1.7.0)
       rack (>= 1.4)
-    responders (3.1.1)
-      actionpack (>= 5.2)
-      railties (>= 5.2)
+    responders (3.2.0)
+      actionpack (>= 7.0)
+      railties (>= 7.0)
     rexml (3.4.4)
     rsolr (2.6.0)
       builder (>= 2.1.2)
@@ -620,7 +616,7 @@ GEM
       lint_roller (~> 1.1)
       rubocop (>= 1.75.0, < 2.0)
       rubocop-ast (>= 1.47.1, < 2.0)
-    rubocop-rails (2.32.0)
+    rubocop-rails (2.34.2)
       activesupport (>= 4.2.0)
       lint_roller (~> 1.1)
       rack (>= 1.1)
@@ -850,7 +846,7 @@ DEPENDENCIES
   puma (~> 6.4)
   rack-attack
   rack-mini-profiler
-  rails (~> 7.2.2)
+  rails (~> 8.1.1)
   rails-controller-testing
   rake
   redis

app/controllers/contact_controller.rb

@@ -7,7 +7,7 @@ def question
 
       render "question_success"
     else
-      render partial: "catalog/ask_a_question_form", locals: { form: @form }, status: :unprocessable_entity
+      render partial: "catalog/ask_a_question_form", locals: { form: @form }, status: :unprocessable_content
     end
   end
 
@@ -18,7 +18,7 @@ def suggestion
 
       render "suggestion_success"
     else
-      render partial: "catalog/suggest_correction_form", locals: { form: @form }, status: :unprocessable_entity
+      render partial: "catalog/suggest_correction_form", locals: { form: @form }, status: :unprocessable_content
     end
   end
 
@@ -29,7 +29,7 @@ def report_biased_results
 
       render "report_biased_results_success"
     else
-      render partial: "catalog/report_biased_results_form", locals: { form: @form }, status: :unprocessable_entity
+      render partial: "catalog/report_biased_results_form", locals: { form: @form }, status: :unprocessable_content
     end
   end
 

app/controllers/feedback_controller.rb

@@ -40,7 +40,7 @@ def build_feedback_form
     end
 
     def feedback_form_params
-      params.require(:feedback_form).permit(:name, :email, :message, :current_url, :feedback_desc)
+      params.expect(feedback_form: %i[name email message current_url feedback_desc])
     end
 
     def build_ask_a_question_form
@@ -51,7 +51,7 @@ def build_ask_a_question_form
     end
 
     def question_form_params
-      params.require(:ask_a_question_form).permit(:id, :title)
+      params.expect(ask_a_question_form: %i[id title])
     end
 
     def build_suggest_correction_form
@@ -62,7 +62,7 @@ def build_suggest_correction_form
     end
 
     def suggest_correction_form_params
-      params.require(:suggest_correction_form).permit(:id, :title)
+      params.expect(suggest_correction_form: %i[id title])
     end
 
     def build_report_biased_results_form
@@ -72,7 +72,7 @@ def build_report_biased_results_form
     end
 
     def biased_results_params
-      params.require(:report_biased_results_form).permit(:context)
+      params.expect(report_biased_results_form: [:context])
     end
 
     def search_results_url(biased_params)

app/controllers/orangelight/browsables_controller.rb

@@ -79,7 +79,7 @@ def populate_search_results
       return if query_param.nil?
       # 'subject_facet' is the default vocabulary type if there is no vocabulary type specified
       search_result = if vocabulary_search_on_facet == 'subject_facet'
-                        model_param.where('sort <= ?', search_term).order('sort').last
+                        model_param.where('sort <= ?', search_term).order(:sort).last
                       else
                         model_param.where(sort: search_term).where(vocabulary: vocabulary_search_on_facet).first
                       end
@@ -253,6 +253,6 @@ def set_orangelight_browsable
 
     # Never trust parameters from the scary internet; run the params we receive through an allowlist
     def orangelight_browsable_params
-      params.require(:orangelight_browsable).permit(:model, :id)
+      params.expect(orangelight_browsable: %i[model id])
     end
 end

app/models/solr_document.rb

@@ -180,7 +180,7 @@ def solr_document_id
   end
 
   def host_id
-    self["contained_in_s"].reject(&:empty?) if self["contained_in_s"].present?
+    self["contained_in_s"].presence&.reject(&:empty?)
   end
 
   def bound_with?
@@ -225,7 +225,7 @@ def holdings_all_display
 
     holdings.each do |k, _val|
       # append the solr document id in each holding
-      holdings[k].merge!("mms_id" => solr_document_id) if holdings[k].present?
+      holdings[k].presence&.merge!("mms_id" => solr_document_id)
     end
     return holdings if host_id.blank?
     # Append the host_id in the host_holdings