schema_associations 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ce1a98047254a00934a2a5ea83cae65bb088154a9c9125e0924e53c07ab6b77
-  data.tar.gz: 9305ad24ed3345de55d42a7a566b1f15cfa01d4e285c694ffd3750aa7feebce6
+  metadata.gz: ec0cfbd6657715659bd5a2d60d2b9c149952d84be81e0f6ca966fe29d28abb01
+  data.tar.gz: '0873c33c130ceebf4b01d5e3eebdc764810a8c11a0666172db16e5a08817a92d'
 SHA512:
-  metadata.gz: 6e1e8b03ccce6cb04497ee2faec4816718a5b7b56803abcb04225e27d823d600d8a4af5e858433ba05551fb775395f36e9a187ba7f310740e0f9a06c5a7a9497
-  data.tar.gz: 75e7e05eb6989c2d680e1425d7a05f684a1d8033b63590c3f7ab9f1154a8b33c1c00500748aee123442e2f97fda16efc60d2819530bf3cd182eccf63591466bd
+  metadata.gz: a1c51343a4da26da68aea83231d7e9af020acb330822cb8a4c0c969af53dd47266c0d1f5d9ff2f9b85f66fc6494a679ae9428d8be2263502ee375a95f6a1d25e
+  data.tar.gz: 7ea061fa8ca06101f34dae365fbed8f0a6ef292c99eb8abc99b21d9b0358ed282af2fba92061598037090d425efc07c1a63cbc6909b3524c3218ba3d5128d0b8

data/.github/workflows/prs.yml

@@ -22,9 +22,12 @@ jobs:
         - '2.5'
         - '2.7'
         - '3.0'
+        - '3.1'
         activerecord:
         - '5.2'
         - '6.0'
+        - '6.1'
+        - '7.0'
         db:
         - mysql2
         - sqlite3
@@ -34,6 +37,10 @@ jobs:
         exclude:
         - ruby: '3.0'
           activerecord: '5.2'
+        - ruby: '3.1'
+          activerecord: '5.2'
+        - ruby: '2.5'
+          activerecord: '7.0'
         - db: skip
           dbversion: skip
         include:
@@ -45,6 +52,10 @@ jobs:
           activerecord: '6.0'
           db: postgresql
           dbversion: '9.6'
+        - ruby: '2.5'
+          activerecord: '6.1'
+          db: postgresql
+          dbversion: '9.6'
         - ruby: '2.7'
           activerecord: '5.2'
           db: postgresql
@@ -53,10 +64,38 @@ jobs:
           activerecord: '6.0'
           db: postgresql
           dbversion: '9.6'
+        - ruby: '2.7'
+          activerecord: '6.1'
+          db: postgresql
+          dbversion: '9.6'
+        - ruby: '2.7'
+          activerecord: '7.0'
+          db: postgresql
+          dbversion: '9.6'
+        - ruby: '3.0'
+          activerecord: '6.0'
+          db: postgresql
+          dbversion: '9.6'
+        - ruby: '3.0'
+          activerecord: '6.1'
+          db: postgresql
+          dbversion: '9.6'
         - ruby: '3.0'
+          activerecord: '7.0'
+          db: postgresql
+          dbversion: '9.6'
+        - ruby: '3.1'
           activerecord: '6.0'
           db: postgresql
           dbversion: '9.6'
+        - ruby: '3.1'
+          activerecord: '6.1'
+          db: postgresql
+          dbversion: '9.6'
+        - ruby: '3.1'
+          activerecord: '7.0'
+          db: postgresql
+          dbversion: '9.6'
     env:
       BUNDLE_GEMFILE: "${{ github.workspace }}/gemfiles/activerecord-${{ matrix.activerecord }}/Gemfile.${{ matrix.db }}"
       MYSQL_DB_HOST: 127.0.0.1

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source "http://rubygems.org"
 gemspec
 

data/README.md

@@ -420,9 +420,17 @@ SchemaAssociations is tested on all combinations of:
 <!-- These lines are auto-generated by schema_dev based on schema_dev.yml -->
 * ruby **2.5** with activerecord **5.2**, using **mysql2**, **postgresql:9.6** or **sqlite3**
 * ruby **2.5** with activerecord **6.0**, using **mysql2**, **postgresql:9.6** or **sqlite3**
+* ruby **2.5** with activerecord **6.1**, using **mysql2**, **postgresql:9.6** or **sqlite3**
 * ruby **2.7** with activerecord **5.2**, using **mysql2**, **postgresql:9.6** or **sqlite3**
 * ruby **2.7** with activerecord **6.0**, using **mysql2**, **postgresql:9.6** or **sqlite3**
