Merge pull request #40 from zendesk/edytaroz/rails-main-testing

Test with rails main

.github/workflows/ci.yml

@@ -8,15 +8,14 @@ jobs:
       fail-fast: false
       matrix:
         ruby:
-          - '3.0'
           - '3.1'
           - '3.2'
           - '3.3'
         gemfile:
-          - rails6.0
           - rails6.1
           - rails7.0
           - rails7.1
+          - rails7.2
     env:
       CI: true
       BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile

.github/workflows/rails_main_testing.yml

@@ -0,0 +1,28 @@
+name: Test against Rails main
+
+on:
+  schedule:
+    - cron: "0 0 * * *" # Run every day at 00:00 UTC
+  workflow_dispatch:
+  push:
+
+jobs:
+  main:
+    name: Ruby${{ matrix.ruby }} rails_main
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby:
+          - '3.3'
+    env:
+      CI: true
+      BUNDLE_GEMFILE: gemfiles/rails_main.gemfile
+
+    steps:
+      - uses: zendesk/checkout@v3
+      - uses: zendesk/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - run: bundle exec rake test

active_record_inherit_assoc.gemspec

@@ -1,13 +1,13 @@
 name = "active_record_inherit_assoc"
 
-Gem::Specification.new name, "2.13.2" do |s|
+Gem::Specification.new name, "2.14.0" do |s|
   s.summary = "Attribute inheritance for AR associations"
   s.authors = ["Ben Osheroff"]
   s.email = ["[email protected]"]
   s.files = `git ls-files lib`.split("\n")
   s.license = "Apache License Version 2.0"
   s.homepage = "https://github.com/zendesk/#{name}"
 
-  s.add_runtime_dependency 'activerecord', '>= 5.0.0', '< 7.2'
-  s.required_ruby_version = '>= 2.6'
+  s.add_runtime_dependency 'activerecord', '>= 6.1'
+  s.required_ruby_version = '>= 3.1'
 end

gemfiles/common.rb

@@ -4,5 +4,5 @@
 gem 'minitest-rg'
 gem 'rake'
 gem 'bump'
-gem 'sqlite3'
+gem 'sqlite3', '~> 1.4'
 gem 'byebug'

gemfiles/rails7.2.gemfile

@@ -0,0 +1,3 @@
+eval_gemfile('common.rb')
+
+gem 'activerecord', '~> 7.2.0'

gemfiles/rails_main.gemfile

@@ -0,0 +1,3 @@
+eval_gemfile('common.rb')
+
+gem 'activerecord', github: 'rails/rails', branch: 'main'

lib/active_record_inherit_assoc.rb

@@ -41,23 +41,12 @@ def skip_statement_cache?(*)
 ActiveRecord::Associations::Association.send(:prepend, ActiveRecordInheritAssocPrepend)
 
 module ActiveRecordInheritPreloadAssocPrepend
-  if ActiveRecord::VERSION::STRING < '5.2.0'
-    def associated_records_by_owner(*)
-      super.tap do |result|
-        next unless inherit = reflection.options[:inherit]
-        result.each do |owner, associated_records|
-          filter_associated_records_with_inherit!(owner, associated_records, inherit)
-        end
-      end
-    end
-  else
-    def associate_records_to_owner(owner, records)
-      if inherit = reflection.options[:inherit]
-        records = Array(records)
-        filter_associated_records_with_inherit!(owner, records, inherit)
-      end
-      super
+  def associate_records_to_owner(owner, records)
+    if inherit = reflection.options[:inherit]
+      records = Array(records)
+      filter_associated_records_with_inherit!(owner, records, inherit)
     end
+    super
   end
 
   def build_scope