with_model 2.1.0 → 2.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22f429a5cb8e986623de65004594810d642f7ca21b0bf24a0a1257defa40add9
-  data.tar.gz: a7a0cbbe47ba722b1359a438c18692a7927ff957c88cd0e0919ac3ab4ac65e92
+  metadata.gz: a685dd2fcd809ce446e7dfde25b4fea90014e6bf5456d99e939f79b2ff3b18af
+  data.tar.gz: 3966fbcbeae1bd24fbeacf1f4c53b67abd78b771e03de3f6263a989ad8e180ce
 SHA512:
-  metadata.gz: 63d816a1fe0782ee315073325b6eb59b468bc87c7899f3a124c181cc6542ee9c31d55768a3e2af8234ec6ffad9bb92037b012da5328128e835fce4a74d7a6b15
-  data.tar.gz: 6da66d3cbf860d19d5a2c661e01e75ff7aef341d78d64d12055d5c28ebc5e7401ea5c095b6b006da1c01bcb4b2100bf524681a63292ccf791cff7def6a987115
+  metadata.gz: 659fff704f44481540e91d6ebe00322dd07fec0beda3142bc2581ed02bc962b7384dacf871a43c5231cc93757a428ef857f2ea093e8b82fb0ee0b9603932793f
+  data.tar.gz: 588cb797971b7dc861aa207a09cbddebf69c356878993d0edf98458afb83affb0cc2d5d26856a079e8bef4ae5d420698e9f65abcb636ee8990ab6178479467d2

data/.gitignore

@@ -1,18 +1,5 @@
-*.gem
-*.rbc
-.bundle
-.config
 .yardoc
-.idea/
 Gemfile.lock
-InstalledFiles
-_yardoc
 coverage
 doc/
-lib/bundler/man
 pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp

data/.jrubyrc

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

data/.rubocop.yml

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

data/.rubocop_todo.yml

@@ -0,0 +1,93 @@
+# 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: 4
+RSpec/Be:
+  Exclude:
+    - 'spec/readme_spec.rb'
+    - 'spec/with_model_spec.rb'
+
+# Offense count: 3
+RSpec/BeforeAfterAll:
+  Exclude:
+    - 'spec/spec_helper.rb'
+    - 'spec/rails_helper.rb'
+    - 'spec/support/**/*.rb'
+    - 'spec/readme_spec.rb'
+    - 'spec/with_model_spec.rb'
+
+# 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/.travis.yml

@@ -1,43 +1,44 @@
 language: ruby
-sudo: false
+cache: bundler
 
 rvm:
-  - "2.5.1"
-  - "2.4.4"
-  - "2.3.7"
-  - jruby-9.2.0.0
-
-install:
-  - bundle install --retry=3
+  - 2.7.1
+  - 2.6.6
+  - 2.5.8
+  - 2.4.10
+  - jruby-9.2.13.0
 
 env:
-  - ACTIVE_RECORD_BRANCH="master"
-  - ACTIVE_RECORD_BRANCH="5-2-stable"
-  - ACTIVE_RECORD_BRANCH="5-1-stable"
-  - ACTIVE_RECORD_BRANCH="5-0-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"
+  global:
+    - CC_TEST_REPORTER_ID=fe5c8a8b1b951a54707c08b6fb2a9a5edf9e0522d28bccc648454f774c9ccab1
+  matrix:
+    - ACTIVE_RECORD_BRANCH="master"
+    - ACTIVE_RECORD_VERSION="~> 6.1.0.rc1"
+    - ACTIVE_RECORD_VERSION="~> 6.0.0"
+    - ACTIVE_RECORD_VERSION="~> 5.2.0"
 
 matrix:
+  fast_finish: true
   allow_failures:
     - env: ACTIVE_RECORD_BRANCH="master"