+* ruby **2.7** with activerecord **6.1**, using **mysql2**, **postgresql:9.6** or **sqlite3**
+* ruby **2.7** with activerecord **7.0**, using **mysql2**, **postgresql:9.6** or **sqlite3**
 * ruby **3.0** with activerecord **6.0**, using **mysql2**, **postgresql:9.6** or **sqlite3**
+* ruby **3.0** with activerecord **6.1**, using **mysql2**, **postgresql:9.6** or **sqlite3**
+* ruby **3.0** with activerecord **7.0**, using **mysql2**, **postgresql:9.6** or **sqlite3**
+* ruby **3.1** with activerecord **6.0**, using **mysql2**, **postgresql:9.6** or **sqlite3**
+* ruby **3.1** with activerecord **6.1**, using **mysql2**, **postgresql:9.6** or **sqlite3**
+* ruby **3.1** with activerecord **7.0**, using **mysql2**, **postgresql:9.6** or **sqlite3**
 
 <!-- SCHEMA_DEV: MATRIX - end -->
     
@@ -445,10 +453,18 @@ or in a Gemfile
 
 ## Release notes:
 
+### 1.4.0
+
+* Add AR 6.1 and 7.0
+* Add Ruby 3.1
+* drop schema_plus_compatibiltiy dependency (indirect through schema_plus_foreign_keys update)
+
 ### 1.3.0
 
-* drop AR < 5.2, add AR 6.0
-* drop Ruby < 2.5, add Ruby 3.0
+* add AR 6.0
+* add Ruby 3.0
+* drop AR < 5.2
+* drop Ruby < 2.5
 
 ### 1.2.7
 

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler'
 Bundler::GemHelper.install_tasks
 

data/gemfiles/activerecord-6.1/Gemfile.base

@@ -0,0 +1,4 @@
+base_gemfile = File.expand_path('../../Gemfile.base', __FILE__)
+eval File.read(base_gemfile)
+
+gem "activerecord", ">= 6.1", "< 6.2"

data/gemfiles/activerecord-6.1/Gemfile.mysql2

@@ -0,0 +1,10 @@
+base_gemfile = File.expand_path('../Gemfile.base', __FILE__)
+eval File.read(base_gemfile), binding, base_gemfile
+
+platform :ruby do
+  gem "mysql2"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcmysql-adapter'
+end

data/gemfiles/activerecord-6.1/Gemfile.postgresql

@@ -0,0 +1,10 @@
+base_gemfile = File.expand_path('../Gemfile.base', __FILE__)
+eval File.read(base_gemfile), binding, base_gemfile
+
+platform :ruby do
+  gem "pg"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcpostgresql-adapter'
+end

data/gemfiles/activerecord-6.1/Gemfile.sqlite3

@@ -0,0 +1,10 @@
+base_gemfile = File.expand_path('../Gemfile.base', __FILE__)
+eval File.read(base_gemfile), binding, base_gemfile
+
+platform :ruby do
+  gem "sqlite3"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter', '>=1.3.0.beta2'
+end

data/gemfiles/activerecord-7.0/Gemfile.base

@@ -0,0 +1,4 @@
+base_gemfile = File.expand_path('../../Gemfile.base', __FILE__)
+eval File.read(base_gemfile)
+
+gem "activerecord", ">= 7.0", "< 7.1"

data/gemfiles/activerecord-7.0/Gemfile.mysql2

@@ -0,0 +1,10 @@
+base_gemfile = File.expand_path('../Gemfile.base', __FILE__)
+eval File.read(base_gemfile), binding, base_gemfile
+
+platform :ruby do
+  gem "mysql2"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcmysql-adapter'
+end

data/gemfiles/activerecord-7.0/Gemfile.postgresql

@@ -0,0 +1,10 @@
+base_gemfile = File.expand_path('../Gemfile.base', __FILE__)
+eval File.read(base_gemfile), binding, base_gemfile
+
+platform :ruby do
+  gem "pg"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcpostgresql-adapter'
+end

data/gemfiles/activerecord-7.0/Gemfile.sqlite3

@@ -0,0 +1,10 @@
+base_gemfile = File.expand_path('../Gemfile.base', __FILE__)
+eval File.read(base_gemfile), binding, base_gemfile
+
+platform :ruby do
+  gem "sqlite3"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter', '>=1.3.0.beta2'
+end

data/init.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require 'schema_associations' unless defined?(SchemaAssociations)

data/lib/schema_associations/active_record/associations.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'ostruct'
 
 module SchemaAssociations
@@ -272,7 +274,7 @@ module SchemaAssociations
         end
 
         def _method_exists?(name)
-          method_defined?(name) || private_method_defined?(name) and not (name == :type && [Object, Kernel].include?(instance_method(:type).owner))
+          method_defined?(name) || private_method_defined?(name)
         end
 
       end

