with_model 2.1.5 → 2.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a685dd2fcd809ce446e7dfde25b4fea90014e6bf5456d99e939f79b2ff3b18af
-  data.tar.gz: 3966fbcbeae1bd24fbeacf1f4c53b67abd78b771e03de3f6263a989ad8e180ce
+  metadata.gz: b6da93806455c916606077722ee10e9e5f0fd4ec785471288d210949b3891507
+  data.tar.gz: dad3a97b161ccb4d1256402eb7ebffd6746db155094dbd2341e2d860428f9437
 SHA512:
-  metadata.gz: 659fff704f44481540e91d6ebe00322dd07fec0beda3142bc2581ed02bc962b7384dacf871a43c5231cc93757a428ef857f2ea093e8b82fb0ee0b9603932793f
-  data.tar.gz: 588cb797971b7dc861aa207a09cbddebf69c356878993d0edf98458afb83affb0cc2d5d26856a079e8bef4ae5d420698e9f65abcb636ee8990ab6178479467d2
+  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/.rubocop.yml

@@ -3,9 +3,11 @@ inherit_from: .rubocop_todo.yml
 require:
   - rubocop-rake
   - rubocop-rspec
+  - rubocop-minitest
 
 AllCops:
   NewCops: enable
+  TargetRubyVersion: 2.6
 
 Metrics/BlockLength:
   Exclude:
@@ -18,5 +20,11 @@ Bundler/OrderedGems:
 Bundler/DuplicatedGem:
   Enabled: false
 
+RSpec/Be:
+  Enabled: false
+
+RSpec/BeforeAfterAll:
+  Enabled: false
+
 Style/Documentation:
   Enabled: false

data/.rubocop_todo.yml

@@ -6,21 +6,6 @@
 # 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

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+### 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

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2019 Casebook, PBC <http://www.casebook.net>
+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,7 +1,7 @@
 # [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 Active Record model (with table) before each test in a group and destroys it afterwards.
@@ -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
@@ -181,5 +183,5 @@ In general, `with_model` is not guaranteed to be thread-safe, but is, in certain
 
 ## License
 
-Copyright © 2010–2020 [Casebook PBC](https://www.casebook.net).
+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.rb

@@ -55,7 +55,11 @@ module WithModel
 
     def cleanup_descendants_tracking
       if defined?(ActiveSupport::DescendantsTracker)
-        ActiveSupport::DescendantsTracker.class_variable_get(:@@direct_descendants).delete(ActiveRecord::Base)
+        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

data/lib/with_model/version.rb

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

data/lib/with_model.rb

@@ -6,37 +6,60 @@ require 'with_model/table'
 require 'with_model/version'
 
 module WithModel
+  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.
+  # @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)
+    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 [Symbol] name The table name to create.
-  # @param scope Passed to `before`/`after` in the test context.
+  # @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/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/spec_helper.rb

@@ -1,5 +1,11 @@
 # frozen_string_literal: true
 
+# 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
 
@@ -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

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,21 +12,24 @@ 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.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.4'
+  spec.required_ruby_version = '>= 2.6'
 
   spec.add_dependency 'activerecord', '>= 5.2'
 
-  spec.add_development_dependency 'bundler', '~> 2.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'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: with_model
 version: !ruby/object:Gem::Version
-  version: 2.1.5
+  version: 2.1.6
 platform: ruby
 authors:
 - Case Commons, LLC
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-22 00:00:00.000000000 Z
+date: 2022-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -30,16 +30,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -54,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
@@ -72,16 +86,16 @@ 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
@@ -96,6 +110,20 @@ dependencies:
     - - ">="
       - !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
@@ -175,12 +203,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".jrubyrc"
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
-- ".travis.yml"
 - ".yardopts"
 - CHANGELOG.md
 - Gemfile
@@ -200,11 +228,14 @@ files:
 - 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: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -213,14 +244,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: Dynamically build a model within an RSpec context
@@ -231,3 +262,5 @@ test_files:
 - 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,44 +0,0 @@
-language: ruby
-cache: bundler
-
-rvm:
-  - 2.7.1
-  - 2.6.6
-  - 2.5.8
-  - 2.4.10
-  - jruby-9.2.13.0
-
-env:
-  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_VERSION="~> 6.1.0.rc1"
-  exclude:
-    - rvm: 2.4.10
-      env: ACTIVE_RECORD_BRANCH="master"
-    - 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
-
-after_script:
-  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT