safer_rails_console 0.9.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6caeae2629c2967125e660f9982a42cdcb8be7bfeda001ef4d749c48163327fe
-  data.tar.gz: 479df9dd872a07f3af1e743e787acc6689587ff686badcd8de9da40592b545d4
+  metadata.gz: dfda1cdba8b3b5ef2f7a7b4e8e5ca283a00782bdba859f6ceb5f6fc01a115600
+  data.tar.gz: e87adf560badb9cd83c0cb8196dfc5e28d4d10f6bfdbfb320b508653f17e2035
 SHA512:
-  metadata.gz: 689bfbb1b371f75543b4d724fc211c3da712f5c624df301446c83b327863ab9b24edfe50f824fbf4d287b645db334714c098c0643b62a5c8ae171992afc4da65
-  data.tar.gz: f24a500572bb7fec95dca9c875566da11eb77d3e4ba11070ff561eb8b6dedcbeff4254fef29f97a2f9d9637d1bf16b6e04f2558cda04213332a9d223afd52ee2
+  metadata.gz: 51e857275609c4b0597cec7ab9a08f88032b5479e77e94d5b57be9607de5d5d62cd62ab120ea7f3cedb0fdbec7ad751d4190a004b2f8f6bd28c0bee3daf95f14
+  data.tar.gz: 508b19ab2a19979b6c18a9177f224b8706730770a364e09eccd8a5270f52e20459bf8cf8c287d48b10d3c63ba7e6df8aca2598d01180b7623b1bc93361f85625

data/.circleci/config.yml

@@ -2,14 +2,14 @@ version: 2.1
 jobs:
   lint:
     docker:
-      - image: cimg/ruby:3.0.6
+      - image: cimg/ruby:3.1.6
     working_directory: ~/safer_rails_console
     steps:
       - checkout
       - restore_cache:
           keys:
-            - v2-gems-ruby-3.0.6-{{ checksum "safer_rails_console.gemspec" }}-{{ checksum "Gemfile" }}
-            - v2-gems-ruby-3.0.6-
+            - 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.0.6-{{ 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.0.6
-                - 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

data/.rubocop.yml

@@ -2,7 +2,7 @@ inherit_gem:
   salsify_rubocop: conf/rubocop_rails.yml
 
 AllCops:
-  TargetRubyVersion: 3.0
+  TargetRubyVersion: 3.1
   Exclude:
     - 'vendor/**/*'
     - 'gemfiles/**/*'

data/Appraisals

@@ -11,3 +11,11 @@ end
 appraise '7.1' do
   gem 'rails', '~> 7.1.2'
 end
+
+appraise '7.2' do
+  gem 'rails', '~> 7.2.0'
+end
+
+appraise '8.0' do
+  gem 'rails', '~> 8.0.0'
+end

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # 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)**
+
 ## v0.9.0
 - Add MySql support
 

data/gemfiles/7.2.gemfile

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

data/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: "../"

data/lib/safer_rails_console/patches/sandbox/auto_rollback.rb

@@ -24,7 +24,19 @@ module SaferRailsConsole
           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 @@ module SaferRailsConsole
         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 @@ module SaferRailsConsole
         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

data/lib/safer_rails_console/rails_version.rb

@@ -16,6 +16,12 @@ module SaferRailsConsole
 
         @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

data/lib/safer_rails_console/version.rb

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

data/safer_rails_console.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 3.0'
+  spec.required_ruby_version = '>= 3.1'
 
   spec.add_development_dependency 'appraisal', '~> 2.2'
   spec.add_development_dependency 'bundler', '~> 2.0'
@@ -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.2'
+  spec.add_runtime_dependency 'rails', '>= 6.1', '< 8.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: safer_rails_console
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Salsify, Inc
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-07-15 00:00:00.000000000 Z
+date: 2024-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal
@@ -173,7 +173,7 @@ dependencies:
         version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '8.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -183,7 +183,7 @@ dependencies:
         version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '8.1'
 description: This gem makes Rails console sessions less dangerous in specified environments
   by warning, color-coding, auto-sandboxing, and allowing read-only external connections
   (disables job queueing, non-GET requests, etc.)
@@ -210,6 +210,8 @@ files:
 - gemfiles/6.1.gemfile
 - gemfiles/7.0.gemfile
 - gemfiles/7.1.gemfile
+- gemfiles/7.2.gemfile
+- gemfiles/8.0.gemfile
 - lib/safer_rails_console.rb
 - lib/safer_rails_console/colors.rb
 - lib/safer_rails_console/console.rb
@@ -239,7 +241,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="