data/lib/schema_associations/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SchemaAssociations
-  VERSION = "1.3.0"
+  VERSION = "1.4.0"
 end

data/lib/schema_associations.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'schema_plus_foreign_keys'
 require 'valuable'
 

data/schema_associations.gemspec

@@ -1,4 +1,5 @@
-# -*- encoding: utf-8 -*-
+# frozen_string_literal: true
+
 $:.push File.expand_path("../lib", __FILE__)
 require "schema_associations/version"
 
@@ -19,12 +20,12 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = '>= 2.5'
 
-  gem.add_dependency 'activerecord', '>= 5.2', '< 6.1'
-  gem.add_dependency 'schema_plus_foreign_keys', '~> 1.0.0'
+  gem.add_dependency 'activerecord', '>= 5.2', '< 7.1'
+  gem.add_dependency 'schema_plus_foreign_keys', '~> 1.1.0'
   gem.add_dependency 'valuable'
 
   gem.add_development_dependency 'bundler'
   gem.add_development_dependency 'rake', '~> 13.0'
   gem.add_development_dependency 'rspec', '~> 3.0'
-  gem.add_development_dependency 'schema_dev', '~> 4.1'
+  gem.add_development_dependency 'schema_dev', '~> 4.2.0'
 end

data/schema_dev.yml

@@ -2,9 +2,12 @@ ruby:
   - 2.5
   - 2.7
   - 3.0
+  - 3.1
 activerecord:
   - 5.2
   - 6.0
+  - 6.1
+  - 7.0
 db:
   - mysql2
   - postgresql

data/spec/association_spec.rb

@@ -1,20 +1,26 @@
+# frozen_string_literal: true
 
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe ActiveRecord::Base do
+  def stub_model(name, base = ActiveRecord::Base, &block)
+    klass = Class.new(base)
 
-  after(:each) do
-    remove_all_models
+    if block_given?
+      klass.instance_eval(&block)
+    end
+
+    stub_const(name, klass)
   end
 
   context "in basic case" do
     before(:each) do
       create_tables(
         "posts", {}, {},
-        "comments", {}, { :post_id => {foreign_key: true} }
+        "comments", {}, { post_id: {foreign_key: true} }
       )
-      class Post < ActiveRecord::Base ; end
-      class Comment < ActiveRecord::Base ; end
+      stub_model('Post')
+      stub_model('Comment')
     end
 
     it "should create belongs_to association when reflecting on it" do
@@ -43,13 +49,13 @@ describe ActiveRecord::Base do
 
     it "should create association when accessing it" do
       post = Post.create
-      comment = Comment.create(:post_id => post.id)
+      comment = Comment.create(post_id: post.id)
       expect(comment.post.id).to eq(post.id)
     end
 
     it "should create association when creating record" do
       post = Post.create
-      comment = Comment.create(:post => post)
+      comment = Comment.create(post: post)
       expect(comment.reload.post.id).to eq(post.id)
     end
 
@@ -72,11 +78,11 @@ describe ActiveRecord::Base do
         "owners", {}, {},
         "colors", {}, {},
         "widgets", {}, {
-          :owner_id => { foreign_key: true },
+          owner_id: { foreign_key: true },
         },
-        "parts", {}, { :widget_id => { foreign_key: true } },
-        "manifests", {}, { :widget_id => { foreign_key: true, :index => {:unique => true}} },
-        "colors_widgets", {:id => false}, { :widget_id => { foreign_key: true}, :color_id => { foreign_key: true} }
+        "parts", {}, { widget_id: { foreign_key: true } },
+        "manifests", {}, { widget_id: { foreign_key: true, index: {unique: true}} },
+        "colors_widgets", {id: false}, { widget_id: { foreign_key: true}, color_id: { foreign_key: true} }
       )
     end
 
@@ -91,78 +97,78 @@ describe ActiveRecord::Base do
     end
 
     it "should default as expected" do
-      class Widget < ActiveRecord::Base ; end
-      check_reflections(:owner => true, :colors => true, :parts => true, :manifest => true)
+      stub_model('Widget')
+      check_reflections(owner: true, colors: true, parts: true, manifest: true)
     end
 
     it "should respect :only" do
-      class Widget < ActiveRecord::Base
-        schema_associations :only => :owner
+      stub_model('Widget') do
+        schema_associations only: :owner
       end
-      check_reflections(:owner => true, :colors => false, :parts => false, :manifest => false)
+      check_reflections(owner: true, colors: false, parts: false, manifest: false)
     end
 
     it "should respect :except" do
-      class Widget < ActiveRecord::Base
-        schema_associations :except => :owner
+      stub_model('Widget') do
+        schema_associations except: :owner
       end
