Merge pull request #2064 from dmitry-sinina/rails_8_1

Upgrade to Rails 8.1

Author: dmitry-sinina

Gemfile

@@ -10,7 +10,7 @@ gem 'pg'
 gem 'pg_advisory_lock', git: 'https://github.com/didww/pg_advisory_lock.git'
 gem 'pg_sql_caller', git: 'https://github.com/didww/pg_sql_caller.git'
 gem 'rack'
-gem 'rails', '~> 8.0.0'
+gem 'rails', '~> 8.1.0'
 gem 'responders'
 
 # Authentication
@@ -44,10 +44,9 @@ gem 'active_admin_sidebar', '~> 3.0'
 gem 'excelinator', github: 'senid231/excelinator', branch: 'ruby3-fix'
 
 # REST API
-# TODO: switch to the official gem from rubygems.org after the 0.9.13 release
-# https://github.com/cerebris/jsonapi-resources/issues/1456#issuecomment-2710742154
-# https://github.com/cerebris/jsonapi-resources/pull/1463
-gem 'jsonapi-resources', github: 'JSONAPI-Resources/jsonapi-resources', branch: 'release-0-9'
+# Fork of release-0-9 with Rails 8.1 support: upstream passes route options positionally,
+# which the 8.1 route mapper rejects, and still calls the removed ActiveSupport::Deprecation.warn.
+gem 'jsonapi-resources', github: 'yeti-switch/jsonapi-resources', branch: 'release-0-9-rails-8-1'
 
 # gem 'activeadmin_async_export'
 

Gemfile.lock

@@ -1,13 +1,3 @@
-GIT
-  remote: https://github.com/JSONAPI-Resources/jsonapi-resources.git
-  revision: 17772cefd8a90fc1b54744871de1050a6040a691
-  branch: release-0-9
-  specs:
-    jsonapi-resources (0.9.12)
-      activerecord (>= 4.1)
-      concurrent-ruby
-      railties (>= 4.1)
-
 GIT
   remote: https://github.com/activeadmin-plugins/active_admin_date_range_preset.git
   revision: dfcf8f65c2173b631169f371cc436c58a0c29287
@@ -91,48 +81,62 @@ GIT
     active_admin_theme (2.0.0)
       activeadmin (>= 3.0, < 4.0)
 
+GIT
+  remote: https://github.com/yeti-switch/jsonapi-resources.git
+  revision: 070cb888aa4ca21f7bdf881f4d567856e02168bb
+  branch: release-0-9-rails-8-1
+  specs:
+    jsonapi-resources (0.9.12)
+      activerecord (>= 4.1)
+      concurrent-ruby
+      csv
+      railties (>= 4.1)
+
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (8.0.5)
-      actionpack (= 8.0.5)
-      activesupport (= 8.0.5)
+    action_text-trix (2.1.19)
+      railties
+    actioncable (8.1.3)
+      actionpack (= 8.1.3)
+      activesupport (= 8.1.3)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (8.0.5)
-      actionpack (= 8.0.5)
-      activejob (= 8.0.5)
-      activerecord (= 8.0.5)
-      activestorage (= 8.0.5)
-      activesupport (= 8.0.5)
+    actionmailbox (8.1.3)
+      actionpack (= 8.1.3)
+      activejob (= 8.1.3)
+      activerecord (= 8.1.3)
+      activestorage (= 8.1.3)
+      activesupport (= 8.1.3)
       mail (>= 2.8.0)
-    actionmailer (8.0.5)
-      actionpack (= 8.0.5)
-      actionview (= 8.0.5)
-      activejob (= 8.0.5)
-      activesupport (= 8.0.5)
+    actionmailer (8.1.3)
+      actionpack (= 8.1.3)
+      actionview (= 8.1.3)
+      activejob (= 8.1.3)
+      activesupport (= 8.1.3)
       mail (>= 2.8.0)
       rails-dom-testing (~> 2.2)
-    actionpack (8.0.5)
-      actionview (= 8.0.5)
-      activesupport (= 8.0.5)
+    actionpack (8.1.3)
+      actionview (= 8.1.3)
+      activesupport (= 8.1.3)
       nokogiri (>= 1.8.5)
       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 (8.0.5)
-      actionpack (= 8.0.5)
-      activerecord (= 8.0.5)
-      activestorage (= 8.0.5)
-      activesupport (= 8.0.5)
+    actiontext (8.1.3)
+      action_text-trix (~> 2.1.15)
+      actionpack (= 8.1.3)
+      activerecord (= 8.1.3)
+      activestorage (= 8.1.3)
+      activesupport (= 8.1.3)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (8.0.5)
-      activesupport (= 8.0.5)
+    actionview (8.1.3)
+      activesupport (= 8.1.3)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
@@ -161,35 +165,35 @@ GEM
       kaminari (>= 1.2.1)
       railties (>= 6.1)
       ransack (>= 4.0)
