Update the tests matrix (#849)

* Update gitignore

* This is the commit message #3:

Do not run rails >= 7 on ruby < 3

* Remove jruby and truffleruby

* Fix rubocop

* Use rspec instead of rake

.github/workflows/test.yml

@@ -14,41 +14,38 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ['2.6', '2.7', '3.0', 'jruby', 'truffleruby']
-        gemfile: ['gemfiles/activerecord_5.0.2.gemfile', 'gemfiles/activerecord_5.1.0.gemfile', 'gemfiles/activerecord_5.2.2.gemfile', 'gemfiles/activerecord_6.0.0.gemfile', 'gemfiles/activerecord_6.1.0.gemfile', 'gemfiles/activerecord_main.gemfile']
+        ruby: ['2.7', '3.0', '3.1', '3.2', '3.3']
+        gemfile: ['gemfiles/activerecord_5.2.2.gemfile', 'gemfiles/activerecord_6.0.0.gemfile', 'gemfiles/activerecord_6.1.0.gemfile', 'gemfiles/activerecord_7.0.0.gemfile', 'gemfiles/activerecord_7.1.0.gemfile', 'gemfiles/activerecord_main.gemfile']
         include:
+          - gemfile: 'gemfiles/activerecord_7.1.0.gemfile'
+            ruby: '3.3'
+          - gemfile: 'gemfiles/activerecord_7.1.0.gemfile'
+            ruby: '3.0'
           - gemfile: 'gemfiles/activerecord_7.0.0.gemfile'
-            ruby: '3.1'
+            ruby: '3.3'
           - gemfile: 'gemfiles/activerecord_7.0.0.gemfile'
             ruby: '3.0'
           - gemfile: 'gemfiles/activerecord_6.1.0.gemfile'
-            ruby: '3.1'
+            ruby: '3.3'
           - gemfile: 'gemfiles/activerecord_6.1.0.gemfile'
             ruby: '3.0'
         exclude:
           - gemfile: 'gemfiles/activerecord_5.2.2.gemfile'
-            ruby: '3.0' # rails 5.2 can't run on ruby 3.0
-          - gemfile: 'gemfiles/activerecord_5.1.0.gemfile'
-            ruby: '3.0' # rails 5.1 can't run on ruby 3.0
-          - gemfile: 'gemfiles/activerecord_5.0.2.gemfile'
-            ruby: '3.0' # rails 5.0 can't run on ruby 3.0
-          - gemfile: 'gemfiles/activerecord_5.0.2.gemfile'
-            ruby: '3.0' # rails 5.0 can't run on ruby 3.0
-          - gemfile: 'gemfiles/activerecord_5.0.2.gemfile'
-            ruby: 'truffleruby' # TruffleRuby 21.0 targets Ruby 2.7, same as above
-          - gemfile: 'gemfiles/activerecord_5.1.0.gemfile'
-            ruby: 'truffleruby' # TruffleRuby 21.0 targets Ruby 2.7, same as above
+            ruby: '3.0'
+          - gemfile: 'gemfiles/activerecord_5.2.2.gemfile'
+            ruby: '3.1'
           - gemfile: 'gemfiles/activerecord_5.2.2.gemfile'
-            ruby: 'truffleruby' # TruffleRuby 21.0 targets Ruby 2.7, same as above
+            ruby: '3.2'
+          - gemfile: 'gemfiles/activerecord_5.2.2.gemfile'
+            ruby: '3.3'
+          - gemfile: 'gemfiles/activerecord_7.0.0.gemfile'
+            ruby: '2.7'
+          - gemfile: 'gemfiles/activerecord_7.1.0.gemfile'
+            ruby: '2.7'
           - gemfile: 'gemfiles/activerecord_main.gemfile'
-            ruby: '2.6' # rails 7+ requires ruby 3.0+
-          - gemfile: 'gemfiles/activerecord_5.0.2.gemfile'
-            ruby: 'jruby' # this *should* work - there's a test failure; it's not incompatible like the other excludes. could be an issue in Rails 5.0.2?
-          - gemfile: 'gemfiles/activerecord_6.1.0.gemfile'
-            ruby: 'jruby' # this *should* work. it seems like there's an issue with rails 6 on jruby.
+            ruby: '2.7'
           - gemfile: 'gemfiles/activerecord_main.gemfile'
-            ruby: 'jruby' # this *should* work. it seems like there's an issue with rails 6 on jruby.
-
+            ruby: '3.0'
     env:
       BUNDLE_GEMFILE: ${{ matrix.gemfile }}
 
@@ -84,10 +81,10 @@ jobs:
           bundler-cache: true
 
       - name: Run tests on sqlite
-        run: DB=sqlite bundle exec rake
+        run: DB=sqlite bundle exec rspec
 
       - name: Run tests on postgres
-        run: DB=postgres bundle exec rake
+        run: DB=postgres bundle exec rspec
 
   lint:
     name: Lint

.rubocop.yml

@@ -50,3 +50,4 @@ AllCops:
     - 'gemfiles/**/*'
     - 'vendor/**/*'
     - 'Appraisals'
+    - 'node_modules/**/*'

.rubocop_todo.yml

@@ -214,3 +214,6 @@ Style/StringChars:
 Style/StringConcatenation:
   Exclude:
     - 'lib/cancan/rule.rb'
+
+Lint/SafeNavigationChain:
+  Enabled: false

Appraisals

@@ -1,37 +1,3 @@
-appraise 'activerecord_5.0.2' do
-  gem 'activerecord', '~> 5.0.2', require: 'active_record'
-  gem 'activesupport', '~> 5.0.2', require: 'active_support/all'
-  gem 'actionpack', '~> 5.0.2', require: 'action_pack'
-
-  gemfile.platforms :jruby do
-    gem 'activerecord-jdbcsqlite3-adapter'
-    gem 'jdbc-sqlite3'
-    gem 'jdbc-postgres'
-  end
-
-  gemfile.platforms :ruby, :mswin, :mingw do
-    gem 'pg', '~> 1.3.4'
-    gem 'sqlite3', '~> 1.3.0'
-  end
-end
-
-appraise 'activerecord_5.1.0' do
-  gem 'activerecord', '~> 5.1.0', require: 'active_record'
-  gem 'activesupport', '~> 5.1.0', require: 'active_support/all'
-  gem 'actionpack', '~> 5.1.0', require: 'action_pack'
-
-  gemfile.platforms :jruby do
-    gem 'activerecord-jdbcsqlite3-adapter'
-    gem 'jdbc-sqlite3'
-    gem 'jdbc-postgres'
-  end
-
-  gemfile.platforms :ruby, :mswin, :mingw do
-    gem 'pg', '~> 1.3.4'
-    gem 'sqlite3', '~> 1.4.2'
-  end
-end
-
 appraise 'activerecord_5.2.2' do
   gem 'activerecord', '~> 5.2.2', require: 'active_record'
   gem 'activesupport', '~> 5.2.2', require: 'active_support/all'
@@ -45,7 +11,7 @@ appraise 'activerecord_5.2.2' do
 
   gemfile.platforms :ruby, :mswin, :mingw do
     gem 'pg', '~> 1.3.4'
-    gem 'sqlite3', '~> 1.4.2'
+    gem 'sqlite3', '~> 1.7.3'
   end
 end
 
@@ -62,7 +28,7 @@ appraise 'activerecord_6.0.0' do
 
   platforms :ruby, :mswin, :mingw do
     gem 'pg', '~> 1.3.4'
-    gem 'sqlite3', '~> 1.4.2'
+    gem 'sqlite3', '~> 1.7.3'
   end
 end
 
@@ -79,7 +45,7 @@ appraise 'activerecord_6.1.0' do
 
   platforms :ruby, :mswin, :mingw do
     gem 'pg', '~> 1.3.4'
-    gem 'sqlite3', '~> 1.4.2'
+    gem 'sqlite3', '~> 1.7.3'
   end
 end
 
@@ -96,7 +62,24 @@ appraise 'activerecord_7.0.0' do
 
   platforms :ruby, :mswin, :mingw do
     gem 'pg', '~> 1.3.4'
-    gem 'sqlite3', '~> 1.4.2'
+    gem 'sqlite3', '~> 1.7.3'
+  end
+end
+
+appraise 'activerecord_7.1.0' do
+  gem 'actionpack', '~> 7.1.0', require: 'action_pack'
+  gem 'activerecord', '~> 7.1.0', require: 'active_record'
+  gem 'activesupport', '~> 7.1.0', require: 'active_support/all'
+
+  platforms :jruby do
+    gem 'activerecord-jdbcsqlite3-adapter'
+    gem 'jdbc-sqlite3'
+    gem 'jdbc-postgres'
+  end
+
+  platforms :ruby, :mswin, :mingw do
+    gem 'pg', '~> 1.5.6'
+    gem 'sqlite3', '~> 1.7.3'
   end
 end
 
@@ -114,7 +97,7 @@ appraise 'activerecord_main' do
   end
 
   platforms :ruby, :mswin, :mingw do
-    gem 'pg', '~> 1.3.4'
-    gem 'sqlite3', '~> 1.4.2'
+    gem 'pg', '~> 1.5.6'
+    gem 'sqlite3', '~> 1.7.3'
   end
 end

gemfiles/activerecord_5.2.2.gemfile

@@ -14,7 +14,7 @@ end
 
 platforms :ruby, :mswin, :mingw do
   gem "pg", "~> 1.3.4"
-  gem "sqlite3", "~> 1.4.2"
+  gem "sqlite3", "~> 1.7.3"
 end
 
 gemspec path: "../"

gemfiles/activerecord_6.0.0.gemfile

@@ -14,7 +14,7 @@ end
 
 platforms :ruby, :mswin, :mingw do
   gem "pg", "~> 1.3.4"
-  gem "sqlite3", "~> 1.4.2"
+  gem "sqlite3", "~> 1.7.3"
 end
 
 gemspec path: "../"

gemfiles/activerecord_6.1.0.gemfile

@@ -14,7 +14,7 @@ end
 
 platforms :ruby, :mswin, :mingw do
   gem "pg", "~> 1.3.4"
-  gem "sqlite3", "~> 1.4.2"
+  gem "sqlite3", "~> 1.7.3"
 end
 
 gemspec path: "../"

gemfiles/activerecord_7.0.0.gemfile

@@ -14,7 +14,7 @@ end
 
 platforms :ruby, :mswin, :mingw do
   gem "pg", "~> 1.3.4"
-  gem "sqlite3", "~> 1.4.2"
+  gem "sqlite3", "~> 1.7.3"
 end
 
 gemspec path: "../"

gemfiles/activerecord_5.0.2.gemfile → gemfiles/activerecord_7.1.0.gemfile

@@ -2,9 +2,9 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 5.0.2", require: "active_record"
-gem "activesupport", "~> 5.0.2", require: "active_support/all"
-gem "actionpack", "~> 5.0.2", require: "action_pack"
+gem "actionpack", "~> 7.1.0", require: "action_pack"
+gem "activerecord", "~> 7.1.0", require: "active_record"
+gem "activesupport", "~> 7.1.0", require: "active_support/all"
 
 platforms :jruby do
   gem "activerecord-jdbcsqlite3-adapter"
@@ -13,8 +13,8 @@ platforms :jruby do
 end
 
 platforms :ruby, :mswin, :mingw do
-  gem "pg", "~> 1.3.4"
-  gem "sqlite3", "~> 1.3.0"
+  gem "pg", "~> 1.5.6"
+  gem "sqlite3", "~> 1.7.3"
 end
 
 gemspec path: "../"

gemfiles/activerecord_main.gemfile

@@ -15,8 +15,8 @@ platforms :jruby do
 end
 
 platforms :ruby, :mswin, :mingw do
-  gem "pg", "~> 1.3.4"
-  gem "sqlite3", "~> 1.4.2"
+  gem "pg", "~> 1.5.6"
+  gem "sqlite3", "~> 1.7.3"
 end
 
 gemspec path: "../"

lib/cancan/model_adapters/active_record_adapter.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+# rubocop:disable Metrics/AbcSize
+# rubocop:disable Metrics/CyclomaticComplexity
+# rubocop:disable Metrics/PerceivedComplexity
 module CanCan
   module ModelAdapters
     class ActiveRecordAdapter < AbstractAdapter
@@ -52,7 +55,7 @@ def parent_child_conditions(parent, child, all_conditions)
           # Search again in case of polymorphic associations, this time matching on the :has_many side
           # via the :as option, as well as klass
           foreign_key ||= parent_class.reflect_on_all_associations(:has_many).find do |has_many_assoc|
-            !matching_parent_child_polymorphic_association(has_many_assoc, child_class).nil?
+            matching_parent_child_polymorphic_association(has_many_assoc, child_class)
           end&.foreign_key&.to_sym
 
           foreign_key.nil? ? nil : all_conditions[foreign_key]
@@ -61,7 +64,7 @@ def parent_child_conditions(parent, child, all_conditions)
         def matching_parent_child_polymorphic_association(parent_assoc, child_class)
           return nil unless parent_assoc.klass == child_class
           return nil if parent_assoc&.options[:as].nil?
-  
+
           child_class.reflect_on_all_associations(:belongs_to).find do |child_assoc|
             # Only match this way for polymorphic associations
             child_assoc.polymorphic? && child_assoc.name == parent_assoc.options[:as]
@@ -72,12 +75,12 @@ def child_association_to_parent(parent, child)
           child_class = child.is_a?(Class) ? child : child.class
           parent_class = parent.is_a?(Class) ? parent : parent.class
 
-          association = child_class.reflect_on_all_associations(:belongs_to).find do |association|
+          association = child_class.reflect_on_all_associations(:belongs_to).find do |belongs_to_assoc|
             # Do not match on polymorphic associations or it will throw an error (klass cannot be determined)
-            !association.polymorphic? && association.klass == parent.class
+            !belongs_to_assoc.polymorphic? && belongs_to_assoc.klass == parent.class
           end
 
-          return association unless association.nil?
+          return association if association
 
           parent_class.reflect_on_all_associations(:has_many).each do |has_many_assoc|
             association ||= matching_parent_child_polymorphic_association(has_many_assoc, child_class)
@@ -217,6 +220,9 @@ def sanitize_sql(conditions)
     end
   end
 end
+# rubocop:enable Metrics/PerceivedComplexity
+# rubocop:enable Metrics/CyclomaticComplexity
+# rubocop:enable Metrics/AbcSize
 
 ActiveSupport.on_load(:active_record) do
   send :include, CanCan::ModelAdditions