-      check_reflections(:owner => false, :colors => true, :parts => true, :manifest => true)
+      check_reflections(owner: false, colors: true, parts: true, manifest: true)
     end
 
     it "should respect :only_type :belongs_to" do
-      class Widget < ActiveRecord::Base
-        schema_associations :only_type => :belongs_to
+      stub_model('Widget') do
+        schema_associations only_type: :belongs_to
       end
-      check_reflections(:owner => true, :colors => false, :parts => false, :manifest => false)
+      check_reflections(owner: true, colors: false, parts: false, manifest: false)
     end
 
     it "should respect :except_type :belongs_to" do
-      class Widget < ActiveRecord::Base
-        schema_associations :except_type => :belongs_to
+      stub_model('Widget') do
+        schema_associations except_type: :belongs_to
       end
-      check_reflections(:owner => false, :colors => true, :parts => true, :manifest => true)
+      check_reflections(owner: false, colors: true, parts: true, manifest: true)
     end
 
     it "should respect :only_type :has_many" do
-      class Widget < ActiveRecord::Base
-        schema_associations :only_type => :has_many
+      stub_model('Widget') do
+        schema_associations only_type: :has_many
       end
-      check_reflections(:owner => false, :colors => false, :parts => true, :manifest => false)
+      check_reflections(owner: false, colors: false, parts: true, manifest: false)
     end
 
     it "should respect :except_type :has_many" do
-      class Widget < ActiveRecord::Base
-        schema_associations :except_type => :has_many
+      stub_model('Widget') do
+        schema_associations except_type: :has_many
       end
-      check_reflections(:owner => true, :colors => true, :parts => false, :manifest => true)
+      check_reflections(owner: true, colors: true, parts: false, manifest: true)
     end
 
     it "should respect :only_type :has_one" do
-      class Widget < ActiveRecord::Base
-        schema_associations :only_type => :has_one
+      stub_model('Widget') do
+        schema_associations only_type: :has_one
       end
-      check_reflections(:owner => false, :colors => false, :parts => false, :manifest => true)
+      check_reflections(owner: false, colors: false, parts: false, manifest: true)
     end
 
     it "should respect :except_type :has_one" do
-      class Widget < ActiveRecord::Base
-        schema_associations :except_type => :has_one
+      stub_model('Widget') do
+        schema_associations except_type: :has_one
       end
-      check_reflections(:owner => true, :colors => true, :parts => true, :manifest => false)
+      check_reflections(owner: true, colors: true, parts: true, manifest: false)
     end
 
     it "should respect :only_type :has_and_belongs_to_many" do
-      class Widget < ActiveRecord::Base
-        schema_associations :only_type => :has_and_belongs_to_many
+      stub_model('Widget') do
+        schema_associations only_type: :has_and_belongs_to_many
       end
-      check_reflections(:owner => false, :colors => true, :parts => false, :manifest => false)
+      check_reflections(owner: false, colors: true, parts: false, manifest: false)
     end
 
     it "should respect :except_type :has_and_belongs_to_many" do
-      class Widget < ActiveRecord::Base
-        schema_associations :except_type => :has_and_belongs_to_many
+      stub_model('Widget') do
+        schema_associations except_type: :has_and_belongs_to_many
       end
-      check_reflections(:owner => true, :colors => false, :parts => true, :manifest => true)
+      check_reflections(owner: true, colors: false, parts: true, manifest: true)
     end
 
   end
@@ -172,12 +178,12 @@ describe ActiveRecord::Base do
       with_associations_auto_create(true) do
         create_tables(
           "posts", {}, {},
-          "comments", {}, { :post_id => {foreign_key: true} }
+          "comments", {}, { post_id: {foreign_key: true} }
         )
-        class Post < ActiveRecord::Base
-          schema_associations :auto_create => false
+        stub_model('Post') do
+          schema_associations auto_create: false
         end
-        class Comment < ActiveRecord::Base ; end
+        stub_model('Comment')
         expect(Post.reflect_on_association(:comments)).to be_nil
         expect(Comment.reflect_on_association(:post)).not_to be_nil
       end
@@ -188,12 +194,12 @@ describe ActiveRecord::Base do
       with_associations_auto_create(false) do
         create_tables(
           "posts", {}, {},
-          "comments", {}, { :post_id => {foreign_key: true} }
+          "comments", {}, { post_id: {foreign_key: true} }
         )
-        class Post < ActiveRecord::Base
-          schema_associations :auto_create => true
+        stub_model('Post') do
+          schema_associations auto_create: true
         end
-        class Comment < ActiveRecord::Base ; end
+        stub_model('Comment')
         expect(Post.reflect_on_association(:comments)).not_to be_nil
         expect(Comment.reflect_on_association(:post)).to be_nil
       end
