with_model 2.1.6 → 2.2.0

data/spec/with_model_spec.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require 'active_model'
-require 'spec_helper'
+require "active_model"
+require "spec_helper"
 
-shared_examples_for 'ActiveModel' do
-  require 'active_model/lint'
+shared_examples_for "ActiveModel" do
+  require "active_model/lint"
   include SpecHelper::RailsTestCompatibility
   include ActiveModel::Lint::Tests
 
@@ -12,7 +12,8 @@ shared_examples_for 'ActiveModel' do
   active_model_lint_tests = active_model_methods.map(&:to_s).grep(/^test/)
 
   active_model_lint_tests.each do |method_name|
-    friendly_name = method_name.tr('_', ' ')
+    friendly_name = method_name.tr("_", " ")
+
     example friendly_name do
       public_send method_name.to_sym
     end
@@ -21,14 +22,14 @@ shared_examples_for 'ActiveModel' do
   before { @model = subject }
 end
 
-describe 'a temporary ActiveRecord model created with with_model' do
+describe "a temporary ActiveRecord model created with with_model" do
   non_shadowing_example_ran = false
 
   describe "which doesn't shadow an existing class" do
     with_model :BlogPost do
       table do |t|
-        t.string 'title'
-        t.text 'content'
+        t.string "title"
+        t.text "content"
         t.timestamps null: false
       end
 
@@ -43,13 +44,13 @@ describe 'a temporary ActiveRecord model created with with_model' do
       non_shadowing_example_ran = true
     end
 
-    it 'acts like a normal ActiveRecord model' do
-      record = BlogPost.create!(title: 'New blog post', content: 'Hello, world!')
+    it "acts like a normal ActiveRecord model" do
+      record = BlogPost.create!(title: "New blog post", content: "Hello, world!")
 
       record.reload
 
-      expect(record.title).to eq 'New blog post'
-      expect(record.content).to eq 'Hello, world!'
+      expect(record.title).to eq "New blog post"
+      expect(record.content).to eq "Hello, world!"
       expect(record.updated_at).to be_present
 
       record.destroy
@@ -57,123 +58,126 @@ describe 'a temporary ActiveRecord model created with with_model' do
       expect { record.reload }.to raise_error(ActiveRecord::RecordNotFound)
     end
 
-    describe 'the class' do
+    describe "the class" do
       subject { BlogPost.new }
 
-      it_behaves_like 'ActiveModel'
+      it_behaves_like "ActiveModel"
     end
 
-    it 'has the methods defined in its model block' do
-      expect(BlogPost.new(title: 'New blog post').fancy_title).to eq 'Title: New blog post'
+    it "has the methods defined in its model block" do
+      expect(BlogPost.new(title: "New blog post").fancy_title).to eq "Title: New blog post"
     end
 
-    it 'defines a constant' do
+    it "defines a constant" do
       expect(BlogPost).to be_a(Class)
     end
 
-    describe '.with_model?' do
-      it 'returns true' do
-        expect(BlogPost.with_model?).to eq true
+    describe ".with_model?" do
+      it "returns true" do
+        expect(BlogPost.with_model?).to be true
       end
     end
 
-    it 'is its own base_class' do
+    it "is its own base_class" do
       expect(BlogPost.base_class).to eq BlogPost
     end
   end
 
-  context 'after an example which uses with_model without shadowing an existing constant' do
-    it 'returns the constant to its undefined state' do
-      expect(non_shadowing_example_ran).to eq true
+  context "after an example which uses with_model without shadowing an existing constant" do
+    it "returns the constant to its undefined state" do
+      expect(non_shadowing_example_ran).to be true
       expect(defined?(BlogPost)).to be_falsy
     end
   end
 
-  describe 'constant restoration' do
-    before { stub_const('MyConst', 1) }
+  describe "constant restoration" do
+    before { stub_const("MyConst", 1) }
 
     shadowing_example_ran = false
 
-    context 'with the with_model block' do
+    context "with the with_model block" do
       with_model :MyConst
 
       after do
         shadowing_example_ran = true
       end
 
-      it 'shadows that constant' do
+      it "shadows that constant" do
         expect(MyConst).to be_a(Class)
       end
     end
 
-    context 'without the with_model block' do
-      it 'returns the constant to its original value' do
-        expect(shadowing_example_ran).to eq true
+    context "without the with_model block" do
+      it "returns the constant to its original value" do
+        expect(shadowing_example_ran).to be true
         expect(MyConst).to eq 1
       end
     end
   end
 
-  describe 'with a plural name' do
+  describe "with a plural name" do
     with_model :BlogPosts
 
-    it 'does not singularize the constant name' do
+    it "does not singularize the constant name" do
       expect(BlogPosts).to be
       expect(-> { BlogPost }).to raise_error(NameError)
     end
   end
 
-  describe 'with a name containing capital letters' do
+  describe "with a name containing capital letters" do
     with_model :BlogPost
 
-    it 'tableizes the table name' do
+    it "tableizes the table name" do
       expect(BlogPost.table_name).to match(/_blog_posts_/)
       expect(BlogPost.table_name).to eq BlogPost.table_name.downcase
     end
   end
 
-  describe 'with a name with underscores' do
+  describe "with a name with underscores" do
     with_model :blog_post
 
-    it 'constantizes the name' do
+    it "constantizes the name" do
       expect(BlogPost).to be
     end
 
-    it 'tableizes the table name' do
+    it "tableizes the table name" do
       expect(BlogPost.table_name).to match(/_blog_posts_/)
       expect(BlogPost.table_name).to eq BlogPost.table_name.downcase
     end
   end
 
-  describe 'with a name which is namespaced' do
-    before { stub_const('Stuff', Module.new) }
+  describe "with a name which is namespaced" do
+    before { stub_const("Stuff", Module.new) }
 
-    with_model :'Stuff::BlogPost'
+    with_model :"Stuff::BlogPost"
 
-    it 'creates the model in the namespace' do
-      expect(defined?(::BlogPost)).to be_falsey
-      expect(defined?(::Stuff::BlogPost)).to be_truthy
+    it "creates the model in the namespace" do
+      expect(defined?(BlogPost)).to be_falsey
+      expect(defined?(Stuff::BlogPost)).to be_truthy
     end
   end
 
-  describe 'using the constant in the model block' do
+  describe "using the constant in the model block" do
     with_model :BlogPost do
       model do
-        raise 'I am not myself!' unless self == BlogPost
+        raise "I am not myself!" unless self == BlogPost
       end
     end
 
-    it 'is available' do
+    it "is available" do
       expect(BlogPost).to be
     end
   end
 
-  context 'with a mixin' do
+  context "with a mixin" do
     let(:mixin) do
-      Module.new { def foo; end }
+      Module.new {
+        def foo
+        end
+      }
     end
 
-    before { stub_const('AMixin', mixin) }
+    before { stub_const("AMixin", mixin) }
 
     with_model :WithAMixin do
       model do
@@ -181,108 +185,109 @@ describe 'a temporary ActiveRecord model created with with_model' do
       end
     end
 
-    it 'has the mixin' do
-      expect(-> { ::WithAMixin.new.foo }).not_to raise_error
-      expect(::WithAMixin.include?(AMixin)).to eq true
+    it "has the mixin" do
+      expect(-> { WithAMixin.new.foo }).not_to raise_error
+      expect(WithAMixin.include?(AMixin)).to be true
     end
   end
 
-  context 'with a mixin that has a class_eval' do
+  context "with a mixin that has a class_eval" do
     subject { WithAClassEval.new }
 
     let(:mixin) do
       Module.new do
         def self.included(klass)
           klass.class_eval do
-            after_save { |object| object.my_method } # rubocop:disable Style/SymbolProc
+            after_save { |object| object.my_method }
           end
         end
       end
     end
 
-    before { stub_const('AMixin', mixin) }
+    before { stub_const("AMixin", mixin) }
 
     with_model :WithAClassEval do
       model do
         include AMixin
-        def my_method; end
+        def my_method
+        end
       end
     end
 
