Support Rails 8.1 and Ruby 3.4 (#342)

* Use stable Mongoid

Author: zhuravel

.github/workflows/ci.yml

@@ -8,20 +8,24 @@ jobs:
       fail-fast: false
       matrix:
         # To keep matrix size down, only test highest and lowest rubies.
-        ruby: ["3.0", "3.3"]
-        rails: ["7.0", "7.1", "7.2", "8.0"]
+        ruby: ["3.0", "3.4"]
+        rails: ["7.0", "7.1", "7.2", "8.0", "8.1"]
         exclude:
           - ruby: "3.0"
             rails: "7.2"
           - ruby: "3.0"
             rails: "8.0"
+          - ruby: "3.0"
+            rails: "8.1"
+          - ruby: "3.4"
+            rails: "7.0"
     name: Ruby ${{ matrix.ruby }}, Rails ${{ matrix.rails }}
     runs-on: ubuntu-latest
     env:
       BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/rails_${{ matrix.rails }}.gemfile
     steps:
-      - uses: actions/checkout@v4
-      - uses: supercharge/mongodb-github-action@1.11.0
+      - uses: actions/checkout@v5
+      - uses: supercharge/mongodb-github-action@1.12.0
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}

.github/workflows/release.yml

@@ -7,7 +7,6 @@ on:
         description: "RubyGems account API key"
         required: true
 
-
   workflow_dispatch: # Trigger the workflow manually
     inputs:
       otp_code:
@@ -26,12 +25,12 @@ jobs:
     steps:
 
     - name: Checkout code
-      uses: actions/checkout@v3
+      uses: actions/checkout@v5
 
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: '3.3.4'
+        ruby-version: '3.4.7'
 
     - name: Extract Gem Version
       id: extract_version

Appraisals

@@ -1,29 +1,36 @@
 # frozen_string_literal: true
 
-appraise "rails-6.1" do
-  group :development do
-    gem "rails", "~> 6.1.0"
-  end
-end
-
 appraise "rails-7.0" do
   group :development do
     gem "rails", "~> 7.0.0"
+    gem "sqlite3", "~> 1.7.0"
   end
 end
 
 appraise "rails-7.1" do
   group :development do
     gem "rails", "~> 7.1.0"
+    gem "sqlite3", "~> 1.7.0"
   end
 end
 
 appraise "rails-7.2" do
   group :development do
     gem "rails", "~> 7.2.0"
     gem "sqlite3", "~> 2.0.0"
-    group :mongo do
-      gem "mongoid", github: "mongodb/mongoid"
-    end
+  end
+end
+
+appraise "rails-8.0" do
+  group :development do
+    gem "rails", "~> 8.0.0"
+    gem "sqlite3", "~> 2.1.0"
+  end
+end
+
+appraise "rails-8.1" do
+  group :development do
+    gem "rails", ">= 8.1.0.rc1", "< 8.2"
+    gem "sqlite3", "~> 2.1.0"
   end
 end

CONTRIBUTING.md

@@ -17,21 +17,21 @@ Tests can be run against different versions of Rails:
 bundle install
 bundle exec appraisal install
 
-# Run tests against Rails 7.2
-bundle exec appraisal rails-7.2 rake
+# Run tests against Rails 8.1
+bundle exec appraisal rails-8.1 rake
 
-# Run tests against Rails 6.1
-bundle exec appraisal rails-6.1 rake
+# Run tests against Rails 7.0
+bundle exec appraisal rails-7.0 rake
 ```
 
 **Using BUNDLE_GEMFILE**
 
 ``` shell
-# Run tests against Rails 7.2
-BUNDLE_GEMFILE=gemfiles/rails_7.2.gemfile bundle install
-BUNDLE_GEMFILE=gemfiles/rails_7.2.gemfile bundle exec rake
+# Run tests against Rails 8.1
+BUNDLE_GEMFILE=gemfiles/rails_8.1.gemfile bundle install
+BUNDLE_GEMFILE=gemfiles/rails_8.1.gemfile bundle exec rake
 