@@ -203,12 +209,12 @@ describe ActiveRecord::Base do
       with_associations_auto_create(false) do
         create_tables(
           "posts", {}, {},
-          "comments", {}, { :post_id => {foreign_key: true} }
+          "comments", {}, { post_id: {foreign_key: true} }
         )
-        class Post < ActiveRecord::Base
+        stub_model('Post') do
           schema_associations
         end
-        class Comment < ActiveRecord::Base ; end
+        stub_model('Comment')
         expect(Post.reflect_on_association(:comments)).not_to be_nil
         expect(Comment.reflect_on_association(:post)).to be_nil
       end
@@ -220,10 +226,10 @@ describe ActiveRecord::Base do
     before(:each) do
       create_tables(
         "posts", {}, {},
-        "comments", {}, { :post_id => {foreign_key: true, :index => { :unique => true} } }
+        "comments", {}, { post_id: {foreign_key: true, index: { unique: true} } }
       )
-      class Post < ActiveRecord::Base ; end
-      class Comment < ActiveRecord::Base ; end
+      stub_model('Post')
+      stub_model('Comment')
     end
     it "should create has_one association" do
       reflection = Post.reflect_on_association(:comment)
@@ -247,10 +253,10 @@ describe ActiveRecord::Base do
     before(:each) do
       create_tables(
         "posts", {}, {},
-        "comments", {}, { :subject_post_id => { foreign_key: { references: "posts" }} }
+        "comments", {}, { subject_post_id: { foreign_key: { references: "posts" }} }
       )
-      class Post < ActiveRecord::Base ; end
-      class Comment < ActiveRecord::Base ; end
+      stub_model('Post')
+      stub_model('Comment')
     end
     it "should name belongs_to according to column" do
       reflection = Comment.reflect_on_association(:subject_post)
@@ -275,10 +281,10 @@ describe ActiveRecord::Base do
     before(:each) do
       create_tables(
         "posts", {}, {},
-        "comments", {}, { :post_cited => { foreign_key: {references: "posts" }} }
+        "comments", {}, { post_cited: { foreign_key: {references: "posts" }} }
       )
-      class Post < ActiveRecord::Base ; end
-      class Comment < ActiveRecord::Base ; end
+      stub_model('Post')
+      stub_model('Comment')
     end
     it "should name belongs_to according to column" do
       reflection = Comment.reflect_on_association(:post_cited)
@@ -303,10 +309,10 @@ describe ActiveRecord::Base do
     before(:each) do
       create_tables(
         "posts", {}, {},
-        "comments", {}, { :subject => {foreign_key: { references: "posts" }} }
+        "comments", {}, { subject: {foreign_key: { references: "posts" }} }
       )
-      class Post < ActiveRecord::Base ; end
-      class Comment < ActiveRecord::Base ; end
+      stub_model('Post')
+      stub_model('Comment')
     end
     it "should name belongs_to according to column" do
       reflection = Comment.reflect_on_association(:subject)
@@ -328,13 +334,18 @@ describe ActiveRecord::Base do
   end
 
   it "maps table prefix" do
-    with_associations_config(:table_prefix_map => { "wooga_" => "Happy"} ) do
+    with_associations_config(table_prefix_map: { "wooga_" => "Happy"} ) do
       create_tables(
         "wooga_posts", {}, {},
-        "wooga_comments", {}, { :wooga_post_id => { foreign_key: true} }
+        "wooga_comments", {}, { wooga_post_id: { foreign_key: true} }
       )
-      class HappyPost < ActiveRecord::Base ; self.table_name = 'wooga_posts' ; end
-      class HappyComment < ActiveRecord::Base ; self.table_name = 'wooga_comments' ; end
+      stub_model('HappyPost') do
+        self.table_name = 'wooga_posts'
+      end
+      stub_model('HappyComment') do
+        self.table_name = 'wooga_comments'
+      end
+
       # Kernel.warn HappyPost.reflect_on_all_associations.inspect
       expect(HappyComment.reflect_on_association(:post).class_name).to eq("HappyPost")
       expect(HappyPost.reflect_on_association(:comments).class_name).to eq("HappyComment")
@@ -345,10 +356,10 @@ describe ActiveRecord::Base do
     before(:each) do
       create_tables(
         "posts", {}, {},
-        "comments", {}, { :post_id => { foreign_key: true} }
+        "comments", {}, { post_id: { foreign_key: true} }
       )
-      class Post < ActiveRecord::Base ; end
-      class Comment < ActiveRecord::Base ; end
+      stub_model('Post')
+      stub_model('Comment')
     end
     it "should create unordered has_many association" do
       reflection = Post.reflect_on_association(:comments)