-    - env: ACTIVE_RECORD_BRANCH="5-2-stable"
-    - env: ACTIVE_RECORD_BRANCH="5-1-stable"
-    - env: ACTIVE_RECORD_BRANCH="5-0-stable"
+    - env: ACTIVE_RECORD_VERSION="~> 6.1.0.rc1"
   exclude:
-    - rvm: 2.3.7
-      env: ACTIVE_RECORD_BRANCH="master"
-    - rvm: jruby-9.2.0.0
+    - rvm: 2.4.10
       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"
+    - rvm: 2.4.10
+      env: ACTIVE_RECORD_VERSION="~> 6.0.0"
+    - rvm: 2.4.10
+      env: ACTIVE_RECORD_VERSION="~> 6.1.0.rc1"
+    - rvm: jruby-9.2.13.0
+      env: ACTIVE_RECORD_VERSION="~> 6.0.0"
+
+before_install:
+  - gem install bundler
+
+before_script:
+  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+  - chmod +x ./cc-test-reporter
+  - ./cc-test-reporter before-build
 
-addons:
-  code_climate:
-    repo_token: fe5c8a8b1b951a54707c08b6fb2a9a5edf9e0522d28bccc648454f774c9ccab1
+after_script:
+  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT

data/.yardopts

@@ -0,0 +1 @@
+--markup markdown

data/CHANGELOG.md

