with_model 2.1.2 → 2.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73d3473a8847088dfb50b96f339306c6b853b78d1be908aee3dfbae594df8c5a
-  data.tar.gz: c3c48245f7ec06041f9c99cac9e72e0e490760451bd936a36bf05f274cc75eef
+  metadata.gz: b6da93806455c916606077722ee10e9e5f0fd4ec785471288d210949b3891507
+  data.tar.gz: dad3a97b161ccb4d1256402eb7ebffd6746db155094dbd2341e2d860428f9437
 SHA512:
-  metadata.gz: 1d2dbbf33bb33961595848a2974166610a1afc557a8cbf3e460c53a0793278f2132114fbbb5ac396866ec2e736de9067542daf52aaa4283293e1886c65a3b585
-  data.tar.gz: 154318219e3adfa3469e60041c1f8559c3912481f278cc01c117856374f1ac5aee1d32b711d2fc5eb44e3946fc374ce48ce8f3d80c750109f0db25c71a2308cd
+  metadata.gz: 4f83311c48f5472bd2e3f0d00ddb58fedd14de54d483c06ac1594fdfb26c7344174eb92e3dd28593a4b99b582b5872f3a92941a681a2116e244625f18fa4759d
+  data.tar.gz: fc9044c0f5e92d9ec0351d3ce912df3cdc3bc4aeddb238ec7d1258f6e63620c3caaaaa65ebf79ce639c2fa9aea2dcb44b098fa57b421d96483e825ad047ae57f

data/.github/workflows/ci.yml

@@ -0,0 +1,61 @@
+name: build
+
+on:
+  push:
+    branches:
+      - master
+      - github-actions
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    env:
+      CI: true
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby-version: ['2.6', '2.7', '3.0', '3.1']
+        active-record-version-env:
+          - ACTIVE_RECORD_VERSION="~> 5.2.0"
+          - ACTIVE_RECORD_VERSION="~> 6.0.0"
+          - ACTIVE_RECORD_VERSION="~> 6.1.0"
+          - ACTIVE_RECORD_VERSION="~> 7.0.0"
+        allow-failure: [false]
+        include:
+          - ruby-version: '3.1'
+            active-record-version-env: ACTIVE_RECORD_VERSION="~> 7.0.0"
+            allow-failure: true
+          - ruby-version: '3.1'
+            active-record-version-env: ACTIVE_RECORD_BRANCH="7-0-stable"
+            allow-failure: true
+          - ruby-version: '3.1'
+            active-record-version-env: ACTIVE_RECORD_BRANCH="6-1-stable"
+            allow-failure: true
+        exclude:
+          - ruby-version: '3.0'
+            active-record-version-env: ACTIVE_RECORD_VERSION="~> 5.2.0"
+            allow-failure: false
+          - ruby-version: '3.1'
+            active-record-version-env: ACTIVE_RECORD_VERSION="~> 5.2.0"
+            allow-failure: false
+          - ruby-version: '2.6'
+            active-record-version-env: ACTIVE_RECORD_VERSION="~> 7.0.0"
+            allow-failure: false
+          - ruby-version: '3.1'
+            active-record-version-env: ACTIVE_RECORD_VERSION="~> 7.0.0"
+            allow-failure: false
+    continue-on-error: ${{ matrix.allow-failure }}
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true
+    - name: Update bundle
+      run: ${{ matrix.active-record-version-env }} bundle update
+    - name: Run tests
+      run: ${{ matrix.active-record-version-env }} bundle exec rake

data/.jrubyrc

@@ -0,0 +1 @@
+debug.fullTrace=true

data/.rubocop.yml

@@ -1,6 +1,30 @@
-inherit_gem:
-  lint-config-ruby:
-    - default.yml
+inherit_from: .rubocop_todo.yml
+
+require:
+  - rubocop-rake
+  - rubocop-rspec
+  - rubocop-minitest
 
 AllCops:
-  TargetRubyVersion: 2.3
+  NewCops: enable
+  TargetRubyVersion: 2.6
+
+Metrics/BlockLength:
+  Exclude:
+    - 'spec/**/*'
+    - 'with_model.gemspec'
+
+Bundler/OrderedGems:
+  Enabled: false
+
+Bundler/DuplicatedGem:
+  Enabled: false
+
+RSpec/Be:
+  Enabled: false
+
+RSpec/BeforeAfterAll:
+  Enabled: false
+
+Style/Documentation:
+  Enabled: false

data/.rubocop_todo.yml

@@ -0,0 +1,78 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2020-11-22 01:30:26 UTC using RuboCop version 1.3.1.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 6
+# Configuration parameters: Prefixes.
+# Prefixes: when, with, without
+RSpec/ContextWording:
+  Exclude:
+    - 'spec/active_record_behaviors_spec.rb'
+    - 'spec/with_model_spec.rb'
+
+# Offense count: 6
+# Configuration parameters: IgnoredMetadata.
+RSpec/DescribeClass:
+  Exclude:
+    - 'spec/active_record_behaviors_spec.rb'
+    - 'spec/readme_spec.rb'
+    - 'spec/with_model_spec.rb'
+
+# Offense count: 5
+# Configuration parameters: Max.
+RSpec/ExampleLength:
+  Exclude:
+    - 'spec/active_record_behaviors_spec.rb'
+    - 'spec/readme_spec.rb'
+    - 'spec/with_model_spec.rb'
+
+# Offense count: 7
+# Configuration parameters: AssignmentOnly.
+RSpec/InstanceVariable:
+  Exclude:
+    - 'spec/active_record_behaviors_spec.rb'
+
+# Offense count: 2
+RSpec/LeakyConstantDeclaration:
+  Exclude:
+    - 'spec/readme_spec.rb'
+    - 'spec/with_model_spec.rb'
+
+# Offense count: 2
+# Configuration parameters: .
+# SupportedStyles: have_received, receive
+RSpec/MessageSpies:
+  EnforcedStyle: receive
+
+# Offense count: 1
+RSpec/MultipleDescribes:
+  Exclude:
+    - 'spec/readme_spec.rb'
+
+# Offense count: 13
+RSpec/MultipleExpectations:
+  Max: 5
+
+# Offense count: 4
+# Configuration parameters: IgnoreSharedExamples.
+RSpec/NamedSubject:
+  Exclude:
+    - 'spec/with_model_spec.rb'
+
+# Offense count: 2
+RSpec/NestedGroups:
+  Max: 4
+
+# Offense count: 4
+RSpec/RepeatedExample:
+  Exclude:
+    - 'spec/with_model_spec.rb'
+
+# Offense count: 2
+RSpec/SubjectStub:
+  Exclude:
+    - 'spec/with_model_spec.rb'

data/CHANGELOG.md

@@ -1,4 +1,24 @@
-### 2.2.2
+### 2.1.6
+- Require Ruby 2.6 or later
+- Add Ruby 3.0 and 3.1 support
+- Add Active Record 6.1 and 7.0 support
+- Add minitest support (Miks Miķelsons)
+
+### 2.1.5
+
+- Add support for Active Record 6.1
+
+### 2.1.4
+
+- Remove deprecation warnings for Ruby 2.7
+- Require Ruby 2.4 or later
+- Require Active Record 5.2 or later
+
+### 2.1.3
+
+- Support ActiveRecord 6.0, working around new dependency tracking API
+
+### 2.1.2
 
 - Don't clobber existing rake executable
 

data/Gemfile

@@ -4,14 +4,21 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'lint-config-ruby', git: 'https://github.com/Casecommons/lint-config-ruby.git', tag: 'v1.0.0'
-
 ar_branch = ENV['ACTIVE_RECORD_BRANCH']
 ar_version = ENV['ACTIVE_RECORD_VERSION']
+is_jruby = RUBY_PLATFORM == 'java'
 
 if ar_branch
   gem 'activerecord', git: 'https://github.com/rails/rails.git', branch: ar_branch