@@ -365,10 +376,10 @@ describe ActiveRecord::Base do
     before(:each) do
       create_tables(
         "posts", {}, {},
-        "comments", {}, { :post_id => {foreign_key: true}, :position => {} }
+        "comments", {}, { post_id: {foreign_key: true}, position: {} }
       )
-      class Post < ActiveRecord::Base ; end
-      class Comment < ActiveRecord::Base ; end
+      stub_model('Post')
+      stub_model('Comment')
     end
     it "should create ordered has_many association" do
       reflection = Post.reflect_on_association(:comments)
@@ -388,10 +399,10 @@ describe ActiveRecord::Base do
     before(:each) do
       create_tables(
         "posts", {}, {},
-        "comments", {}, { :post_id => {}, :position => {} }
+        "comments", {}, { post_id: {}, position: {} }
       )
-      class Post < ActiveRecord::Base ; end
-      class Comment < ActiveRecord::Base
+      stub_model('Post')
+      stub_model('Comment') do
         scope :simple_scope, lambda { order(:id) }
       end
     end
@@ -405,10 +416,10 @@ describe ActiveRecord::Base do
     before(:each) do
       create_tables(
         "posts", {}, {},
-        "comments", {}, { :post_id => {}, :position => {} }
+        "comments", {}, { post_id: {}, position: {} }
       )
-      class Post < ActiveRecord::Base ; end
-      class Comment < ActiveRecord::Base
+      stub_model('Post')
+      stub_model('Comment') do
         scope :simple_scope, lambda { order(:id).includes(:post) }
       end
     end
@@ -424,21 +435,21 @@ describe ActiveRecord::Base do
 
     before(:each) do
       create_tables(
-        "nodes", {}, { :parent_id => { foreign_key: true} }
+        "nodes", {}, { parent_id: { foreign_key: true} }
       )
     end
 
     it "should use children as the inverse of parent" do
-      class Node < ActiveRecord::Base ; end
+      stub_model('Node')
       reflection = Node.reflect_on_association(:children)
       expect(reflection).not_to be_nil
     end
 
     it "should use child as the singular inverse of parent" do
       migration.suppress_messages do
-        migration.add_index(:nodes, :parent_id, :unique => true)
+        migration.add_index(:nodes, :parent_id, unique: true)
       end
-      class Node < ActiveRecord::Base ; end
+      stub_model('Node')
       reflection = Node.reflect_on_association(:child)
       expect(reflection).not_to be_nil
     end
@@ -450,32 +461,32 @@ describe ActiveRecord::Base do
     def prefix_one
       create_tables(
         "posts", {}, {},
-        "post_comments", {}, { :post_id => { foreign_key: true} }
+        "post_comments", {}, { post_id: { foreign_key: true} }
       )
-      Object.const_set(:Post, Class.new(ActiveRecord::Base))
-      Object.const_set(:PostComment, Class.new(ActiveRecord::Base))
+      stub_model('Post')
+      stub_model('PostComment')
     end
 
     def suffix_one
       create_tables(
         "posts", {}, {},
-        "comment_posts", {}, { :post_id => { foreign_key: true} }
+        "comment_posts", {}, { post_id: { foreign_key: true} }
       )
-      Object.const_set(:Post, Class.new(ActiveRecord::Base))
-      Object.const_set(:CommentPost, Class.new(ActiveRecord::Base))
+      stub_model('Post')
+      stub_model('PostComment')
     end
 
     def prefix_both
       create_tables(
         "blog_page_posts", {}, {},
-        "blog_page_comments", {}, { :blog_page_post_id => { foreign_key: true} }
+        "blog_page_comments", {}, { blog_page_post_id: { foreign_key: true} }
       )
-      Object.const_set(:BlogPagePost, Class.new(ActiveRecord::Base))
-      Object.const_set(:BlogPageComment, Class.new(ActiveRecord::Base))
+      stub_model('BlogPagePost')
+      stub_model('BlogPageComment')
     end
 
     it "should use concise association name for one prefix" do
-      with_associations_config(:auto_create => true, :concise_names => true) do
+      with_associations_config(auto_create: true, concise_names: true) do
         prefix_one
         reflection = Post.reflect_on_association(:comments)
         expect(reflection).not_to be_nil
@@ -487,7 +498,7 @@ describe ActiveRecord::Base do
     end
 
     it "should use concise association name for one suffix" do
-      with_associations_config(:auto_create => true, :concise_names => true) do
+      with_associations_config(auto_create: true, concise_names: true) do
         suffix_one
         reflection = Post.reflect_on_association(:comments)
         expect(reflection).not_to be_nil
@@ -499,7 +510,7 @@ describe ActiveRecord::Base do
     end
 
     it "should use concise association name for shared prefixes" do
