with_model 2.1.6 → 2.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6da93806455c916606077722ee10e9e5f0fd4ec785471288d210949b3891507
-  data.tar.gz: dad3a97b161ccb4d1256402eb7ebffd6746db155094dbd2341e2d860428f9437
+  metadata.gz: 83aa1a692c521015759725b2641f53304ab13f6c3aac17550dc7b802c8e015ea
+  data.tar.gz: e8c44ffe440d68a3f8311f2250a2184e88fffbe1d9713f0b870a5c15fcf8ec2e
 SHA512:
-  metadata.gz: 4f83311c48f5472bd2e3f0d00ddb58fedd14de54d483c06ac1594fdfb26c7344174eb92e3dd28593a4b99b582b5872f3a92941a681a2116e244625f18fa4759d
-  data.tar.gz: fc9044c0f5e92d9ec0351d3ce912df3cdc3bc4aeddb238ec7d1258f6e63620c3caaaaa65ebf79ce639c2fa9aea2dcb44b098fa57b421d96483e825ad047ae57f
+  metadata.gz: 3acf78cc398a2c3c7612a1ee534d3d11ed93f701b8cbfaa218d8b64fb5c3dc0a3a5cf23080f3853e97cf1ba72a9cc202673f058a7c784213287bf9b81e0a1e85
+  data.tar.gz: 0b8ccf8fa27e19880fbfdd166d3eb0974cecaecc94955c2d32204306eb3ca48f050f2b578a9042d81a34e0bfc7d6ab14e5c42b16d802e4b16cfc7efeb38bfecc

data/.bundle/config

@@ -0,0 +1,2 @@
+---
+BUNDLE_BIN: bin

data/.github/dependabot.yml

@@ -0,0 +1,8 @@
+version: 2
+updates:
+- package-ecosystem: bundler
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "10:00"
+  open-pull-requests-limit: 10

data/.github/workflows/ci.yml

@@ -17,39 +17,22 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: ['2.6', '2.7', '3.0', '3.1']
+        ruby-version: ['2.7', '3.0', '3.1', '3.2']
         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'
+          - ruby-version: '3.2'
             active-record-version-env: ACTIVE_RECORD_BRANCH="7-0-stable"
             allow-failure: true
-          - ruby-version: '3.1'
+          - ruby-version: '3.2'
             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
+    - uses: actions/checkout@v3
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
@@ -58,4 +41,4 @@ jobs:
     - name: Update bundle
       run: ${{ matrix.active-record-version-env }} bundle update
     - name: Run tests
-      run: ${{ matrix.active-record-version-env }} bundle exec rake
+      run: ${{ matrix.active-record-version-env }} bin/rake

data/.gitignore

@@ -1,5 +1,6 @@
 .yardoc
 Gemfile.lock
 coverage
+bin/
 doc/
 pkg

data/.rubocop.yml

@@ -7,7 +7,10 @@ require:
 
 AllCops:
   NewCops: enable
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 2.7
+  Exclude:
+    - 'bin/**/*'
+    - 'vendor/bundle/**/*'
 
 Metrics/BlockLength:
   Exclude:

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+### 2.1.7
+- Require Ruby 2.7 or later
+- Add Ruby 3.2 support
+- Require Active Record 6.0 or later
+- Improve minitest support (Mark Edmondson)
+- Limit scope when clearing descendants tracker (idea from Jean-Baptiste Jacquinot)
+
 ### 2.1.6
 - Require Ruby 2.6 or later
 - Add Ruby 3.0 and 3.1 support

data/Gemfile

@@ -4,8 +4,8 @@ source 'https://rubygems.org'
 
 gemspec
 
-ar_branch = ENV['ACTIVE_RECORD_BRANCH']
-ar_version = ENV['ACTIVE_RECORD_VERSION']
+ar_branch = ENV.fetch('ACTIVE_RECORD_BRANCH', nil)
+ar_version = ENV.fetch('ACTIVE_RECORD_VERSION', nil)
 is_jruby = RUBY_PLATFORM == 'java'
 
 if ar_branch
@@ -21,4 +21,13 @@ elsif ar_version
   end
 end
 
