Merge pull request #26 from khiav223577/feature/support_rails_7_2

Support Ruby 3.2 and Rails 7.2
khiav223577 · Sep 9, 2024 · db3ce9b · db3ce9b
2 parents 5a63dc7 + 242ece5
commit db3ce9b
Show file tree

Hide file tree

Showing 11 changed files with 49 additions and 4 deletions.
diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
@@ -28,32 +28,52 @@ jobs:
           - 2.6
           - 2.7
           - 3.0
+          - 3.2
         gemfile:
           - 3.2.gemfile
           - 4.2.gemfile
           - 5.0.gemfile
           - 5.1.gemfile
           - 5.2.gemfile
           - 6.0.gemfile
+          - 7.2.gemfile
         exclude:
           - gemfile: 3.2.gemfile
             ruby: 2.6
           - gemfile: 3.2.gemfile
             ruby: 3.0
+          - gemfile: 3.2.gemfile
+            ruby: 3.2
           - gemfile: 3.2.gemfile
             ruby: 2.7
           - gemfile: 4.2.gemfile
             ruby: 2.7
           - gemfile: 4.2.gemfile
             ruby: 3.0
+          - gemfile: 4.2.gemfile
+            ruby: 3.2
           - gemfile: 5.0.gemfile
             ruby: 3.0
+          - gemfile: 5.0.gemfile
+            ruby: 3.2
           - gemfile: 5.1.gemfile
             ruby: 3.0
+          - gemfile: 5.1.gemfile
+            ruby: 3.2
           - gemfile: 5.2.gemfile
             ruby: 3.0
+          - gemfile: 5.2.gemfile
+            ruby: 3.2
           - gemfile: 6.0.gemfile
             ruby: 2.2
+          - gemfile: 7.2.gemfile
+            ruby: 2.2
+          - gemfile: 7.2.gemfile
+            ruby: 2.6
+          - gemfile: 7.2.gemfile
+            ruby: 2.7
+          - gemfile: 7.2.gemfile
+            ruby: 3.0
         include:
           - db: makara_mysql
             gemfile: 6.0.gemfile

diff --git a/README.md b/README.md
@@ -11,8 +11,8 @@
 All methods are defined in `Atomically::QueryService` instead of defining in `ActiveRecord` directly, in order not to pollute the model instance.
 
 ## Supports
-- Ruby 2.2 ~ 2.7, 3.0
-- Rails 3.2, 4.2, 5.0, 5.1, 5.2, 6.0
+- Ruby 2.2 ~ 2.7, 3.0, 3.2
+- Rails 3.2, 4.2, 5.0, 5.1, 5.2, 6.0, 7.2
 - MySQL, PostgreSQL
 
 ## Table of contents

diff --git a/atomically.gemspec b/atomically.gemspec
@@ -42,6 +42,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'pg', '~> 0.18'
   spec.add_development_dependency 'pluck_all', '>= 2.0.3'
   spec.add_development_dependency 'timecop', '~> 0.9.1'
+  spec.add_development_dependency 'rails_compatibility', '>= 0.0.8'
 
   spec.add_dependency 'activerecord', '>= 3'
   spec.add_dependency 'activerecord-import', '>= 0.27.0'

diff --git a/gemfiles/3.2.gemfile b/gemfiles/3.2.gemfile
@@ -11,6 +11,7 @@ group :test do
   gem 'pluck_all', '>= 2.0.3'
   gem 'timecop', '~> 0.9.1'
   gem 'update_all_scope', '~> 0.1.0'
+  gem 'rails_compatibility', '>= 0.0.8'
 end
 
 gemspec path: '../'
diff --git a/gemfiles/4.2.gemfile b/gemfiles/4.2.gemfile
@@ -11,6 +11,7 @@ group :test do
   gem 'pluck_all', '>= 2.0.3'
   gem 'timecop', '~> 0.9.1'
   gem 'update_all_scope', '~> 0.1.0'
+  gem 'rails_compatibility', '>= 0.0.8'
 end
 
 gemspec path: '../'
diff --git a/gemfiles/5.0.gemfile b/gemfiles/5.0.gemfile
@@ -11,6 +11,7 @@ group :test do
   gem 'pluck_all', '>= 2.0.3'
   gem 'timecop', '~> 0.9.1'
   gem 'update_all_scope', '~> 0.1.0'
+  gem 'rails_compatibility', '>= 0.0.8'
 end
 
 gemspec path: '../'
diff --git a/gemfiles/5.1.gemfile b/gemfiles/5.1.gemfile
@@ -11,6 +11,7 @@ group :test do
   gem 'pluck_all', '>= 2.0.3'
   gem 'timecop', '~> 0.9.1'
   gem 'update_all_scope', '~> 0.1.0'
+  gem 'rails_compatibility', '>= 0.0.8'
 end
 
 gemspec path: '../'
diff --git a/gemfiles/5.2.gemfile b/gemfiles/5.2.gemfile
@@ -11,6 +11,7 @@ group :test do
   gem 'pluck_all', '>= 2.0.3'
   gem 'timecop', '~> 0.9.1'
   gem 'update_all_scope', '~> 0.1.0'
+  gem 'rails_compatibility', '>= 0.0.8'
 end
 
 gemspec path: '../'
diff --git a/gemfiles/6.0.gemfile b/gemfiles/6.0.gemfile
@@ -10,6 +10,7 @@ group :test do
   gem 'pluck_all', '>= 2.0.4'
   gem 'timecop', '~> 0.9.1'
   gem 'update_all_scope', '~> 0.1.0'
+  gem 'rails_compatibility', '>= 0.0.8'
 end
 
 gemspec path: '../'
diff --git a/gemfiles/7.2.gemfile b/gemfiles/7.2.gemfile
@@ -0,0 +1,17 @@
+source 'https://rubygems.org'
+
+gem 'activerecord', '~> 7.2.1'
+
+group :test do
+  gem 'mysql2', '0.5.1' if %w[mysql makara_mysql].include?(ENV['DB'])
+  gem 'pg', '~> 1.4.6' if %w[pg makara_pg].include?(ENV['DB'])
+  gem 'makara', '~> 0.4.1' if %w[makara_mysql makara_pg].include?(ENV['DB'])
+  gem 'simplecov', '< 0.18'
+  gem 'pluck_all', '>= 2.0.4'
+  gem 'timecop', '~> 0.9.1'
+  gem 'update_all_scope', '~> 0.1.0'
+  gem 'rails_compatibility', '>= 0.0.8'
+  gem 'zeitwerk', '~> 2.6.18'
+end
+
+gemspec path: '../'
diff --git a/test/lib/seeds.rb b/test/lib/seeds.rb
@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require 'rails_compatibility/setup_autoload_paths'
+RailsCompatibility.setup_autoload_paths [File.expand_path('../models/', __FILE__)]
+
 ActiveRecord::Schema.define do
   self.verbose = false
 
@@ -27,8 +30,6 @@
   end
 end
 
-ActiveSupport::Dependencies.autoload_paths << File.expand_path('../models/', __FILE__)
-
 users = User.create([
   { name: 'user_with_bomb_and_water_gun', money: 100, action_point: 3 },
   { name: 'user_with_bomb', money: 200, action_point: 0 },