-      with_associations_config(:auto_create => true, :concise_names => true) do
+      with_associations_config(auto_create: true, concise_names: true) do
         prefix_both
         reflection = BlogPagePost.reflect_on_association(:comments)
         expect(reflection).not_to be_nil
@@ -511,7 +522,7 @@ describe ActiveRecord::Base do
     end
 
     it "should use full names and not concise names when so configured" do
-      with_associations_config(:auto_create => true, :concise_names => false) do
+      with_associations_config(auto_create: true, concise_names: false) do
         prefix_one
         reflection = Post.reflect_on_association(:post_comments)
         expect(reflection).not_to be_nil
@@ -525,7 +536,7 @@ describe ActiveRecord::Base do
     end
 
     it "should use concise names and not full names when so configured" do
-      with_associations_config(:auto_create => true, :concise_names => true) do
+      with_associations_config(auto_create: true, concise_names: true) do
         prefix_one
         reflection = Post.reflect_on_association(:comments)
         expect(reflection).not_to be_nil
@@ -546,10 +557,10 @@ describe ActiveRecord::Base do
       create_tables(
         "posts", {}, {},
         "tags", {}, {},
-        "posts_tags", {:id => false}, { :post_id => { foreign_key: true}, :tag_id => { foreign_key: true}}
+        "posts_tags", {id: false}, { post_id: { foreign_key: true}, tag_id: { foreign_key: true}}
       )
-      class Post < ActiveRecord::Base ; end
-      class Tag < ActiveRecord::Base ; end
+      stub_model('Post')
+      stub_model('Tag')
     end
     it "should create has_and_belongs_to_many association" do
       reflection = Post.reflect_on_association(:tags)
@@ -564,13 +575,13 @@ describe ActiveRecord::Base do
     before(:each) do
       create_tables(
           "users", {}, {},
-          "posts", {}, { :user_id => { foreign_key: true}},
-          "comments", {}, { :post_id => { foreign_key: true}},
+          "posts", {}, { user_id: { foreign_key: true}},
+          "comments", {}, { post_id: { foreign_key: true}},
       )
-      class Post < ActiveRecord::Base; end
-      class Comment < ActiveRecord::Base; end
-      class User < ActiveRecord::Base
-        has_many :comments, :through => :posts
+      stub_model('Post')
+      stub_model('Comment')
+      stub_model('User') do
+        has_many :comments, through: :posts
       end
     end
 
@@ -591,37 +602,37 @@ describe ActiveRecord::Base do
     before(:each) do
       create_tables(
         "types", {}, {},
-        "posts", {}, {:type_id => { foreign_key: true}}
+        "posts", {}, {type_id: { foreign_key: true}}
       )
     end
     it "should define association normally if no existing method is defined" do
-      class Type < ActiveRecord::Base ; end
+      stub_model('Type')
       expect(Type.reflect_on_association(:posts)).not_to be_nil # sanity check for this context
     end
     it "should not define association over existing public method" do
-      class Type < ActiveRecord::Base
-        def posts
+      stub_model('Type') do
+        define_method(:posts) do
           :existing
         end
       end
       expect(Type.reflect_on_association(:posts)).to be_nil
     end
     it "should not define association over existing private method" do
-      class Type < ActiveRecord::Base
-        private
-        def posts
+      stub_model('Type') do
+        define_method(:posts) do
           :existing
         end
+        private :posts
       end
       expect(Type.reflect_on_association(:posts)).to be_nil
     end
     it "should define association :type over (deprecated) kernel method" do
-      class Post < ActiveRecord::Base ; end
+      stub_model('Post')
       expect(Post.reflect_on_association(:type)).not_to be_nil
     end
     it "should not define association :type over model method" do
-      class Post < ActiveRecord::Base
-        def type
+      stub_model('Post') do
+        define_method(:type) do
           :existing
         end
       end
@@ -633,16 +644,16 @@ describe ActiveRecord::Base do
     before(:each) do
       create_tables(
         "posts", {}, {},
-        "comments", {}, { :post_id => { foreign_key: true}, :type => {coltype: :string} },
+        "comments", {}, { post_id: { foreign_key: true}, type: {coltype: :string} },
         "citers", {}, {},
-        "citations", {}, { :comment_id => { foreign_key: true}, :citer_id => { foreign_key: true}}
+        "citations", {}, { comment_id: { foreign_key: true}, citer_id: { foreign_key: true}}
       )
-      class Post < ActiveRecord::Base ; end
-      class Comment < ActiveRecord::Base ; end
-      class Citation < ActiveRecord::Base ; end
-      class SubComment < Comment ; end
-      class OwnComment < Comment
-        has_one :citer, :through => :citations
+      stub_model('Post')
+      stub_model('Comment')
+      stub_model('Citation')
+      stub_model('SubComment', Comment)
+      stub_model('OwnComment', Comment) do
+        has_one :citer, through: :citations
       end
     end
 