@@ -1,3 +1,34 @@
+### 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
+
+### 2.1.1
+
+- Don't fail erroneously when running the after hook when the before hook failed
+- Improve documentation
+
+### 2.1.0
+
+- Support creating constant in an existing namespace (#26)
+- Prefer keyword arguments over manually-validated hash argument
+- Improve documentation
+- Remove support for obsolete Ruby
+- Internal cleanup
+
 ### 2.0.0
 
 - Require Ruby 2.1 or later

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-2019 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

@@ -2,8 +2,9 @@
 
 [![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)
+[![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
 
@@ -48,13 +49,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
@@ -101,7 +102,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
@@ -154,16 +155,25 @@ 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
 ```
 
 ## Requirements
 
-- Ruby 2.1+
-- RSpec or minitest/spec
-- ActiveRecord 4.2+
+See the [gemspec metadata](https://rubygems.org/gems/with_model) for dependency requirements. RSpec and minitest are indirect dependencies, and `with_model` should support any maintained version of both.
+
+## Thread-safety
+
+- 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 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.
 
 ## Versioning
 
@@ -171,5 +181,5 @@ end
 
 ## License
 
-Copyright © 2010–2018 [Case Commons, Inc](http://casecommons.org).
+Copyright © 2010–2020 [Casebook PBC](https://www.casebook.net).
 Licensed under the MIT license, see [LICENSE](/LICENSE) file.

data/lib/with_model.rb

@@ -6,8 +6,12 @@ require 'with_model/table'
 require 'with_model/version'
 
 module WithModel
+  # @param [Symbol] name The constant name to assign the model class to.
+  # @param scope Passed to `before`/`after` in the test context.
+  # @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
+    model = Model.new name, **options
     dsl = Model::DSL.new model
     dsl.instance_exec(&block) if block
 
@@ -20,6 +24,10 @@ module WithModel
     end
   end
 
+  # @param [Symbol] name The table name to create.
+  # @param scope Passed to `before`/`after` in the test context.
+  # @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)
     table = Table.new name, options, &block
 

data/lib/with_model/constant_stubber.rb

@@ -19,9 +19,11 @@ module WithModel
     end
 
     def unstub_const
-      @namespace.__send__ :remove_const, basename
-      @namespace.const_set basename, @original_value if @original_value
-      @namespace = nil
+      if @namespace
+        @namespace.__send__ :remove_const, basename
+        @namespace.const_set basename, @original_value if @original_value
+        @namespace = nil
+      end
       @original_value = nil
     end
 

data/lib/with_model/methods.rb

@@ -1,7 +1,10 @@
 # frozen_string_literal: true
 
 module WithModel
+  # Extended into all ActiveRecord models created by with_model.
   module Methods
+    # Since model classes not created by with_model won't have this
+    # method, one should instead test `respond_to?(:with_model?)`.
     def with_model?
       true
     end

data/lib/with_model/model.rb

@@ -8,9 +8,14 @@ require 'with_model/methods'
 require 'with_model/table'
 
 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 Model
     attr_writer :model_block, :table_block, :table_options
 
+    # @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
       @model_block = nil
@@ -30,7 +35,7 @@ module WithModel
 
     def destroy
       stubber.unstub_const
-      remove_from_superclass_descendants
+      cleanup_descendants_tracking
       reset_dependencies_cache
       table.destroy
       @model = nil
@@ -48,13 +53,17 @@ 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)
+        ActiveSupport::DescendantsTracker.class_variable_get(:@@direct_descendants).delete(ActiveRecord::Base)
+      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/model/dsl.rb

@@ -3,11 +3,12 @@
 module WithModel
   class Model
     class DSL
+      # @param model [WithModel::Model] The Model to mutate via this DSL.
       def initialize(model)
         @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/table.rb

@@ -3,20 +3,28 @@
 require 'active_record'
 
 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 [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
     def initialize(name, options = {}, &block)
       @name = name.freeze
       @options = options.freeze
       @block = block
     end
 
+    # Creates the table with the initialized options. Drops the table if
+    # 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
-      ActiveRecord::Base.connection.drop_table(@name)
+      connection.drop_table(@name)
     end
 
     private

data/lib/with_model/version.rb

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

data/spec/.rubocop.yml

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

data/spec/constant_stubber_spec.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+module WithModel
+  describe ConstantStubber do
+    it 'allows calling unstub_const multiple times' do
+      stubber = described_class.new('Foo')
+      stubber.stub_const(1)
+      stubber.unstub_const
+      stubber.unstub_const
+    end
+
+    it 'allows calling unstub_const without stub_const' do
+      stubber = described_class.new('Foo')
+      stubber.unstub_const
+    end
+  end
+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,11 @@
 # frozen_string_literal: true
 
-require 'bundler'
-Bundler.setup
+require 'simplecov'
+SimpleCov.start
 
+require 'bundler/setup'
 require 'with_model'
+
 RSpec.configure do |config|
   config.extend WithModel
 
@@ -26,9 +28,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'

data/spec/with_model_spec.rb

@@ -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/with_model.gemspec

@@ -14,18 +14,23 @@ Gem::Specification.new do |spec|
   spec.license     = 'MIT'
 
   spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
-  spec.executables   = spec.files.grep(%r(^bin/)) { |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.4'
 
-  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', '~> 2.0'
   spec.add_development_dependency 'minitest'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'rubocop'
+  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.0
+  version: 2.1.5
 platform: ruby
 authors:
 - Case Commons, LLC
 - Grant Hutchins
 - Andrew Marshall
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-10-09 00:00:00.000000000 Z
+date: 2020-11-22 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: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -88,6 +82,76 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.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-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
@@ -107,21 +171,22 @@ email:
 - casecommons-dev@googlegroups.com
 - gems@nertzy.com
 - andrew@johnandrewmarshall.com
-executables:
-- rake
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".jrubyrc"
 - ".rspec"
 - ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".travis.yml"
+- ".yardopts"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
-- bin/rake
 - lib/with_model.rb
 - lib/with_model/constant_stubber.rb
 - lib/with_model/methods.rb
@@ -129,7 +194,9 @@ 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
@@ -138,7 +205,7 @@ homepage: https://github.com/Casecommons/with_model
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -146,20 +213,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.4
-signing_key: 
+rubygems_version: 3.1.4
+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

data/bin/rake

@@ -1,18 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-#
-# This file was generated by Bundler.
-#
-# The application 'rake' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile',
-                                           Pathname.new(__FILE__).realpath)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('rake', 'rake')