-    activejob (8.0.5)
-      activesupport (= 8.0.5)
+    activejob (8.1.3)
+      activesupport (= 8.1.3)
       globalid (>= 0.3.6)
-    activemodel (8.0.5)
-      activesupport (= 8.0.5)
+    activemodel (8.1.3)
+      activesupport (= 8.1.3)
     activemodel-serializers-xml (1.0.3)
       activemodel (>= 5.0.0.a)
       activesupport (>= 5.0.0.a)
       builder (~> 3.1)
-    activerecord (8.0.5)
-      activemodel (= 8.0.5)
-      activesupport (= 8.0.5)
+    activerecord (8.1.3)
+      activemodel (= 8.1.3)
+      activesupport (= 8.1.3)
       timeout (>= 0.4.0)
     activerecord-import (2.2.0)
       activerecord (>= 4.2)
-    activestorage (8.0.5)
-      actionpack (= 8.0.5)
-      activejob (= 8.0.5)
-      activerecord (= 8.0.5)
-      activesupport (= 8.0.5)
+    activestorage (8.1.3)
+      actionpack (= 8.1.3)
+      activejob (= 8.1.3)
+      activerecord (= 8.1.3)
+      activesupport (= 8.1.3)
       marcel (~> 1.0)
-    activesupport (8.0.5)
+    activesupport (8.1.3)
       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)
@@ -818,20 +822,20 @@ GEM
       rack (>= 1.3)
     rackup (2.3.1)
       rack (>= 3)
-    rails (8.0.5)
-      actioncable (= 8.0.5)
-      actionmailbox (= 8.0.5)
-      actionmailer (= 8.0.5)
-      actionpack (= 8.0.5)
-      actiontext (= 8.0.5)
-      actionview (= 8.0.5)
-      activejob (= 8.0.5)
-      activemodel (= 8.0.5)
-      activerecord (= 8.0.5)
-      activestorage (= 8.0.5)
-      activesupport (= 8.0.5)
+    rails (8.1.3)
+      actioncable (= 8.1.3)
+      actionmailbox (= 8.1.3)
+      actionmailer (= 8.1.3)
+      actionpack (= 8.1.3)
+      actiontext (= 8.1.3)
+      actionview (= 8.1.3)
+      activejob (= 8.1.3)
+      activemodel (= 8.1.3)
+      activerecord (= 8.1.3)
+      activestorage (= 8.1.3)
+      activesupport (= 8.1.3)
       bundler (>= 1.15.0)
-      railties (= 8.0.5)
+      railties (= 8.1.3)
     rails-dom-testing (2.3.0)
       activesupport (>= 5.0.0)
       minitest
@@ -843,9 +847,9 @@ GEM
       rack
       railties (>= 5.1)
       semantic_logger (~> 4.16)
-    railties (8.0.5)
-      actionpack (= 8.0.5)
-      activesupport (= 8.0.5)
+    railties (8.1.3)
+      actionpack (= 8.1.3)
+      activesupport (= 8.1.3)
       irb (~> 1.13)
       rackup (>= 1.0.0)
       rake (>= 12.2)
@@ -1125,7 +1129,7 @@ DEPENDENCIES
   puma_worker_killer
   pundit
   rack
-  rails (~> 8.0.0)
+  rails (~> 8.1.0)
   rails-html-sanitizer (>= 1.6.1)
   rails_semantic_logger
   ransack

config/application.rb

@@ -30,16 +30,11 @@
 module Yeti
   class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.
-    config.load_defaults 7.2
+    config.load_defaults 8.1
 
     # changing defaults
     config.action_view.default_enforce_utf8 = true
 
-    # Rails 8.0 deprecates the :offset behavior of to_time; opt into the :zone behavior
-    # (the Rails 8.1 default). Our timezone logic uses TimeWithZone, not to_time offset
-    # semantics, so this is safe (verified by the invoice period specs).
-    config.active_support.to_time_preserves_timezone = :zone
-
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration can go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded after loading

config/routes.rb

@@ -3,19 +3,19 @@
 Rails.application.routes.draw do
   def dasherized_namespace(name, options = {}, &block)
     options[:path] = name.to_s.dasherize
-    namespace(name.to_s.underscore.to_sym, options, &block)
+    namespace(name.to_s.underscore.to_sym, **options, &block)
   end
 
   def dasherized_resources(name, options = {}, &block)
     options[:controller] ||= name.to_s.underscore.to_sym
     options[:as] ||= name.to_s.underscore.to_sym
-    resources(name.to_s.dasherize.to_sym, options, &block)
+    resources(name.to_s.dasherize.to_sym, **options, &block)
   end
 
   def dasherized_resource(name, options = {}, &block)
     options[:controller] ||= name.to_s.underscore.to_sym
     options[:as] ||= name.to_s.underscore.to_sym
-    resource(name.to_s.dasherize.to_sym, options, &block)
+    resource(name.to_s.dasherize.to_sym, **options, &block)
   end
 
   devise_for :admin_users, ActiveAdmin::Devise.config