@@ -661,8 +672,10 @@ describe ActiveRecord::Base do
       create_tables(
         "posts", {}, {}
       )
-      class PostBase < ActiveRecord::Base ; self.abstract_class = true ; end
-      class Post < PostBase ; end
+      stub_model('PostBase') do
+        self.abstract_class = true
+      end
+      stub_model('Post', PostBase)
     end
 
     it "should skip abstract classes" do
@@ -683,10 +696,10 @@ describe ActiveRecord::Base do
       before(:each) do
         create_tables(
           "posts", {}, {},
-          "comments", {}, { :post_id => { foreign_key: true} }
+          "comments", {}, { post_id: { foreign_key: true} }
         )
-        class Post < ActiveRecord::Base ; end
-        class Comment < ActiveRecord::Base ; end
+        stub_model('Post')
+        stub_model('Comment')
       end
 
       it "should define associations before needed by relation" do
@@ -698,7 +711,7 @@ describe ActiveRecord::Base do
   protected
 
   def with_associations_auto_create(value, &block)
-    with_associations_config(:auto_create => value, &block)
+    with_associations_config(auto_create: value, &block)
   end
 
   def with_associations_config(opts, &block)
@@ -715,7 +728,7 @@ describe ActiveRecord::Base do
 
   def create_tables(*table_defs)
     ActiveRecord::Migration.suppress_messages do
-      ActiveRecord::Base.connection.tables_only.each do |table|
+      ActiveRecord::Base.connection.tables.sort.each do |table|
         ActiveRecord::Migration.drop_table table, force: :cascade
       end
       table_defs.each_slice(3) do |table_name, opts, columns_with_options|

data/spec/spec_helper.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 require 'simplecov'
-SimpleCov.start
+SimpleCov.start unless SimpleCov.running
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
@@ -12,16 +14,6 @@ require 'schema_dev/rspec'
 
 SchemaDev::Rspec::setup
 
-Dir[File.dirname(__FILE__) + "/support/**/*.rb"].each {|f| require f}
-
-def remove_all_models
-    ObjectSpace.each_object(Class) do |c|
-      next unless c.ancestors.include? ActiveRecord::Base
-      next if c == ActiveRecord::Base
-      next if c.name.blank?
-      c.destroy_all rescue nil
-      ActiveSupport::Dependencies.remove_constant c.name
-    end
-  end
+Dir[File.dirname(__FILE__) + "/support/**/*.rb"].each { |f| require f }
 
 SimpleCov.command_name "[Ruby #{RUBY_VERSION} - ActiveRecord #{::ActiveRecord::VERSION::STRING}]"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schema_associations
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Ronen Barzel
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-06 00:00:00.000000000 Z
+date: 2022-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -20,7 +20,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -30,21 +30,21 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: schema_plus_foreign_keys
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: valuable
   requirement: !ruby/object:Gem::Requirement
@@ -107,14 +107,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: 4.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: 4.2.0
 description: SchemaAssociations extends ActiveRecord to automatically create associations
   by inspecting the database schema.  This is more more DRY than the standard behavior,
   for which in addition to specifying the foreign key in the migration, you must also
@@ -143,6 +143,14 @@ files:
 - gemfiles/activerecord-6.0/Gemfile.mysql2
 - gemfiles/activerecord-6.0/Gemfile.postgresql
 - gemfiles/activerecord-6.0/Gemfile.sqlite3
+- gemfiles/activerecord-6.1/Gemfile.base
+- gemfiles/activerecord-6.1/Gemfile.mysql2
+- gemfiles/activerecord-6.1/Gemfile.postgresql
+- gemfiles/activerecord-6.1/Gemfile.sqlite3
+- gemfiles/activerecord-7.0/Gemfile.base
+- gemfiles/activerecord-7.0/Gemfile.mysql2
+- gemfiles/activerecord-7.0/Gemfile.postgresql
+- gemfiles/activerecord-7.0/Gemfile.sqlite3
 - init.rb
 - lib/schema_associations.rb
 - lib/schema_associations/active_record/associations.rb
@@ -150,7 +158,6 @@ files:
 - schema_associations.gemspec
 - schema_dev.yml
 - spec/association_spec.rb
-- spec/schema_associations.sqlite3
 - spec/spec_helper.rb
 homepage: https://github.com/SchemaPlus/schema_associations
 licenses: []
@@ -170,12 +177,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: ActiveRecord extension that automatically (DRY) creates associations based
   on the schema
 test_files:
 - spec/association_spec.rb
-- spec/schema_associations.sqlite3
 - spec/spec_helper.rb