-  gem 'arel', git: 'https://github.com/rails/arel.git' if ar_branch == 'master'
+  if ar_branch == 'master'
+    gem 'arel', git: 'https://github.com/rails/arel.git'
+    gem 'activerecord-jdbcsqlite3-adapter', git: 'https://github.com/jruby/activerecord-jdbc-adapter.git' if is_jruby
+  end
 elsif ar_version
-  gem 'activerecord', ar_version # rubocop:disable Bundler/DuplicatedGem
+  gem 'activerecord', ar_version
+  if is_jruby && !Gem::Requirement.new(ar_version).satisfied_by?(Gem::Version.new('5.2.0'))
+    gem 'activerecord-jdbcsqlite3-adapter', git: 'https://github.com/jruby/activerecord-jdbc-adapter.git'
+  end
 end
+
+gem 'sqlite3', '~> 1.4.1' unless is_jruby

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2018 Case Commons, Inc. <http://casecommons.org>
+Copyright (c) 2010–2022 Casebook, PBC <http://www.casebook.net>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -1,10 +1,10 @@
 # [with_model](https://github.com/Casecommons/with_model)
 
 [![Gem Version](https://img.shields.io/gem/v/with_model.svg?style=flat)](https://rubygems.org/gems/with_model)
-[![Build Status](https://secure.travis-ci.org/Casecommons/with_model.svg?branch=master)](https://travis-ci.org/Casecommons/with_model)
+[![Build Status](https://github.com/Casecommons/with_model/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/Casecommons/with_model/actions/workflows/ci.yml)
 [![API Documentation](https://img.shields.io/badge/yard-api%20docs-lightgrey.svg)](https://www.rubydoc.info/gems/with_model)
 
-`with_model` dynamically builds an ActiveRecord model (with table) before each test in a group and destroys it afterwards.
+`with_model` dynamically builds an Active Record model (with table) before each test in a group and destroys it afterwards.
 
 ## Development status
 
@@ -12,7 +12,7 @@
 
 ## Installation
 
-Install as usual: `gem install with_model` or add `gem 'with_model'` to your Gemfile. See `.travis.yml` for supported (tested) Ruby versions.
+Install as usual: `gem install with_model` or add `gem 'with_model'` to your Gemfile. See [`.github/workflows/ci.yml`](./.github/workflows/ci.yml) for supported (tested) Ruby versions.
 
 ### RSpec
 
@@ -28,11 +28,13 @@ end
 
 ### minitest/spec
 
-Extend `WithModel` into minitest/spec:
+Extend `WithModel` into minitest/spec and set the test runner explicitly:
 
 ```ruby
 require 'with_model'
 
+WithModel.runner = :minitest
+
 class Minitest::Spec
   extend WithModel
 end
@@ -49,13 +51,13 @@ describe "A blog post" do
   module MyModule; end
 
   with_model :BlogPost do
-    # The table block (and an options hash) is passed to ActiveRecord migration’s `create_table`.
+    # The table block (and an options hash) is passed to Active Record migration’s `create_table`.
     table do |t|
       t.string :title
       t.timestamps null: false
     end
 
-    # The model block is the ActiveRecord model’s class body.
+    # The model block is the Active Record model’s class body.
     model do
       include MyModule
       has_many :comments
@@ -102,7 +104,7 @@ describe "A blog post" do
 
   it "can do all the things a regular model can" do
     record = BlogPost.new
-    expect(record).to_not be_valid
+    expect(record).not_to be_valid
     record.title = "foo"
     expect(record).to be_valid
     expect(record.save).to eq true
@@ -155,7 +157,7 @@ describe "with table options" do
   end
 
   it "respects the additional options" do
-    expect(WithOptions.columns.map(&:name)).to_not include("id")
+    expect(WithOptions.columns.map(&:name)).not_to include("id")
   end
 end
 ```
@@ -169,9 +171,9 @@ See the [gemspec metadata](https://rubygems.org/gems/with_model) for dependency
 - A unique table name is used for tables generated via `with_model`/`WithModel::Model.new`. This allows `with_model` (when limited to this API) to run concurrently (in processes or threads) with a single database schema. While there is a possibility of collision, it is very small.
 - A user-supplied table name is used for tables generated via `with_table`/`WithModel::Table.new`. This may cause collisions at runtime if tests are run concurrently against a single database schema, unless the caller takes care to ensure the table names passed as arguments are unique across threads/processes.
 - Generated models are created in stubbed constants, which are global; no guarantee is made to the uniqueness of a constant, and this may be unsafe.
-- Generated classes are ActiveRecord subclasses:
-  - This library makes no guarantee is made as to the thread-safety of creating ActiveRecord subclasses concurrently.
-  - This library makes no guarantee is made as to the thread-safety of cleaning up ActiveRecord/ActiveSupport’s internals which are polluted upon class creation.
+- Generated classes are Active Record subclasses:
+  - This library makes no guarantee as to the thread-safety of creating Active Record subclasses concurrently.
+  - This library makes no guarantee as to the thread-safety of cleaning up Active Record/Active Support’s internals which are polluted upon class creation.
 
 In general, `with_model` is not guaranteed to be thread-safe, but is, in certain usages, safe to use concurrently across multiple processes with a single database schema.
 
@@ -181,5 +183,5 @@ In general, `with_model` is not guaranteed to be thread-safe, but is, in certain
 
 ## License
 
-Copyright © 2010–2018 [Case Commons, Inc](http://casecommons.org).
+Copyright © 2010–2022 [Casebook PBC](https://www.casebook.net).
 Licensed under the MIT license, see [LICENSE](/LICENSE) file.

data/Rakefile

@@ -2,10 +2,20 @@
 
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
+require 'rake/testtask'
 require 'rubocop/rake_task'
 
 desc 'Run specs'
-RSpec::Core::RakeTask.new
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.pattern = Dir.glob('spec/**/*_spec.rb')
+end
+
+desc 'Run tests'
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'test'
+  t.libs << 'lib'
+  t.pattern = 'test/**/*_test.rb'
+end
 
 desc 'Run lint'
 RuboCop::RakeTask.new
@@ -17,4 +27,4 @@ namespace 'doc' do
   end
 end
 
-task default: %i[spec rubocop]
+task default: %i[spec test rubocop]

data/lib/with_model/model/dsl.rb

@@ -8,7 +8,7 @@ module WithModel
         @model = model
       end
 
-      # Provide a schema definition for the table, passed to ActiveRecord’s `create_table`.
+      # Provide a schema definition for the table, passed to ActiveRecord's `create_table`.
       # The table name will be auto-generated.
       #
       # @see https://api.rubyonrails.org/classes/ActiveRecord/ConnectionAdapters/SchemaStatements.html#method-i-create_table

data/lib/with_model/model.rb

@@ -13,8 +13,8 @@ module WithModel
   class Model
     attr_writer :model_block, :table_block, :table_options
 
-    # @param name The constant name (as a symbol) to assign the model class to.
-    # @param superclass The superclass for the created class. Should
+    # @param [Symbol] name The constant name to assign the model class to.
+    # @param [Class] superclass The superclass for the created class. Should
     #   have `ActiveRecord::Base` as an ancestor.
     def initialize(name, superclass: ActiveRecord::Base)
       @name = name.to_sym
@@ -35,7 +35,7 @@ module WithModel
 
     def destroy
       stubber.unstub_const
-      remove_from_superclass_descendants
+      cleanup_descendants_tracking
       reset_dependencies_cache
       table.destroy
       @model = nil
@@ -53,13 +53,21 @@ module WithModel
       @model.reset_column_information
     end
 
-    def remove_from_superclass_descendants
-      return unless @model.superclass.respond_to?(:direct_descendants)
-      @model.superclass.direct_descendants.delete(@model)
+    def cleanup_descendants_tracking
+      if defined?(ActiveSupport::DescendantsTracker)
+        if ActiveSupport::VERSION::MAJOR >= 7
+          ActiveSupport::DescendantsTracker.clear([ActiveRecord::Base])
+        else
+          ActiveSupport::DescendantsTracker.class_variable_get(:@@direct_descendants).delete(ActiveRecord::Base)
+        end
+      elsif @model.superclass.respond_to?(:direct_descendants)
+        @model.superclass.direct_descendants.delete(@model)
+      end
     end
 
     def reset_dependencies_cache
       return unless defined?(ActiveSupport::Dependencies::Reference)
+
       ActiveSupport::Dependencies::Reference.clear!
     end
 

data/lib/with_model/table.rb

@@ -6,7 +6,7 @@ module WithModel
   # In general, direct use of this class should be avoided. Instead use
   # either the {WithModel high-level API} or {WithModel::Model::DSL low-level API}.
   class Table
-    # @param name The name of the table to create.
+    # @param [Symbol] name The name of the table to create.
     # @param options Passed to ActiveRecord `create_table`.
     # @param block Passed to ActiveRecord `create_table`.
     # @see https://api.rubyonrails.org/classes/ActiveRecord/ConnectionAdapters/SchemaStatements.html#method-i-create_table
@@ -20,7 +20,7 @@ module WithModel
     # it already exists.
     def create
       connection.drop_table(@name) if exists?
-      connection.create_table(@name, @options, &@block)
+      connection.create_table(@name, **@options, &@block)
     end
 
     def destroy

data/lib/with_model/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module WithModel
-  VERSION = '2.1.2'
+  VERSION = '2.1.6'
 end

data/lib/with_model.rb

@@ -6,37 +6,60 @@ require 'with_model/table'
 require 'with_model/version'
 
 module WithModel
-  # @param name The constant name (as a symbol) to assign the model class to.
-  # @param scope Passed to `before`/`after` in the test context.
+  class << self
+    attr_writer :runner
+  end
+
+  def self.runner
+    @runner ||= :rspec
+  end
+
+  # @param [Symbol] name The constant name to assign the model class to.
+  # @param scope Passed to `before`/`after` in the test context. RSpec only.
   # @param options Passed to {WithModel::Model#initialize}.
   # @param block Yielded an instance of {WithModel::Model::DSL}.
   def with_model(name, scope: nil, **options, &block)
-    model = Model.new name, options
+    runner = options.delete(:runner)
+    model = Model.new name, **options
     dsl = Model::DSL.new model
     dsl.instance_exec(&block) if block
 
-    before(*scope) do
-      model.create
-    end
-
-    after(*scope) do
-      model.destroy
-    end
+    setup_object(model, scope: scope, runner: runner)
   end
 
-  # @param name The table name (as a symbol) to create.
-  # @param scope Passed to `before`/`after` in the test context.
+  # @param [Symbol] name The table name to create.
+  # @param scope Passed to `before`/`after` in the test context. Rspec only.
   # @param options Passed to {WithModel::Table#initialize}.
   # @param block Passed to {WithModel::Table#initialize} (like {WithModel::Model::DSL#table}).
   def with_table(name, scope: nil, **options, &block)
+    runner = options.delete(:runner)
     table = Table.new name, options, &block
 
-    before(*scope) do
-      table.create
-    end
+    setup_object(table, scope: scope, runner: runner)
+  end
+
+  private
+
+  # @param [Object] object The new model object instance to create
+  # @param scope Passed to `before`/`after` in the test context. Rspec only.
+  def setup_object(object, scope: nil, runner: nil) # rubocop:disable Metrics/MethodLength
+    case runner || WithModel.runner
+    when :rspec
+      before(*scope) do
+        object.create
+      end
+
+      after(*scope) do
+        object.destroy
+      end
+    when :minitest
+      object.create
 
-    after(*scope) do
-      table.destroy
+      Minitest.after_run do
+        object.destroy
+      end
+    else
+      raise ArgumentError, 'Unsupported test runner set, expected :rspec or :minitest'
     end
   end
 end

data/spec/.rubocop.yml

@@ -0,0 +1,5 @@
+inherit_from:
+  - ../.rubocop.yml
+
+Lint/ConstantDefinitionInBlock:
+  Enabled: false

data/spec/active_record_behaviors_spec.rb

@@ -7,6 +7,7 @@ describe 'ActiveRecord behaviors' do
     context 'that has a named scope' do
       before do
         @regular_model = Class.new ActiveRecord::Base do
+          self.table_name = 'regular_models'
           scope :title_is_foo, -> { where(title: 'foo') }
         end
 

data/spec/readme_spec.rb

@@ -61,7 +61,7 @@ describe 'A blog post' do
 
   it 'can do all the things a regular model can' do
     record = BlogPost.new
-    expect(record).to_not be_valid
+    expect(record).not_to be_valid
     record.title = 'foo'
     expect(record).to be_valid
     expect(record.save).to eq true
@@ -75,8 +75,7 @@ describe 'A blog post' do
     self.abstract_class = true
   end
 
-  with_model :Ford, superclass: Car do
-  end
+  with_model :Ford, superclass: Car
 
   it 'has a specified superclass' do
     expect(Ford < Car).to eq true
@@ -114,6 +113,6 @@ describe 'with table options' do
   end
 
   it 'respects the additional options' do
-    expect(WithOptions.columns.map(&:name)).to_not include('id')
+    expect(WithOptions.columns.map(&:name)).not_to include('id')
   end
 end

data/spec/spec_helper.rb

@@ -1,9 +1,17 @@
 # frozen_string_literal: true
 
-require 'bundler'
-Bundler.setup
+# 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 'simplecov'
+SimpleCov.start
 
+require 'bundler/setup'
 require 'with_model'
+
 RSpec.configure do |config|
   config.extend WithModel
 
@@ -26,9 +34,7 @@ adapter = is_jruby ? 'jdbcsqlite3' : 'sqlite3'
 require 'active_record'
 ActiveRecord::Base.establish_connection(adapter: adapter, database: ':memory:')
 
-if defined?(I18n) && I18n.respond_to?(:enforce_available_locales=)
-  I18n.enforce_available_locales = true
-end
+I18n.enforce_available_locales = true if defined?(I18n) && I18n.respond_to?(:enforce_available_locales=)
 
 if ENV['LOGGER']
   require 'logger'
@@ -36,7 +42,7 @@ if ENV['LOGGER']
 end
 
 module SpecHelper
-  module RailsTestCompatability
+  module RailsTestCompatibility
     require 'minitest'
     include Minitest::Assertions
 

data/spec/with_model_spec.rb

@@ -5,7 +5,7 @@ require 'spec_helper'
 
 shared_examples_for 'ActiveModel' do
   require 'active_model/lint'
-  include SpecHelper::RailsTestCompatability
+  include SpecHelper::RailsTestCompatibility
   include ActiveModel::Lint::Tests
 
   active_model_methods = ActiveModel::Lint::Tests.public_instance_methods
@@ -59,7 +59,8 @@ describe 'a temporary ActiveRecord model created with with_model' do
 
     describe 'the class' do
       subject { BlogPost.new }
-      it_should_behave_like 'ActiveModel'
+
+      it_behaves_like 'ActiveModel'
     end
 
     it 'has the methods defined in its model block' do
@@ -90,6 +91,7 @@ describe 'a temporary ActiveRecord model created with with_model' do
 
   describe 'constant restoration' do
     before { stub_const('MyConst', 1) }
+
     shadowing_example_ran = false
 
     context 'with the with_model block' do
@@ -145,6 +147,7 @@ describe 'a temporary ActiveRecord model created with with_model' do
 
   describe 'with a name which is namespaced' do
     before { stub_const('Stuff', Module.new) }
+
     with_model :'Stuff::BlogPost'
 
     it 'creates the model in the namespace' do
@@ -160,13 +163,16 @@ describe 'a temporary ActiveRecord model created with with_model' do
       end
     end
 
-    it 'is available' do end
+    it 'is available' do
+      expect(BlogPost).to be
+    end
   end
 
   context 'with a mixin' do
     let(:mixin) do
       Module.new { def foo; end }
     end
+
     before { stub_const('AMixin', mixin) }
 
     with_model :WithAMixin do
@@ -176,12 +182,14 @@ describe 'a temporary ActiveRecord model created with with_model' do
     end
 
     it 'has the mixin' do
-      expect(-> { ::WithAMixin.new.foo }).to_not raise_error
+      expect(-> { ::WithAMixin.new.foo }).not_to raise_error
       expect(::WithAMixin.include?(AMixin)).to eq true
     end
   end
 
   context 'with a mixin that has a class_eval' do
+    subject { WithAClassEval.new }
+
     let(:mixin) do
       Module.new do
         def self.included(klass)
@@ -191,9 +199,8 @@ describe 'a temporary ActiveRecord model created with with_model' do
         end
       end
     end
-    before { stub_const('AMixin', mixin) }
 
-    subject { WithAClassEval.new }
+    before { stub_const('AMixin', mixin) }
 
     with_model :WithAClassEval do
       model do
@@ -222,7 +229,7 @@ describe 'a temporary ActiveRecord model created with with_model' do
     end
 
     it 'respects the additional options' do
-      expect(WithOptions.columns.map(&:name)).to_not include('id')
+      expect(WithOptions.columns.map(&:name)).not_to include('id')
     end
   end
 
@@ -238,12 +245,13 @@ describe 'a temporary ActiveRecord model created with with_model' do
 
     describe 'the class' do
       subject { BlogPost.new }
-      it_should_behave_like 'ActiveModel'
+
+      it_behaves_like 'ActiveModel'
     end
   end
 
   context 'with an empty block' do
-    with_model(:BlogPost) {}
+    with_model(:BlogPost) {} # rubocop:disable Lint/EmptyBlock
 
     it 'acts like a normal ActiveRecord model' do
       record = BlogPost.create!
@@ -254,7 +262,8 @@ describe 'a temporary ActiveRecord model created with with_model' do
 
     describe 'the class' do
       subject { BlogPost.new }
-      it_should_behave_like 'ActiveModel'
+
+      it_behaves_like 'ActiveModel'
     end
   end
 
@@ -283,7 +292,8 @@ describe 'a temporary ActiveRecord model created with with_model' do
 
     describe 'the class' do
       subject { BlogPost.new }
-      it_should_behave_like 'ActiveModel'
+
+      it_behaves_like 'ActiveModel'
     end
   end
 
@@ -300,25 +310,32 @@ describe 'a temporary ActiveRecord model created with with_model' do
 
     describe 'the class' do
       subject { BlogPost.new }
-      it_should_behave_like 'ActiveModel'
+
+      it_behaves_like 'ActiveModel'
     end
   end
 
   context 'with ActiveSupport::DescendantsTracker' do
-    with_model :BlogPost
+    with_model :BlogPost do
+      model do
+        def self.inspect
+          "BlogPost class #{object_id}"
+        end
+      end
+    end
 
-    it 'includes the correct model class in descendants on the first test run' do
-      descendant = ActiveRecord::Base.descendants.detect do |c|
+    def blog_post_classes
+      ActiveRecord::Base.descendants.select do |c|
         c.table_name == BlogPost.table_name
       end
-      expect(descendant).to eq BlogPost
+    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
-      descendant = ActiveRecord::Base.descendants.detect do |c|
-        c.table_name == BlogPost.table_name
-      end
-      expect(descendant).to eq BlogPost
+      expect(blog_post_classes).to eq [BlogPost]
     end
   end
 
@@ -355,7 +372,8 @@ describe 'a temporary ActiveRecord model created with with_model' do
 
     describe 'the class' do
       subject { BlogPost.new }
-      it_should_behave_like 'ActiveModel'
+
+      it_behaves_like 'ActiveModel'
     end
 
     it 'is a subclass of the supplied superclass' do

data/test/test_helper.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+$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'
+
+WithModel.runner = :minitest
+
+module MiniTest
+  class Test
+    extend WithModel
+  end
+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:')

data/test/with_model_test.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+
+class WithModelTest < MiniTest::Test
+  with_model :BlogPost do
+    table do |t|
+      t.string 'title'
+      t.text 'content'
+      t.timestamps null: false
+    end
+
+    model do
+      def fancy_title
+        "Title: #{title}"
+      end
+    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!')
+
+    record.reload
+
+    assert_equal 'New blog post', record.title
+    assert_equal 'Hello, world!', record.content
+    assert record.updated_at
+
+    record.destroy
+
+    assert_raises ActiveRecord::RecordNotFound do
+      record.reload
+    end
+  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
+  end
+end

data/with_model.gemspec

@@ -12,20 +12,28 @@ Gem::Specification.new do |spec|
   spec.summary     = 'Dynamically build a model within an RSpec context'
   spec.description = spec.summary
   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.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.required_ruby_version = '>= 2.3'
+  spec.required_ruby_version = '>= 2.6'
 
-  spec.add_dependency 'activerecord', '>= 4.2', '< 6.0'
+  spec.add_dependency 'activerecord', '>= 5.2'
 
-  spec.add_development_dependency 'bundler', '~> 1.0'
+  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', '~> 3.0'
+  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'

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: with_model
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.6
 platform: ruby
 authors:
 - Case Commons, LLC
 - Grant Hutchins
 - Andrew Marshall
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-11-06 00:00:00.000000000 Z
+date: 2022-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -18,34 +18,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -60,6 +54,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -78,16 +86,100 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -111,10 +203,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
+- ".jrubyrc"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
+- ".rubocop_todo.yml"
 - ".yardopts"
 - CHANGELOG.md
 - Gemfile
@@ -128,17 +222,21 @@ files:
 - lib/with_model/model/dsl.rb
 - lib/with_model/table.rb
 - lib/with_model/version.rb
+- spec/.rubocop.yml
 - spec/active_record_behaviors_spec.rb
 - spec/constant_stubber_spec.rb
 - spec/readme_spec.rb
 - spec/spec_helper.rb
 - spec/with_model_spec.rb
+- test/test_helper.rb
+- test/with_model_test.rb
 - with_model.gemspec
 homepage: https://github.com/Casecommons/with_model
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -146,21 +244,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: Dynamically build a model within an RSpec context
 test_files:
+- spec/.rubocop.yml
 - spec/active_record_behaviors_spec.rb
 - spec/constant_stubber_spec.rb
 - spec/readme_spec.rb
 - spec/spec_helper.rb
 - spec/with_model_spec.rb
+- test/test_helper.rb
+- test/with_model_test.rb

data/.travis.yml

@@ -1,39 +0,0 @@
-language: ruby
-sudo: false
-
-rvm:
-  - "2.5.1"
-  - "2.4.4"
-  - "2.3.7"
-  - jruby-9.2.0.0
-
-install:
-  - bundle install --retry=3
-
-env:
-  - ACTIVE_RECORD_BRANCH="master"
-  - ACTIVE_RECORD_BRANCH="5-2-stable"
-  - ACTIVE_RECORD_VERSION="~> 5.2.0"
-  - ACTIVE_RECORD_VERSION="~> 5.1.0"
-  - ACTIVE_RECORD_VERSION="~> 5.0.0"
-  - ACTIVE_RECORD_VERSION="~> 4.2.0"
-
-matrix:
-  allow_failures:
-    - env: ACTIVE_RECORD_BRANCH="master"
-    - env: ACTIVE_RECORD_BRANCH="5-2-stable"
-  exclude:
-    - rvm: 2.3.7
-      env: ACTIVE_RECORD_BRANCH="master"
-    - rvm: jruby-9.2.0.0
-      env: ACTIVE_RECORD_BRANCH="master"
-    - rvm: jruby-9.2.0.0
-      env: ACTIVE_RECORD_BRANCH="5-2-stable"
-    - rvm: jruby-9.2.0.0
-      env: ACTIVE_RECORD_VERSION="~> 5.2.0"
-    - rvm: jruby-9.2.0.0
-      env: ACTIVE_RECORD_VERSION="~> 4.2.0"
-
-addons:
-  code_climate:
-    repo_token: fe5c8a8b1b951a54707c08b6fb2a9a5edf9e0522d28bccc648454f774c9ccab1