Support Rails 8.0 (#62)

Author: olivier-thatch

.circleci/config.yml

@@ -2,14 +2,14 @@ version: 2.1
 jobs:
   lint:
     docker:
-      - image: cimg/ruby:3.1.5
+      - image: cimg/ruby:3.1.6
     working_directory: ~/safer_rails_console
     steps:
       - checkout
       - restore_cache:
           keys:
-            - v2-gems-ruby-3.1.5-{{ checksum "safer_rails_console.gemspec" }}-{{ checksum "Gemfile" }}
-            - v2-gems-ruby-3.1.5-
+            - v2-gems-ruby-3.1.6-{{ checksum "safer_rails_console.gemspec" }}-{{ checksum "Gemfile" }}
+            - v2-gems-ruby-3.1.6-
       - run:
           name: Install Gems
           command: |
@@ -18,7 +18,7 @@ jobs:
               bundle clean
             fi
       - save_cache:
-          key: v2-gems-ruby-3.1.5-{{ checksum "safer_rails_console.gemspec" }}-{{ checksum "Gemfile" }}
+          key: v2-gems-ruby-3.1.6-{{ checksum "safer_rails_console.gemspec" }}-{{ checksum "Gemfile" }}
           paths:
             - "vendor/bundle"
             - "gemfiles/vendor/bundle"
@@ -82,11 +82,15 @@ workflows:
           matrix:
             parameters:
               ruby_version:
-                - 3.1.4
-                - 3.2.2
-                - 3.3.0
+                - 3.1.6
+                - 3.2.6
+                - 3.3.6
               gemfile:
                 - gemfiles/6.1.gemfile
                 - gemfiles/7.0.gemfile
                 - gemfiles/7.1.gemfile
                 - gemfiles/7.2.gemfile
+                - gemfiles/8.0.gemfile
+            exclude:
+              - ruby_version: 3.1.6
+                gemfile: gemfiles/8.0.gemfile

Appraisals

@@ -15,3 +15,7 @@ end
 appraise '7.2' do
   gem 'rails', '~> 7.2.0'
 end
+
+appraise '8.0' do
+  gem 'rails', '~> 8.0.0'
+end

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## v0.11.0
+- Add support for Rails 8.0. **Thanks [@olivier-thatch](https://github.com/olivier-thatch)**
+
 ## v0.10.0
 - Drop support for Ruby 3.0.
 - Add support for Rails 7.2. **Thanks [@kwent](https://github.com/kwent)**

gemfiles/8.0.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 8.0.0"
+
+gemspec path: "../"

lib/safer_rails_console/patches/sandbox/auto_rollback.rb

@@ -24,7 +24,19 @@ def self.handle_and_reraise_exception(error, message = 'PG::ReadOnlySqlTransacti
           raise error
         end
 
-        module PostgreSQLAdapterPatch
+        # Patch for the PostgreSQL database adapter for Rails 8.0 and above.
+        module PostgreSQLAdapteRailsPatch
+          def internal_execute(...)
+            super
+          rescue StandardError => e
+            # rubocop:disable Layout/LineLength
+            SaferRailsConsole::Patches::Sandbox::AutoRollback.handle_and_reraise_exception(e, 'PG::ReadOnlySqlTransaction')
+            # rubocop:enable Layout/LineLength
+          end
+        end
+
+        # Patch for the PostgreSQL database adapter for Rails 6.x and 7.x.
+        module LegacyPostgreSQLAdapteRailsPatch
           def execute_and_clear(...)
             super
           rescue StandardError => e
@@ -35,10 +47,24 @@ def execute_and_clear(...)
         end
 
         if defined?(::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter)
-          ::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.prepend(PostgreSQLAdapterPatch)
+          if SaferRailsConsole::RailsVersion.eight_or_above?
+            ::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.prepend(PostgreSQLAdapteRailsPatch)
+          elsif SaferRailsConsole::RailsVersion.six_or_above?
+            ::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.prepend(LegacyPostgreSQLAdapteRailsPatch)
+          end
+        end
+
+        # Patch for the MySQL database adapter for Rails 8.0 and above.
+        module MySQLAdapterRailsPatch
+          def internal_execute(...)
+            super
+          rescue StandardError => e
+            SaferRailsConsole::Patches::Sandbox::AutoRollback.handle_and_reraise_exception(e, 'READ ONLY transaction')
+          end
         end
 
-        module MySQLPatch
+        # Patch for the MySQL database adapter for Rails 6.x and 7.x.
+        module LegacyMySQLAdapterRails67Patch
           def execute_and_free(...)
             super
           rescue StandardError => e
@@ -47,7 +73,11 @@ def execute_and_free(...)
         end
 
         if defined?(::ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter)
-          ::ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter.prepend(MySQLPatch)
+          if SaferRailsConsole::RailsVersion.eight_or_above?
+            ::ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter.prepend(MySQLAdapterRailsPatch)
+          elsif SaferRailsConsole::RailsVersion.six_or_above?
+            ::ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter.prepend(LegacyMySQLAdapterRails67Patch)
+          end
         end
       end
     end

lib/safer_rails_console/rails_version.rb

@@ -16,6 +16,12 @@ def six_or_above?
 
         @six_or_above = SaferRailsConsole::RailsVersion::RAILS_VERSION >= ::Gem::Version.new('6.0.0')
       end
+
+      def eight_or_above?
+        return @eight_or_above if defined?(@eight_or_above)
+
+        @eight_or_above = SaferRailsConsole::RailsVersion::RAILS_VERSION >= ::Gem::Version.new('8.0.0')
+      end
     end
   end
 end

lib/safer_rails_console/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SaferRailsConsole
-  VERSION = '0.10.0'
+  VERSION = '0.11.0'
 end

safer_rails_console.gemspec

@@ -47,5 +47,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec_junit_formatter'
   spec.add_development_dependency 'salsify_rubocop', '~> 1.27.0'
 
-  spec.add_runtime_dependency 'rails', '>= 6.1', '< 7.3'
+  spec.add_runtime_dependency 'rails', '>= 6.1', '< 8.1'
 end

spec/internal/rails_8_0/.dockerignore

@@ -0,0 +1,38 @@
+# See https://docs.docker.com/engine/reference/builder/#dockerignore-file for more about ignoring files.
+
+# Ignore git directory.
+/.git/
+/.gitignore
+
+# Ignore bundler config.
+/.bundle
+
+# Ignore all environment files.
+/.env*
+
+# Ignore all default key files.
+/config/master.key
+/config/credentials/*.key
+
+# Ignore all logfiles and tempfiles.
+/log/*
+/tmp/*
+
+# Ignore storage (uploaded files in development and any SQLite databases).
+/storage/*
+
+# Ignore assets.
+/node_modules/
+/app/assets/builds/*
+!/app/assets/builds/.keep
+/public/assets
+
+# Ignore CI service files.
+/.github
+
+# Ignore development files
+/.devcontainer
+
+# Ignore Docker-related files
+/.dockerignore
+/Dockerfile*

spec/internal/rails_8_0/.gitattributes

@@ -0,0 +1,9 @@
+# See https://git-scm.com/docs/gitattributes for more about git attribute files.
+
+# Mark the database schema as having been generated.
+db/schema.rb linguist-generated
+
+# Mark any vendored files as having been vendored.
+vendor/* linguist-vendored
+config/credentials/*.yml.enc diff=rails_credentials
+config/credentials.yml.enc diff=rails_credentials