Support Ruby 3.2 and 3.3, Rails 7.1 and 7.2 (#30)

.github/workflows/test.yml

@@ -10,9 +10,23 @@ jobs:
           - '3.0'
           - '3.1'
           - '3.2'
+          - '3.3'
         gemfile:
           - gemfiles/Gemfile.rails61
           - gemfiles/Gemfile.rails70
+          - gemfiles/Gemfile.rails71
+          - gemfiles/Gemfile.rails72
+        exclude:
+          # rails 7.2 requires ruby >= 3.1
+          # https://www.fastruby.io/blog/ruby/rails/versions/compatibility-table.html
+          - ruby-version: '3.0'
+            gemfile: 'gemfiles/Gemfile.rails72'
+          # rails 8.0 requires ruby >= 3.2
+          # https://www.fastruby.io/blog/ruby/rails/versions/compatibility-table.html
+          - ruby-version: '3.0'
+            gemfile: 'gemfiles/Gemfile.rails80'
+          - ruby-version: '3.1'
+            gemfile: 'gemfiles/Gemfile.rails80'
 
     name: Ruby ${{ matrix.ruby-version }} / Bundle ${{ matrix.gemfile }}
 

CHANGELOG.md

@@ -1,4 +1,7 @@
 ## [Unreleased]
+### Fixed
+* Support Ruby 3.2 and 3.3, Rails 7.1 and 7.2
+
 ### Added
 * Support Ruby 3.2. Drop support for Ruby 2.7, Rails 6.0
 

gemfiles/Gemfile.rails61

@@ -3,3 +3,7 @@ source 'https://rubygems.org'
 gemspec path: '..'
 
 gem 'rails', '~> 6.1.0'
+
+# Rails 6.1 does not support sqlite3 2.x; it specifies gem "sqlite3", "~> 1.4"
+# in lib/active_record/connection_adapters/sqlite3_adapter.rb
+gem 'sqlite3', '~> 1.7'

gemfiles/Gemfile.rails70

@@ -3,3 +3,7 @@ source 'https://rubygems.org'
 gemspec path: '..'
 
 gem 'rails', '~> 7.0.0'
+
+# Rails 7.0 does not support sqlite3 2.x; it specifies gem "sqlite3", "~> 1.4"
+# in lib/active_record/connection_adapters/sqlite3_adapter.rb
+gem 'sqlite3', '~> 1.7'

gemfiles/Gemfile.rails71

@@ -0,0 +1,8 @@
+source 'https://rubygems.org'
+
+gemspec path: '..'
+
+gem 'rails', '~> 7.1.0'
+
+# sqlite3 2.x is not supported on ruby 3.0
+gem 'sqlite3', '~> 1.7'

gemfiles/Gemfile.rails72

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gemspec path: '..'
+
+gem 'rails', '~> 7.2.0'

ndr_error.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 3.0'
 
-  s.add_dependency 'rails', '>= 6.1', '< 7.1'
+  s.add_dependency 'rails', '>= 6.1', '< 7.3'
 
   # Support rails 6.1 with Ruby 3.1
   s.add_dependency 'net-imap'
@@ -32,6 +32,10 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'pry'
   s.add_development_dependency 'puma'
+
+  # Rails 6.1 and 7.0 do not support sqlite3 2.x; they specify gem "sqlite3", "~> 1.4"
+  # in lib/active_record/connection_adapters/sqlite3_adapter.rb
+  # cf. gemfiles/Gemfile.rails70
   s.add_development_dependency 'sqlite3'
 
   s.add_development_dependency 'mocha'

test/dummy/config/application.rb

@@ -7,8 +7,12 @@
 module Dummy
   # Dummy application to host and test the engine
   class Application < Rails::Application
-    # Initialize configuration defaults for originally generated Rails version.
-    config.load_defaults 6.1
+    # Initialize configuration defaults for current Rails version.
+    config.load_defaults Rails.version.match(/[0-9]*[.][0-9]*/).to_s # e.g. 7.2
+
+    # Rails 6.1 default
+    # TODO: Some of our tests fail when this Rails 6.1 default is removed
+    config.active_support.executor_around_test_case = false
 
     # Configuration for the application, engines, and railties goes here.
     #

test/dummy/config/environments/test.rb

@@ -26,7 +26,7 @@
   config.cache_store = :null_store
 
   # Let middleware intercept errors:
-  config.action_dispatch.show_exceptions = true
+  config.action_dispatch.show_exceptions = :all
 
   # Disable request forgery protection in test environment.
   config.action_controller.allow_forgery_protection = false

test/unit/ndr_error/log_test.rb

@@ -237,7 +237,7 @@ def setup
 
     test 'should auto-calculate clock drift on create when configured' do
       test_checker = lambda do
-        stamp = ActiveRecord::Base.connection.execute('select CURRENT_TIMESTAMP')[0][0]
+        stamp = ActiveRecord::Base.connection.execute('select CURRENT_TIMESTAMP')[0]['CURRENT_TIMESTAMP']
         Time.zone.parse(stamp) + Time.zone.utc_offset
       end