feat: add rails 7.2 and 8.0 support (#14)

marcosgz · Jan 21, 2025 · 3eb8d05 · 3eb8d05
1 parent 6606333
commit 3eb8d05
Show file tree

Hide file tree

Showing 21 changed files with 426 additions and 24 deletions.
diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
@@ -20,7 +20,7 @@ jobs:
           bundler-cache: true
       - name: Run linter
         run: bundle exec rubocop
-  ruby-2:
+  ruby-2-7:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -42,7 +42,7 @@ jobs:
           bundler-cache: true
       - name: Run tests
         run: bundle exec rspec
-  ruby-3:
+  ruby-3-0:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -51,7 +51,6 @@ jobs:
           - "3.0"
           - "3.1"
           - "3.2"
-          - "3.3"
         gemfile:
           - ci/Gemfile.rails-6.0
           - ci/Gemfile.rails-6.1
@@ -68,3 +67,26 @@ jobs:
           bundler-cache: true
       - name: Run tests
         run: bundle exec rspec
+  ruby-3-2:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby:
+          - "3.2"
+          - "3.3"
+          - "3.4"
+        gemfile:
+          - ci/Gemfile.rails-7.2
+          - ci/Gemfile.rails-8.0
+    name: "ruby-${{ matrix.ruby }}/${{ matrix.gemfile }} specs"
+    env:
+      BUNDLE_GEMFILE: ${{ matrix.gemfile }}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - name: Run tests
+        run: bundle exec rspec
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## 0.3.9 - 2025-01-21
 * Move hooks to a separate gem, [esse-hooks](https://github.com/marcosgz/esse-hooks)
+* Add rails 8 support
 
 ## 0.3.8 - 2024-08-08
 * Add `connect_with:` option to the collection definition.

diff --git a/Gemfile b/Gemfile
@@ -7,7 +7,7 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 gem 'esse', '~> 0.3.4'
 gem 'sqlite3', '~> 1.7.3'
 gem 'activerecord', '~> 5.2'
-gem 'esse-rspec', '~> 0.0.6'
+gem 'esse-rspec'
 gem 'elasticsearch', '~> 7.17', '>= 7.17.10'
 
 # Specify your gem's dependencies in esse-active_record.gemspec

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -2,7 +2,7 @@ PATH
   remote: .
   specs:
     esse-active_record (0.3.9)
-      activerecord (>= 4.2, < 8)
+      activerecord (>= 4.2)
       esse (>= 0.3.0)
       esse-hooks
 
@@ -147,7 +147,7 @@ DEPENDENCIES
   elasticsearch (~> 7.17, >= 7.17.10)
   esse (~> 0.3.4)
   esse-active_record!
-  esse-rspec (~> 0.0.6)
+  esse-rspec
   pry
   rake
   rspec

diff --git a/bin/setup b/bin/setup
@@ -3,5 +3,11 @@ set -euo pipefail
 IFS=$'\n\t'
 set -vx
 
-bundle install
-find ci -type f \( -iname "Gemfile.*" ! -iname "*.lock" \) -exec bundle install --gemfile {} \;
+mise exec [email protected] -- bundle install
+mise exec [email protected] -- bundle install --gemfile ci/Gemfile.rails-7.1
+mise exec [email protected] -- bundle install --gemfile ci/Gemfile.rails-7.0
+mise exec [email protected] -- bundle install --gemfile ci/Gemfile.rails-6.0
+mise exec [email protected] -- bundle install --gemfile ci/Gemfile.rails-6.1
+mise exec [email protected] -- bundle install --gemfile ci/Gemfile.rails-5.2
+mise exec [email protected] -- bundle install --gemfile ci/Gemfile.rails-8.0
+mise exec [email protected] -- bundle install --gemfile ci/Gemfile.rails-7.2
diff --git a/ci/Gemfile.rails-5.2 b/ci/Gemfile.rails-5.2
@@ -4,7 +4,7 @@ source "https://rubygems.org"
 
 gem 'sqlite3', '~> 1.3.6'
 gem 'activerecord', '~> 5.2'
-gem 'esse-rspec', '~> 0.0.6'
+gem 'esse-rspec'
 gem 'elasticsearch', '~> 7.17', '>= 7.17.10'
 
 gemspec path: ".."
diff --git a/ci/Gemfile.rails-5.2.lock b/ci/Gemfile.rails-5.2.lock
@@ -2,7 +2,7 @@ PATH
   remote: ..
   specs:
     esse-active_record (0.3.9)
-      activerecord (>= 4.2, < 8)
+      activerecord (>= 4.2)
       esse (>= 0.3.0)
       esse-hooks
 
@@ -146,7 +146,7 @@ DEPENDENCIES
   dotenv
   elasticsearch (~> 7.17, >= 7.17.10)
   esse-active_record!
-  esse-rspec (~> 0.0.6)
+  esse-rspec
   pry
   rake
   rspec

diff --git a/ci/Gemfile.rails-6.0 b/ci/Gemfile.rails-6.0
@@ -4,7 +4,7 @@ source "https://rubygems.org"
 
 gem 'sqlite3'
 gem 'activerecord', '~> 6.0'
-gem 'esse-rspec', '~> 0.0.6'
+gem 'esse-rspec'
 gem 'elasticsearch', '~> 7.17', '>= 7.17.10'
 
 gemspec path: ".."
diff --git a/ci/Gemfile.rails-6.0.lock b/ci/Gemfile.rails-6.0.lock
@@ -2,7 +2,7 @@ PATH
   remote: ..
   specs:
     esse-active_record (0.3.9)
-      activerecord (>= 4.2, < 8)
+      activerecord (>= 4.2)
       esse (>= 0.3.0)
       esse-hooks
 
@@ -147,7 +147,7 @@ DEPENDENCIES
   dotenv
   elasticsearch (~> 7.17, >= 7.17.10)
   esse-active_record!
-  esse-rspec (~> 0.0.6)
+  esse-rspec
   pry
   rake
   rspec

diff --git a/ci/Gemfile.rails-6.1 b/ci/Gemfile.rails-6.1
@@ -4,7 +4,7 @@ source "https://rubygems.org"
 
 gem 'sqlite3'
 gem 'activerecord', '~> 6.1'
-gem 'esse-rspec', '~> 0.0.6'
+gem 'esse-rspec'
 gem 'elasticsearch', '~> 7.17', '>= 7.17.10'
 
 gemspec path: ".."
diff --git a/ci/Gemfile.rails-6.1.lock b/ci/Gemfile.rails-6.1.lock
@@ -2,7 +2,7 @@ PATH
   remote: ..
   specs:
     esse-active_record (0.3.9)
-      activerecord (>= 4.2, < 8)
+      activerecord (>= 4.2)
       esse (>= 0.3.0)
       esse-hooks
 
@@ -147,7 +147,7 @@ DEPENDENCIES
   dotenv
   elasticsearch (~> 7.17, >= 7.17.10)
   esse-active_record!
-  esse-rspec (~> 0.0.6)
+  esse-rspec
   pry
   rake
   rspec

diff --git a/ci/Gemfile.rails-7.0 b/ci/Gemfile.rails-7.0
@@ -4,7 +4,7 @@ source "https://rubygems.org"
 
 gem 'sqlite3'
 gem 'activerecord', '~> 6.0'
-gem 'esse-rspec', '~> 0.0.6'
+gem 'esse-rspec'
 gem 'elasticsearch', '~> 7.17', '>= 7.17.10'
 
 gemspec path: ".."
diff --git a/ci/Gemfile.rails-7.0.lock b/ci/Gemfile.rails-7.0.lock
@@ -2,7 +2,7 @@ PATH
   remote: ..
   specs:
     esse-active_record (0.3.9)
-      activerecord (>= 4.2, < 8)
+      activerecord (>= 4.2)
       esse (>= 0.3.0)
       esse-hooks
 
@@ -147,7 +147,7 @@ DEPENDENCIES
   dotenv
   elasticsearch (~> 7.17, >= 7.17.10)
   esse-active_record!
-  esse-rspec (~> 0.0.6)
+  esse-rspec
   pry
   rake
   rspec

diff --git a/ci/Gemfile.rails-7.1 b/ci/Gemfile.rails-7.1
@@ -4,7 +4,7 @@ source "https://rubygems.org"
 
 gem 'sqlite3'
 gem 'activerecord', '~> 7.1'
-gem 'esse-rspec', '~> 0.0.6'
+gem 'esse-rspec'
 gem 'elasticsearch', '~> 7.17', '>= 7.17.10'
 
 gemspec path: ".."
diff --git a/ci/Gemfile.rails-7.1.lock b/ci/Gemfile.rails-7.1.lock
@@ -2,7 +2,7 @@ PATH
   remote: ..
   specs:
     esse-active_record (0.3.9)
-      activerecord (>= 4.2, < 8)
+      activerecord (>= 4.2)
       esse (>= 0.3.0)
       esse-hooks
 
@@ -155,7 +155,7 @@ DEPENDENCIES
   dotenv
   elasticsearch (~> 7.17, >= 7.17.10)
   esse-active_record!
-  esse-rspec (~> 0.0.6)
+  esse-rspec
   pry
   rake
   rspec

diff --git a/ci/Gemfile.rails-7.2 b/ci/Gemfile.rails-7.2
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+gem 'sqlite3'
+gem 'activerecord', '~> 7.2'
+gem 'esse-rspec'
+gem 'elasticsearch', '~> 7.17', '>= 7.17.10'
+
+gemspec path: ".."