-# Run tests against Rails 6.1
-BUNDLE_GEMFILE=gemfiles/rails_6.1.gemfile bundle install
-BUNDLE_GEMFILE=gemfiles/rails_6.1.gemfile bundle exec rake
+# Run tests against Rails 7.0
+BUNDLE_GEMFILE=gemfiles/rails_7.0.gemfile bundle install
+BUNDLE_GEMFILE=gemfiles/rails_7.0.gemfile bundle exec rake
 ```

gemfiles/rails_7.0.gemfile

@@ -1,19 +1,22 @@
-# frozen_string_literal: true
-
 # This file was generated by Appraisal
 
 source "https://rubygems.org"
 
 group :development do
+  gem "activerecord"
   gem "appraisal"
   gem "bump"
   gem "csv"
+  gem "debug"
   gem "nokogiri"
   gem "pry-byebug"
-  gem "rails", "~> 7.0.0"
+  gem "rails-dom-testing", "~> 2.2"
   gem "rspec"
+  gem "rubocop", "~> 1.68"
+  gem "rubocop-yard", "~> 0.9.3", require: false
   gem "sequel"
   gem "sqlite3", "~> 1.7.0"
+  gem "rails", "~> 7.0.0"
 
   group :mongo do
     gem "bson"

gemfiles/rails_7.1.gemfile

@@ -1,19 +1,22 @@
-# frozen_string_literal: true
-
 # This file was generated by Appraisal
 
 source "https://rubygems.org"
 
 group :development do
+  gem "activerecord"
   gem "appraisal"
   gem "bump"
   gem "csv"
+  gem "debug"
   gem "nokogiri"
   gem "pry-byebug"
-  gem "rails", "~> 7.1.0"
+  gem "rails-dom-testing", "~> 2.2"
   gem "rspec"
+  gem "rubocop", "~> 1.68"
+  gem "rubocop-yard", "~> 0.9.3", require: false
   gem "sequel"
   gem "sqlite3", "~> 1.7.0"
+  gem "rails", "~> 7.1.0"
 
   group :mongo do
     gem "bson"

gemfiles/rails_7.2.gemfile

@@ -1,23 +1,26 @@
-# frozen_string_literal: true
-
 # This file was generated by Appraisal
 
 source "https://rubygems.org"
 
 group :development do
+  gem "activerecord"
   gem "appraisal"
   gem "bump"
   gem "csv"
+  gem "debug"
   gem "nokogiri"
   gem "pry-byebug"
-  gem "rails", "~> 7.2.0"
+  gem "rails-dom-testing", "~> 2.2"
   gem "rspec"
+  gem "rubocop", "~> 1.68"
+  gem "rubocop-yard", "~> 0.9.3", require: false
   gem "sequel"
   gem "sqlite3", "~> 2.0.0"
+  gem "rails", "~> 7.2.0"
 
   group :mongo do
     gem "bson"
-    gem "mongoid", github: "mongodb/mongoid"
+    gem "mongoid", "~> 9.0"
   end
 end
 

gemfiles/rails_8.0.gemfile

@@ -1,23 +1,26 @@
-# frozen_string_literal: true
-
 # This file was generated by Appraisal
 
 source "https://rubygems.org"
 
 group :development do
+  gem "activerecord"
   gem "appraisal"
   gem "bump"
   gem "csv"
+  gem "debug"
   gem "nokogiri"
   gem "pry-byebug"
-  gem "rails", "~> 8.0.0"
+  gem "rails-dom-testing", "~> 2.2"
   gem "rspec"
+  gem "rubocop", "~> 1.68"
+  gem "rubocop-yard", "~> 0.9.3", require: false
   gem "sequel"
   gem "sqlite3", "~> 2.1.0"
+  gem "rails", "~> 8.0.0"
 
   group :mongo do
     gem "bson"
-    gem "mongoid", github: "mongodb/mongoid"
+    gem "mongoid", "~> 9.0"
   end
 end
 

gemfiles/rails_6.1.gemfile gemfiles/rails_8.1.gemfilegemfiles/rails_6.1.gemfile renamed to gemfiles/rails_8.1.gemfile

@@ -1,19 +1,22 @@
-# frozen_string_literal: true
-
 # This file was generated by Appraisal
 
 source "https://rubygems.org"
 
 group :development do
+  gem "activerecord"
   gem "appraisal"
   gem "bump"
   gem "csv"
+  gem "debug"
   gem "nokogiri"
   gem "pry-byebug"
-  gem "rails", "~> 6.1.0"
+  gem "rails-dom-testing", "~> 2.2"
   gem "rspec"
+  gem "rubocop", "~> 1.68"
+  gem "rubocop-yard", "~> 0.9.3", require: false
   gem "sequel"
-  gem "sqlite3", "~> 1.7.0"
+  gem "sqlite3", "~> 2.1.0"
+  gem "rails", ">= 8.1.0.rc1", "< 8.2"
 
   group :mongo do
     gem "bson"

lib/datagrid/columns/column.rb

@@ -168,7 +168,14 @@ def enabled?(grid)
 
       # @return [String] column console inspection
       def inspect
-        "#<#{self.class} #{grid_class}##{name} #{options.inspect}>"
+        options_inspection = if RUBY_VERSION >= "3.4"
+          # Ruby 3.4+ changed Hash#inspect format for symbol keys from {:key=>"value"} to {key: "value"}
+          options.inspect
+        else
+          "{#{options.map { |key, value| "#{key}: #{value.inspect}" }.join(", ")}}"
+        end
+
+        "#<#{self.class} #{grid_class}##{name} #{options_inspection}>"
       end
 
       # @return [String] column header