-gem 'sqlite3', '~> 1.4.1' unless is_jruby
+gem 'bundler'
+gem 'minitest'
+gem 'rake'
+gem 'rspec'
+gem 'rubocop'
+gem 'rubocop-minitest'
+gem 'rubocop-rake'
+gem 'rubocop-rspec'
+gem 'simplecov'
+gem 'sqlite3', '~> 1.6.0' unless is_jruby

data/Rakefile

@@ -20,11 +20,4 @@ end
 desc 'Run lint'
 RuboCop::RakeTask.new
 
-namespace 'doc' do
-  desc 'Generate README and preview in browser'
-  task 'readme' do
-    sh 'markdown README.md > README.html && open README.html'
-  end
-end
-
 task default: %i[spec test rubocop]

data/lib/with_model/model.rb

@@ -56,7 +56,7 @@ module WithModel
     def cleanup_descendants_tracking
       if defined?(ActiveSupport::DescendantsTracker)
         if ActiveSupport::VERSION::MAJOR >= 7
-          ActiveSupport::DescendantsTracker.clear([ActiveRecord::Base])
+          ActiveSupport::DescendantsTracker.clear([@model])
         else
           ActiveSupport::DescendantsTracker.class_variable_get(:@@direct_descendants).delete(ActiveRecord::Base)
         end

data/lib/with_model/version.rb

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

data/lib/with_model.rb

@@ -6,6 +6,24 @@ require 'with_model/table'
 require 'with_model/version'
 
 module WithModel
+  class MiniTestLifeCycle < Module
+    def initialize(object)
+      define_method :before_setup do
+        object.create
+        super() if defined?(super)
+      end
+
+      define_method :after_teardown do
+        object.destroy
+        super() if defined?(super)
+      end
+    end
+
+    def self.call(object)
+      new(object)
+    end
+  end
+
   class << self
     attr_writer :runner
   end
@@ -42,6 +60,7 @@ module WithModel
 
   # @param [Object] object The new model object instance to create
   # @param scope Passed to `before`/`after` in the test context. Rspec only.
+  # @param [Symbol] runner The test running, either :rspec or :minitest, defaults to :rspec
   def setup_object(object, scope: nil, runner: nil) # rubocop:disable Metrics/MethodLength
     case runner || WithModel.runner
     when :rspec
@@ -53,10 +72,8 @@ module WithModel
         object.destroy
       end
     when :minitest
-      object.create
-
-      Minitest.after_run do
-        object.destroy
+      class_eval do
+        include MiniTestLifeCycle.call(object)
       end
     else
       raise ArgumentError, 'Unsupported test runner set, expected :rspec or :minitest'

data/spec/active_record_behaviors_spec.rb

@@ -105,7 +105,7 @@ describe 'ActiveRecord behaviors' do
 
     context 'in earlier examples' do
       it 'works as normal' do
-        Province.create!(country: Country.create!)
+        expect { Province.create!(country: Country.create!) }.not_to raise_error
       end
     end
 

data/spec/constant_stubber_spec.rb

@@ -7,13 +7,12 @@ module WithModel
     it 'allows calling unstub_const multiple times' do
       stubber = described_class.new('Foo')
       stubber.stub_const(1)
-      stubber.unstub_const
-      stubber.unstub_const
+      expect { 2.times { stubber.unstub_const } }.not_to raise_error
     end
 
     it 'allows calling unstub_const without stub_const' do
       stubber = described_class.new('Foo')
-      stubber.unstub_const
+      expect { stubber.unstub_const }.not_to raise_error
     end
   end
 end

data/spec/readme_spec.rb

@@ -48,7 +48,7 @@ describe 'A blog post' do
   end
 
   it 'has the module' do
-    expect(BlogPost.include?(MyModule)).to eq true
+    expect(BlogPost.include?(MyModule)).to be true
   end
 
   it 'has the class method' do
@@ -64,7 +64,7 @@ describe 'A blog post' do
     expect(record).not_to be_valid
     record.title = 'foo'
     expect(record).to be_valid