-    it 'only has one after_save callback' do
+    it "only has one after_save callback" do
       expect(subject).to receive(:my_method).once
       subject.save
     end
 
-    it 'still only has one after_save callback in future tests' do
+    it "still only has one after_save callback in future tests" do
       expect(subject).to receive(:my_method).once
       subject.save
     end
   end
 
-  context 'with table options' do
+  context "with table options" do
     with_model :WithOptions do
       table id: false do |t|
-        t.string 'foo'
+        t.string "foo"
         t.timestamps null: false
       end
     end
 
-    it 'respects the additional options' do
-      expect(WithOptions.columns.map(&:name)).not_to include('id')
+    it "respects the additional options" do
+      expect(WithOptions.columns.map(&:name)).not_to include("id")
     end
   end
 
-  context 'without a block' do
+  context "without a block" do
     with_model :BlogPost
 
-    it 'acts like a normal ActiveRecord model' do
+    it "acts like a normal ActiveRecord model" do
       record = BlogPost.create!
       record.reload
       record.destroy
       expect { record.reload }.to raise_error(ActiveRecord::RecordNotFound)
     end
 
-    describe 'the class' do
+    describe "the class" do
       subject { BlogPost.new }
 
-      it_behaves_like 'ActiveModel'
+      it_behaves_like "ActiveModel"
     end
   end
 
-  context 'with an empty block' do
-    with_model(:BlogPost) {} # rubocop:disable Lint/EmptyBlock
+  context "with an empty block" do
+    with_model(:BlogPost) {}
 
-    it 'acts like a normal ActiveRecord model' do
+    it "acts like a normal ActiveRecord model" do
       record = BlogPost.create!
       record.reload
       record.destroy
       expect { record.reload }.to raise_error(ActiveRecord::RecordNotFound)
     end
 
-    describe 'the class' do
+    describe "the class" do
       subject { BlogPost.new }
 
-      it_behaves_like 'ActiveModel'
+      it_behaves_like "ActiveModel"
     end
   end
 
-  context 'without a model block' do
+  context "without a model block" do
     with_model :BlogPost do
       table do |t|
-        t.string 'title'
-        t.text 'content'
+        t.string "title"
+        t.text "content"
         t.timestamps null: false
       end
     end
 
-    it 'acts like a normal ActiveRecord model' do
-      record = BlogPost.create!(title: 'New blog post', content: 'Hello, world!')
+    it "acts like a normal ActiveRecord model" do
+      record = BlogPost.create!(title: "New blog post", content: "Hello, world!")
 
       record.reload
 
-      expect(record.title).to eq 'New blog post'
-      expect(record.content).to eq 'Hello, world!'
+      expect(record.title).to eq "New blog post"
+      expect(record.content).to eq "Hello, world!"
       expect(record.updated_at).to be_present
 
       record.destroy
@@ -290,56 +295,32 @@ describe 'a temporary ActiveRecord model created with with_model' do
       expect { record.reload }.to raise_error(ActiveRecord::RecordNotFound)
     end
 
-    describe 'the class' do
+    describe "the class" do
       subject { BlogPost.new }
 
-      it_behaves_like 'ActiveModel'
+      it_behaves_like "ActiveModel"
     end
   end
 
-  context 'without a table or model block' do
+  context "without a table or model block" do
     with_model :BlogPost
 
-    it 'acts like a normal ActiveRecord model' do
-      expect(BlogPost.columns.map(&:name)).to eq ['id']
+    it "acts like a normal ActiveRecord model" do
+      expect(BlogPost.columns.map(&:name)).to eq ["id"]
       record = BlogPost.create!
       record.reload
       record.destroy
       expect { record.reload }.to raise_error(ActiveRecord::RecordNotFound)
     end
 
-    describe 'the class' do
+    describe "the class" do
       subject { BlogPost.new }
 
-      it_behaves_like 'ActiveModel'
+      it_behaves_like "ActiveModel"
     end
   end
 
