Update master to 3.3.0

.github/workflows/test.yml

@@ -12,7 +12,8 @@ jobs:
           - "3.0"
           - "3.1"
           - "3.2"
-        gemfile: [gemfiles/rails_7.0.gemfile]
+          - "3.3"
+        gemfile: [gemfiles/rails_7.1.gemfile]
         orm: [active_record]
         adapter: [sqlite3]
         asset: [webpack]
@@ -32,17 +33,37 @@ jobs:
             orm: active_record
             adapter: sqlite3
             asset: webpacker
-          - ruby: "3.0"
+          - ruby: "3.2"
             gemfile: gemfiles/rails_7.0.gemfile
             orm: active_record
+            adapter: sqlite3
+            asset: sprockets
+          - ruby: "3.2"
+            gemfile: gemfiles/rails_7.1.gemfile
+            orm: active_record
             adapter: mysql2
             asset: importmap
-          - ruby: "3.0"
-            gemfile: gemfiles/rails_7.0.gemfile
+          - ruby: "3.2"
+            gemfile: gemfiles/rails_7.1.gemfile
             orm: active_record
             adapter: postgresql
             asset: sprockets
-          - ruby: "3.0"
+          - ruby: "3.2"
+            gemfile: gemfiles/rails_7.1.gemfile
+            orm: active_record
+            adapter: sqlite3
+            asset: vite
+          - ruby: "3.3"
+            gemfile: gemfiles/rails_7.2.gemfile
+            orm: active_record
+            adapter: sqlite3
+            asset: sprockets
+          - ruby: "3.3"
+            gemfile: gemfiles/rails_8.0.gemfile
+            orm: active_record
+            adapter: sqlite3
+            asset: sprockets
+          - ruby: "3.2"
             gemfile: gemfiles/composite_primary_keys.gemfile
             orm: active_record
             adapter: sqlite3
@@ -57,13 +78,23 @@ jobs:
             orm: mongoid
             adapter: sqlite3
             asset: sprockets
-          - ruby: jruby-9.3
-            gemfile: gemfiles/rails_6.1.gemfile
+          - ruby: "3.1"
+            gemfile: gemfiles/rails_7.0.gemfile
+            orm: mongoid
+            adapter: sqlite3
+            asset: sprockets
+          - ruby: "3.2"
+            gemfile: gemfiles/rails_7.1.gemfile
+            orm: mongoid
+            adapter: sqlite3
+            asset: sprockets
+          - ruby: jruby-9.4
+            gemfile: gemfiles/rails_7.0.gemfile
             orm: active_record
             adapter: mysql2
             asset: sprockets
-          - ruby: jruby-9.3
-            gemfile: gemfiles/rails_6.1.gemfile
+          - ruby: jruby-9.4
+            gemfile: gemfiles/rails_7.0.gemfile
             orm: mongoid
             adapter: sqlite3
             asset: sprockets
@@ -93,7 +124,7 @@ jobs:
       CI_ASSET: ${{ matrix.asset }}
       JRUBY_OPTS: --debug
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
@@ -104,15 +135,18 @@ jobs:
           MAKEFLAGS: make --jobs 4
           BUNDLE_WITHOUT: development
       - name: Set up Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: "14"
+          node-version: "18"
+      - name: Install ImageMagick
+        run: sudo apt-get install imagemagick
       - name: Setup application
         env:
           BUNDLE_GEMFILE: ../../${{ matrix.gemfile }}
           CI_ASSET: ${{ matrix.asset }}
           CI_DB_ADAPTER: ${{ matrix.adapter }}
           RAILS_ENV: test
+          NODE_OPTIONS: --openssl-legacy-provider
         run: |
           yarn install
           cd spec/dummy_app
@@ -127,7 +161,7 @@ jobs:
         run: bundle exec rspec
       - name: Coveralls Parallel
         if: ${{ github.repository_owner == 'railsadminteam' }}
-        uses: coverallsapp/github-action@master
+        uses: coverallsapp/github-action@v2
         continue-on-error: true
         with:
           github-token: ${{ secrets.github_token }}
@@ -141,7 +175,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Coveralls Finished
-        uses: coverallsapp/github-action@master
+        uses: coverallsapp/github-action@v2
         with:
           github-token: ${{ secrets.github_token }}
           parallel-finished: true
@@ -150,9 +184,9 @@ jobs:
     name: Prettier
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
       - name: Install dependencies
         run: yarn install
       - name: Run check