-    expect(record.save).to eq true
+    expect(record.save).to be true
     expect(record.reload).to eq record
     record.comments.create!(text: 'Lorem ipsum')
     expect(record.comments.count).to eq 1
@@ -78,7 +78,7 @@ describe 'A blog post' do
   with_model :Ford, superclass: Car
 
   it 'has a specified superclass' do
-    expect(Ford < Car).to eq true
+    expect(Ford < Car).to be true
   end
 end
 

data/spec/with_model_spec.rb

@@ -13,9 +13,12 @@ shared_examples_for 'ActiveModel' do
 
   active_model_lint_tests.each do |method_name|
     friendly_name = method_name.tr('_', ' ')
+
+    # rubocop:disable RSpec/NoExpectationExample
     example friendly_name do
       public_send method_name.to_sym
     end
+    # rubocop:enable RSpec/NoExpectationExample
   end
 
   before { @model = subject }
@@ -73,7 +76,7 @@ describe 'a temporary ActiveRecord model created with with_model' do
 
     describe '.with_model?' do
       it 'returns true' do
-        expect(BlogPost.with_model?).to eq true
+        expect(BlogPost.with_model?).to be true
       end
     end
 
@@ -84,7 +87,7 @@ describe 'a temporary ActiveRecord model created with with_model' do
 
   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
+      expect(non_shadowing_example_ran).to be true
       expect(defined?(BlogPost)).to be_falsy
     end
   end
@@ -108,7 +111,7 @@ describe 'a temporary ActiveRecord model created with with_model' do
 
     context 'without the with_model block' do
       it 'returns the constant to its original value' do
-        expect(shadowing_example_ran).to eq true
+        expect(shadowing_example_ran).to be true
         expect(MyConst).to eq 1
       end
     end
@@ -151,8 +154,8 @@ describe 'a temporary ActiveRecord model created with with_model' do
     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
+      expect(defined?(BlogPost)).to be_falsey
+      expect(defined?(Stuff::BlogPost)).to be_truthy
     end
   end
 
@@ -182,8 +185,8 @@ describe 'a temporary ActiveRecord model created with with_model' do
     end
 
     it 'has the mixin' do
-      expect(-> { ::WithAMixin.new.foo }).not_to raise_error
-      expect(::WithAMixin.include?(AMixin)).to eq true
+      expect(-> { WithAMixin.new.foo }).not_to raise_error
+      expect(WithAMixin.include?(AMixin)).to be true
     end
   end
 
@@ -377,7 +380,7 @@ describe 'a temporary ActiveRecord model created with with_model' do
     end
 
     it 'is a subclass of the supplied superclass' do
-      expect(BlogPost < BlogPostParent).to eq true
+      expect(BlogPost < BlogPostParent).to be true
     end
 
     it 'is its own base_class' do
@@ -385,7 +388,7 @@ describe 'a temporary ActiveRecord model created with with_model' do
     end
 
     it 'responds to .with_model? with true' do
-      expect(BlogPost.with_model?).to eq true
+      expect(BlogPost.with_model?).to be true
     end
   end
 end

data/with_model.gemspec

@@ -14,30 +14,11 @@ Gem::Specification.new do |spec|
   spec.license     = 'MIT'
   spec.metadata['rubygems_mfa_required'] = 'true'
 
-  spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
+  spec.files         = `git ls-files -z`.split("\x0")
   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.6'
+  spec.required_ruby_version = '>= 2.7'
 
-  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', '>= 6.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: with_model
 version: !ruby/object:Gem::Version
-  version: 2.1.6
+  version: 2.1.7
 platform: ruby
 authors:
 - Case Commons, LLC
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-07 00:00:00.000000000 Z
+date: 2023-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -18,182 +18,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  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: 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: 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
-    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: 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: 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
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '6.0'
 description: Dynamically build a model within an RSpec context
 email:
 - casecommons-dev@googlegroups.com
@@ -203,6 +35,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".bundle/config"
+- ".github/dependabot.yml"
 - ".github/workflows/ci.yml"
 - ".gitignore"
 - ".jrubyrc"
@@ -244,23 +78,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.4.19
 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
+test_files: []