-  context 'with ActiveSupport::DescendantsTracker' do
-    with_model :BlogPost do
-      model do
-        def self.inspect
-          "BlogPost class #{object_id}"
-        end
-      end
-    end
-
-    def blog_post_classes
-      ActiveRecord::Base.descendants.select do |c|
-        c.table_name == BlogPost.table_name
-      end
-    end
-
-    it 'includes the correct model class in descendants on the first test run' do
-      expect(blog_post_classes).to eq [BlogPost]
-    end
-
-    it 'includes the correct model class in descendants on the second test run' do
-      expect(blog_post_classes).to eq [BlogPost]
-    end
-  end
-
-  context 'with_model can be run within RSpec :all hook' do
+  context "with_model can be run within RSpec :all hook" do
     with_model :BlogPost, scope: :all do
       table do |t|
         t.string :title
@@ -350,42 +331,55 @@ describe 'a temporary ActiveRecord model created with with_model' do
       BlogPost.create # without scope: :all these will fail
     end
 
-    it 'has been initialized within before(:all)' do
+    it "has been initialized within before(:all)" do
       expect(BlogPost.count).to eq 1
     end
   end
 
   context "with 'superclass' option" do
-    class BlogPostParent < ActiveRecord::Base
+    class BlogPostParent < ActiveRecord::Base # standard:disable Lint/ConstantDefinitionInBlock
       self.abstract_class = true
     end
 
-    after(:all) do
-      Object.__send__(:remove_const, 'BlogPostParent')
-    end
-
     with_model :BlogPost, superclass: BlogPostParent do
       table do |t|
-        t.string 'title'
+        t.string "title"
       end
     end
 
-    describe 'the class' do
+    describe "the class" do
       subject { BlogPost.new }
 
-      it_behaves_like 'ActiveModel'
+      it_behaves_like "ActiveModel"
     end
 
-    it 'is a subclass of the supplied superclass' do
-      expect(BlogPost < BlogPostParent).to eq true
+    it "is a subclass of the supplied superclass" do
+      expect(BlogPost < BlogPostParent).to be true
     end
 
-    it 'is its own base_class' do
+    it "is its own base_class" do
       expect(BlogPost.base_class).to eq BlogPost
     end
 
-    it 'responds to .with_model? with true' do
-      expect(BlogPost.with_model?).to eq true
+    it "responds to .with_model? with true" do
+      expect(BlogPost.with_model?).to be true
+    end
+  end
+
+  context "with 'superclass' that connects to a different database" do
+    class ApplicationRecordInDifferentDatabase < ActiveRecord::Base # standard:disable Lint/ConstantDefinitionInBlock
+      self.abstract_class = true
+      establish_connection(ActiveRecord::Base.connection_pool.db_config.configuration_hash)
+    end
+
+    with_model :BlogPost, superclass: ApplicationRecordInDifferentDatabase do
+      table do |t|
+        t.string "title"
+      end
+    end
+
+    it "uses the superclass connection" do
+      expect(BlogPost.connection.tables).to include(BlogPost.table_name)
     end
   end
 end

data/test/test_helper.rb

@@ -1,28 +1,17 @@
 # frozen_string_literal: true
 
-$LOAD_PATH.unshift File.expand_path('../lib', __dir__)
+$LOAD_PATH.unshift File.expand_path("../lib", __dir__)
 
-# Workaround for JRuby CI failure https://github.com/jruby/jruby/issues/6547#issuecomment-774104996
-if RUBY_ENGINE == 'jruby'
-  require 'i18n/backend'
-  require 'i18n/backend/simple'
-end
-
-require 'with_model'
-require 'minitest/autorun'
+require "with_model"
+require "minitest/autorun"
 
 WithModel.runner = :minitest
 
-module MiniTest
-  class Test
-    extend WithModel
-  end
+Minitest::Test.class_eval do
+  extend WithModel
 end
 
-is_jruby = RUBY_PLATFORM == 'java'
-adapter = is_jruby ? 'jdbcsqlite3' : 'sqlite3'
-
 # WithModel requires ActiveRecord::Base.connection to be established.
 # If ActiveRecord already has a connection, as in a Rails app, this is unnecessary.