@@ -162,18 +196,13 @@ jobs:
     name: RuboCop
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.0"
-      - name: Cache gems
-        uses: actions/cache@v3
-        with:
-          path: vendor/bundle
-          key: ${{ runner.os }}-gems-${{ matrix.ruby }}-${{ hashFiles('Gemfile') }}
-          restore-keys: |
-            ${{ runner.os }}-gems-${{ matrix.ruby }}-
+          ruby-version: "3.2"
+          bundler-cache: true
+          cache-version: gems-${{ hashFiles('Gemfile') }}
       - name: Install dependencies
         run: bundle install --without development --jobs=3 --retry=3 --path=vendor/bundle
       - name: Run check

.rubocop.yml

@@ -9,6 +9,7 @@ AllCops:
     - "node_modules/**/*"
     - "spec/dummy_app/bin/**/*"
     - "spec/dummy_app/db/schema.rb"
+    - "spec/dummy_app/node_modules/**/*"
     - "spec/dummy_app/tmp/**/*"
     - "vendor/bundle/**/*"
   NewCops: disable
@@ -108,7 +109,7 @@ Metrics/BlockNesting:
 
 Metrics/ClassLength:
   CountComments: false
-  Max: 132 # TODO: Lower to 100
+  Max: 201 # TODO: Lower to 100
 
 Metrics/CyclomaticComplexity:
   Max: 15 # TODO: Lower to 6
@@ -201,6 +202,9 @@ Style/RaiseArgs:
 Style/RedundantArgument:
   Enabled: true
 
+Style/RedundantParentheses:
+  Enabled: false
+
 Style/RedundantSelfAssignmentBranch:
   Enabled: true
 

.rubocop_todo.yml

@@ -21,7 +21,7 @@ Lint/ReturnInVoidContext:
 # Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.
 # IgnoredMethods: refine
 Metrics/BlockLength:
-  Max: 1097
+  Max: 1135
 
 # Offense count: 1
 # Configuration parameters: Max, CountKeywordArgs.

Appraisals

@@ -2,21 +2,15 @@
 
 appraise 'rails-6.0' do
   gem 'rails', '~> 6.0.0'
-  gem 'sassc-rails', '~> 2.1'
-  gem 'devise', '~> 4.7'
+  gem 'psych', '~> 3.3'
+  gem 'turbo-rails', '< 2.0.8'
 
   group :test do
-    gem 'cancancan', '~> 3.0'
-    gem 'kt-paperclip'
+    gem 'cancancan', ['~> 3.0', '< 3.6']
     gem 'pundit', '~> 2.1.0'
-    gem 'rspec-rails', '>= 4.0.0.beta2'
-    gem 'shrine', '~> 3.0'
   end
 
   group :active_record do
-    gem 'pg', '>= 1.0.0', platforms: :ruby
-    gem 'paper_trail', '>= 12.0'
-
     platforms :jruby do
       gem 'activerecord-jdbcmysql-adapter', '~> 60.0'
       gem 'activerecord-jdbcpostgresql-adapter', '~> 60.0'
@@ -25,32 +19,20 @@ appraise 'rails-6.0' do
   end
 
   group :mongoid do
-    gem 'mongoid', '~> 7.0'
+    gem 'cancancan-mongoid'
+    gem 'carrierwave-mongoid', '>= 0.6.3', require: 'carrierwave/mongoid'
+    gem 'database_cleaner-mongoid', '>= 2.0', require: false
     gem 'kaminari-mongoid'
+    gem 'mongoid', '~> 7.0'
     gem 'mongoid-paperclip', '>= 0.0.8', require: 'mongoid_paperclip'
-    gem 'carrierwave-mongoid', '>= 0.6.3', require: 'carrierwave/mongoid'
-    gem 'cancancan-mongoid'
     gem 'shrine-mongoid', '~> 1.0'
   end
 end
 
 appraise 'rails-6.1' do
   gem 'rails', '~> 6.1.0'
-  gem 'sassc-rails', '~> 2.1'
-  gem 'devise', '~> 4.7'
-  gem 'turbo-rails', platform: :jruby, github: 'hotwired/turbo-rails'
-
-  group :test do
-    gem 'cancancan', '~> 3.2'
-    gem 'kt-paperclip'
-    gem 'rspec-rails', '>= 4.0.0.beta2'
-    gem 'shrine', '~> 3.0'
-  end
 
   group :active_record do
