Merge pull request #13 from mkhairi/rails7

Add Support for Rails 7.0 & Rails 7.1
marshall-lee · Dec 1, 2023 · faf2c2a · faf2c2a
2 parents cbd7fec + 2bfaad8
commit faf2c2a
Show file tree

Hide file tree

Showing 19 changed files with 331 additions and 143 deletions.
diff --git a/.github/workflows/rspec.yml b/.github/workflows/rspec.yml
@@ -12,17 +12,28 @@ jobs:
     strategy:
       matrix:
         ruby:
-          - 2.5.x
-          - 2.6.x
-          - 2.7.x
-          - 3.0.x
+          - "2.6"
+          - "2.7"
+          - "3.0"
+          - "3.1"
+          - "3.2"
         gemfile:
           - gemfiles/rails_5.2.gemfile
           - gemfiles/rails_6.0.gemfile
           - gemfiles/rails_6.1.gemfile
+          - gemfiles/rails_7.0.gemfile
+          - gemfiles/rails_7.1.gemfile
         exclude:
           - gemfile: gemfiles/rails_5.2.gemfile
-            ruby: 3.0.x
+            ruby: "3.0"
+          - gemfile: gemfiles/rails_5.2.gemfile
+            ruby: "3.1"
+          - gemfile: gemfiles/rails_5.2.gemfile
+            ruby: "3.2"
+          - gemfile: gemfiles/rails_7.0.gemfile
+            ruby: "2.6"
+          - gemfile: gemfiles/rails_7.1.gemfile
+            ruby: "2.6"
     env:
       BUNDLE_GEMFILE: ${{ format('{0}/{1}', github.workspace, matrix.gemfile) }}
       BUNDLE_PATH: ${{ format('{0}/vendor/bundle', github.workspace) }}
@@ -31,23 +42,9 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v1
       - name: Setup ruby
-        uses: actions/setup-ruby@v1
+        uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-      - name: Install Bundler
-        run: gem install bundler:2.2.14
-      - name: Cache Bundler
-        uses: actions/cache@v1
-        id: cache-bundler
-        with:
-          path: vendor/bundle
-          key: ${{ runner.os }}-gem-${{ matrix.ruby }}-${{ hashFiles(format('{0}/{1}.lock', github.workspace, matrix.gemfile)) }}
-          restore-keys: |
-            ${{ runner.os }}-gem-${{ matrix.ruby }}-
-      - name: Install Bundler dependencies
-        if: steps.cache-bundler.outputs.cache-hit != 'true'
-        run: bundle install --jobs=4
-      - name: Check Bunlder dependencies
-        run: bundle check
+          bundler-cache: true
       - name: RSpec
         run: bundle exec rspec
diff --git a/Appraisals b/Appraisals
@@ -1,11 +1,21 @@
+# frozen_string_literal: true
+
 appraise "rails-5.2" do
-  gem 'activemodel', '~> 5.2.4'
+  gem 'activemodel', '~> 5.2.8.1'
 end
 
 appraise "rails-6.0" do
-  gem 'activemodel', '~> 6.0.3'
+  gem 'activemodel', '~> 6.0.6.1'
 end
 
 appraise "rails-6.1" do
-  gem 'activemodel', '~> 6.1.3'
+  gem 'activemodel', '~> 6.1.7.6'
+end
+
+appraise "rails-7.0" do
+  gem 'activemodel', '~> 7.0.8'
+end
+
+appraise "rails-7.1" do
+  gem 'activemodel', '~> 7.1.1'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,47 +1,57 @@
 PATH
   remote: .
   specs:
-    nested_record (1.1.0)
-      activemodel (>= 4.2, < 6.2)
+    nested_record (1.1.1)
+      activemodel (> 5.2, < 7.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.1.3)
-      activesupport (= 6.1.3)
-    activesupport (6.1.3)
+    activemodel (7.1.1)
+      activesupport (= 7.1.1)
+    activesupport (7.1.1)
+      base64
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
+      mutex_m
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
-    appraisal (2.4.0)
+    appraisal (2.5.0)
       bundler
       rake
       thor (>= 0.14.0)