-require 'active_record'
-ActiveRecord::Base.establish_connection(adapter: adapter, database: ':memory:')
+require "active_record"
+ActiveRecord::Base.establish_connection(adapter: "sqlite3", database: ":memory:")

data/test/with_model_test.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require 'test_helper'
+require "test_helper"
 
-class WithModelTest < MiniTest::Test
+class WithModelTest < Minitest::Test
   with_model :BlogPost do
     table do |t|
-      t.string 'title'
-      t.text 'content'
+      t.string "title"
+      t.text "content"
       t.timestamps null: false
     end
 
@@ -17,13 +17,13 @@ class WithModelTest < MiniTest::Test
     end
   end
 
-  def test_it_should_act_like_a_normal_active_record_model # rubocop:disable Minitest/MultipleAssertions
-    record = BlogPost.create!(title: 'New blog post', content: 'Hello, world!')
+  def test_it_should_act_like_a_normal_active_record_model
+    record = BlogPost.create!(title: "New blog post", content: "Hello, world!")
 
     record.reload
 
-    assert_equal 'New blog post', record.title
-    assert_equal 'Hello, world!', record.content
+    assert_equal "New blog post", record.title
+    assert_equal "Hello, world!", record.content
     assert record.updated_at
 
     record.destroy
@@ -34,6 +34,6 @@ class WithModelTest < MiniTest::Test
   end
 
   def test_it_has_the_methods_defined_in_its_model_block
-    assert_equal 'Title: New blog post', BlogPost.new(title: 'New blog post').fancy_title
+    assert_equal "Title: New blog post", BlogPost.new(title: "New blog post").fancy_title
   end
 end

data/with_model.gemspec

@@ -1,43 +1,24 @@
 # frozen_string_literal: true
 
-$LOAD_PATH.push File.expand_path('lib', __dir__)
-require 'with_model/version'
+$LOAD_PATH.push File.expand_path("lib", __dir__)
+require "with_model/version"
 
 Gem::Specification.new do |spec|
-  spec.name        = 'with_model'
-  spec.version     = WithModel::VERSION
-  spec.authors     = ['Case Commons, LLC', 'Grant Hutchins', 'Andrew Marshall']
-  spec.email       = %w[casecommons-dev@googlegroups.com gems@nertzy.com andrew@johnandrewmarshall.com]
-  spec.homepage    = 'https://github.com/Casecommons/with_model'
-  spec.summary     = 'Dynamically build a model within an RSpec context'
+  spec.name = "with_model"
+  spec.version = WithModel::VERSION
+  spec.authors = ["Case Commons, LLC", "Grant Hutchins", "Andrew Marshall"]
+  spec.email = %w[casecommons-dev@googlegroups.com gems@nertzy.com andrew@johnandrewmarshall.com]
+  spec.homepage = "https://github.com/Casecommons/with_model"
+  spec.summary = "Dynamically build a model within an RSpec context"
   spec.description = spec.summary
-  spec.license     = 'MIT'
-  spec.metadata['rubygems_mfa_required'] = 'true'
+  spec.license = "MIT"
+  spec.metadata["rubygems_mfa_required"] = "true"
 
-  spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ['lib']
+  spec.files = `git ls-files -z`.split("\x0")
+  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = '>= 2.6'
+  spec.required_ruby_version = ">= 3.1"
 
-  spec.add_dependency 'activerecord', '>= 5.2'
-
-  spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'minitest'
-  spec.add_development_dependency 'pry'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'rubocop'
-  spec.add_development_dependency 'rubocop-minitest'
-  spec.add_development_dependency 'rubocop-rake'
-  spec.add_development_dependency 'rubocop-rspec'
-  spec.add_development_dependency 'simplecov'
-  spec.add_development_dependency 'yard'
-
-  if RUBY_PLATFORM == 'java'
-    spec.add_development_dependency 'activerecord-jdbcsqlite3-adapter'
-  else
-    spec.add_development_dependency 'sqlite3'
-  end
+  spec.add_dependency "activerecord", ">= 7.0"
 end