-    gem 'pg', '>= 1.0.0', platforms: :ruby
-    gem 'paper_trail', '>= 12.0'
-
     platforms :jruby do
       gem 'activerecord-jdbcmysql-adapter', '~> 61.0'
       gem 'activerecord-jdbcpostgresql-adapter', '~> 61.0'
@@ -59,48 +41,82 @@ appraise 'rails-6.1' do
   end
 
   group :mongoid do
-    gem 'mongoid', '~> 7.0'
+    gem 'cancancan-mongoid'
+    gem 'carrierwave-mongoid', '>= 0.6.3', require: 'carrierwave/mongoid'
+    gem 'database_cleaner-mongoid', '>= 2.0', require: false
     gem 'kaminari-mongoid'
+    gem 'mongoid', '~> 7.0'
     gem 'mongoid-paperclip', '>= 0.0.8', require: 'mongoid_paperclip'
-    gem 'carrierwave-mongoid', '>= 0.6.3', require: 'carrierwave/mongoid'
-    gem 'cancancan-mongoid'
     gem 'shrine-mongoid', '~> 1.0'
   end
 end
 
 appraise 'rails-7.0' do
   gem 'rails', '~> 7.0.0'
   gem 'importmap-rails', require: false
-  gem 'sassc-rails', '~> 2.1'
-  gem 'devise', '~> 4.8'
 
-  group :test do
-    gem 'cancancan', '~> 3.2'
-    gem 'kt-paperclip'
-    gem 'rspec-rails', '>= 4.0.0.beta2'
-    gem 'shrine', '~> 3.0'
+  group :active_record do
+    platforms :ruby, :mswin, :mingw, :x64_mingw do
+      gem 'sqlite3', '~> 1.3'
+    end
+
+    platforms :jruby do
+      gem 'activerecord-jdbcmysql-adapter', '~> 70.0'
+      gem 'activerecord-jdbcpostgresql-adapter', '~> 70.0'
+      gem 'activerecord-jdbcsqlite3-adapter', '~> 70.0'
+    end
+  end
+
+  group :mongoid do
+    gem 'cancancan-mongoid'
+    gem 'carrierwave-mongoid', '>= 0.6.3', require: 'carrierwave/mongoid'
+    gem 'database_cleaner-mongoid', '>= 2.0', require: false
+    gem 'kaminari-mongoid'
+    gem 'mongoid', '~> 8.0'
+    gem 'mongoid-paperclip', '>= 0.0.8', require: 'mongoid_paperclip'
+    gem 'shrine-mongoid', '~> 1.0'
   end
+end
+
+appraise 'rails-7.1' do
+  gem 'rails', '~> 7.1.0'
+  gem 'importmap-rails', require: false
 
   group :active_record do
-    gem 'pg', '>= 1.0.0', platforms: :ruby
-    gem 'paper_trail', '>= 12.0'
+    platforms :ruby, :mswin, :mingw, :x64_mingw do
+      gem 'sqlite3', '~> 1.3'
+    end
+  end
+
+  group :mongoid do
+    gem 'cancancan-mongoid'
+    gem 'carrierwave-mongoid', '>= 0.6.3', require: 'carrierwave/mongoid'
+    gem 'database_cleaner-mongoid', '>= 2.0', require: false
+    gem 'kaminari-mongoid'
+    gem 'mongoid', '~> 8.0'
+    gem 'mongoid-paperclip', '>= 0.0.8', require: 'mongoid_paperclip'
+    gem 'shrine-mongoid', '~> 1.0'
   end
 end
 
+appraise 'rails-7.2' do
+  gem 'rails', '~> 7.2.0'
+  gem 'importmap-rails', require: false
+end
+
+appraise 'rails-8.0' do
+  gem 'rails', '~> 8.0.0'
+  gem 'importmap-rails', require: false
+end
+
 appraise 'composite_primary_keys' do
   gem 'rails', '~> 7.0.0'
-  gem 'sassc-rails', '~> 2.1'
-  gem 'devise', '~> 4.8'
-
-  group :test do
-    gem 'cancancan', '~> 3.2'
-    gem 'kt-paperclip'
-    gem 'rspec-rails', '>= 4.0.0.beta2'
-    gem 'shrine', '~> 3.0'
-  end
 
   group :active_record do
     gem 'composite_primary_keys'
-    gem 'paper_trail', '>= 12.0'
+
+    platforms :ruby, :mswin, :mingw, :x64_mingw do
+      gem 'sqlite3', '~> 1.3'
+    end
   end
 end