-    concurrent-ruby (1.1.8)
-    diff-lcs (1.4.4)
-    i18n (1.8.9)
+    base64 (0.1.1)
+    bigdecimal (3.1.4)
+    concurrent-ruby (1.2.2)
+    connection_pool (2.4.1)
+    diff-lcs (1.5.0)
+    drb (2.1.1)
+      ruby2_keywords
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    minitest (5.14.4)
-    rake (13.0.3)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    minitest (5.20.0)
+    mutex_m (0.1.2)
+    rake (13.0.6)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.2)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
-    thor (1.1.0)
-    tzinfo (2.0.4)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.1)
+    ruby2_keywords (0.0.5)
+    thor (1.2.2)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby

diff --git a/gemfiles/rails_5.2.gemfile b/gemfiles/rails_5.2.gemfile
@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "activemodel", "~> 5.2.4"
+gem "activemodel", "~> 5.2.8.1"
 
 gemspec path: "../"
diff --git a/gemfiles/rails_5.2.gemfile.lock b/gemfiles/rails_5.2.gemfile.lock
@@ -1,57 +1,57 @@
 PATH
   remote: ..
   specs:
-    nested_record (1.1.0)
-      activemodel (>= 4.2, < 6.2)
+    nested_record (1.1.1)
+      activemodel (> 5.2, < 7.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.2.6)
-      activesupport (= 5.2.6)
-    activesupport (5.2.6)
+    activemodel (5.2.8.1)
+      activesupport (= 5.2.8.1)
+    activesupport (5.2.8.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    appraisal (2.4.0)
+    appraisal (2.5.0)
       bundler
       rake
       thor (>= 0.14.0)
-    concurrent-ruby (1.1.9)
-    diff-lcs (1.4.4)
-    i18n (1.8.10)
+    concurrent-ruby (1.2.2)
+    diff-lcs (1.5.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    minitest (5.14.4)
-    rake (13.0.3)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    minitest (5.20.0)
+    rake (13.0.6)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.2)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
-    thor (1.1.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.1)
+    thor (1.3.0)
     thread_safe (0.3.6)
-    tzinfo (1.2.9)
+    tzinfo (1.2.11)
       thread_safe (~> 0.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activemodel (~> 5.2.4)
+  activemodel (~> 5.2.8.1)
   appraisal
   bundler (>= 2)
   nested_record!
   rake (~> 13.0)
   rspec (~> 3.0)
 
 BUNDLED WITH
-   2.2.22
+   2.3.22
diff --git a/gemfiles/rails_6.0.gemfile b/gemfiles/rails_6.0.gemfile
@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "activemodel", "~> 6.0.3"
+gem "activemodel", "~> 6.0.6.1"
 
 gemspec path: "../"
diff --git a/gemfiles/rails_6.0.gemfile.lock b/gemfiles/rails_6.0.gemfile.lock
@@ -1,59 +1,59 @@
 PATH
   remote: ..
   specs:
-    nested_record (1.1.0)
-      activemodel (>= 4.2, < 6.2)
+    nested_record (1.1.1)
+      activemodel (> 5.2, < 7.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.0.4.1)
-      activesupport (= 6.0.4.1)
-    activesupport (6.0.4.1)
+    activemodel (6.0.6.1)
+      activesupport (= 6.0.6.1)
+    activesupport (6.0.6.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
       zeitwerk (~> 2.2, >= 2.2.2)
-    appraisal (2.4.0)
+    appraisal (2.5.0)
       bundler
       rake
       thor (>= 0.14.0)
-    concurrent-ruby (1.1.9)
-    diff-lcs (1.4.4)
-    i18n (1.8.10)
+    concurrent-ruby (1.2.2)
+    diff-lcs (1.5.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    minitest (5.14.4)
-    rake (13.0.3)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    minitest (5.20.0)
+    rake (13.0.6)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.2)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
-    thor (1.1.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.1)
+    thor (1.3.0)
     thread_safe (0.3.6)
-    tzinfo (1.2.9)
+    tzinfo (1.2.11)
       thread_safe (~> 0.1)
-    zeitwerk (2.5.1)
+    zeitwerk (2.6.12)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activemodel (~> 6.0.3)
+  activemodel (~> 6.0.6.1)
   appraisal
   bundler (>= 2)
   nested_record!
   rake (~> 13.0)
   rspec (~> 3.0)
 
 BUNDLED WITH
-   2.2.22
+  2.4.20
diff --git a/gemfiles/rails_6.1.gemfile b/gemfiles/rails_6.1.gemfile
@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "activemodel", "~> 6.1.3"
+gem "activemodel", "~> 6.1.7.6"
 
 gemspec path: "../"