with_model 2.1.4 → 2.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4ed561f9b11dd6fa697e64e755713b9adbb026906705d2b49d8c64baee3c4cb
-  data.tar.gz: 2b19575e7778eb877e6360ea70f7df226ac5bb68c3a4a09301c30f4b1ab52832
+  metadata.gz: a685dd2fcd809ce446e7dfde25b4fea90014e6bf5456d99e939f79b2ff3b18af
+  data.tar.gz: 3966fbcbeae1bd24fbeacf1f4c53b67abd78b771e03de3f6263a989ad8e180ce
 SHA512:
-  metadata.gz: 4bf97623882743ad61633cab3d8edfd1276fc736ec5b3e1cc0d37557bd59579418417b2c027d8d8dd62883b68767fda5c3269d7b8e26c4a0947712b60ebd1014
-  data.tar.gz: dcd6dcdd5a23f592af59aef2f51b5d72eef9b4054d6417854511e885e3046b1778d0715bad11c60bfa48cf3ff1829f27b880b5a48c9ad8a88999b5c6881054fa
+  metadata.gz: 659fff704f44481540e91d6ebe00322dd07fec0beda3142bc2581ed02bc962b7384dacf871a43c5231cc93757a428ef857f2ea093e8b82fb0ee0b9603932793f
+  data.tar.gz: 588cb797971b7dc861aa207a09cbddebf69c356878993d0edf98458afb83affb0cc2d5d26856a079e8bef4ae5d420698e9f65abcb636ee8990ab6178479467d2

data/.jrubyrc

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

data/.rubocop.yml

@@ -1,9 +1,22 @@
-inherit_gem:
-  lint-config-ruby:
-    - default.yml
+inherit_from: .rubocop_todo.yml
+
+require:
+  - rubocop-rake
+  - rubocop-rspec
 
 AllCops:
-  TargetRubyVersion: 2.4
+  NewCops: enable
+
+Metrics/BlockLength:
+  Exclude:
+    - 'spec/**/*'
+    - 'with_model.gemspec'
+
+Bundler/OrderedGems:
+  Enabled: false
+
+Bundler/DuplicatedGem:
+  Enabled: false
 
-Lint/MissingCopEnableDirective:
+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

@@ -2,17 +2,18 @@ language: ruby
 cache: bundler
 
 rvm:
-  - 2.7.0
-  - 2.6.5
-  - 2.5.7
-  - 2.4.9
-  - jruby-9.2.9.0
+  - 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"
 
@@ -20,10 +21,15 @@ matrix:
   fast_finish: true
   allow_failures:
     - env: ACTIVE_RECORD_BRANCH="master"
+    - env: ACTIVE_RECORD_VERSION="~> 6.1.0.rc1"
   exclude:
-    - rvm: 2.4.9
+    - rvm: 2.4.10
       env: ACTIVE_RECORD_BRANCH="master"
-    - rvm: 2.4.9
+    - 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:

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 2.1.5
+
+- Add support for Active Record 6.1
+
 ### 2.1.4
 
 - Remove deprecation warnings for Ruby 2.7

data/Gemfile

@@ -1,13 +1,9 @@
 # frozen_string_literal: true
 
-# rubocop:disable Bundler/DuplicatedGem, Bundler/OrderedGems
-
 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'
@@ -19,16 +15,10 @@ if ar_branch
     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
-  if is_jruby && Gem::Requirement.new(ar_version).satisfied_by?(Gem::Version.new('6.0.0'))
+  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
 
-unless is_jruby
-  if ar_branch == 'master' || Gem::Requirement.new(ar_version).satisfied_by?(Gem::Version.new('6.0.0'))
-    gem 'sqlite3', '~> 1.4.1'
-  else
-    gem 'sqlite3', '~> 1.3.11'
-  end
-end
+gem 'sqlite3', '~> 1.4.1' unless is_jruby

data/README.md

@@ -4,7 +4,7 @@
 [![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
 
@@ -49,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
@@ -102,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
@@ -155,7 +155,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 +169,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 as to the thread-safety of creating ActiveRecord subclasses concurrently.
-  - This library makes no guarantee 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 +181,5 @@ In general, `with_model` is not guaranteed to be thread-safe, but is, in certain
 
 ## License
 
-Copyright © 2010–2018 [Casebook PBC](https://www.casebook.net).
+Copyright © 2010–2020 [Casebook PBC](https://www.casebook.net).
 Licensed under the MIT license, see [LICENSE](/LICENSE) file.

data/lib/with_model/model.rb

@@ -63,6 +63,7 @@ module WithModel
 
     def reset_dependencies_cache
       return unless defined?(ActiveSupport::Dependencies::Reference)
+
       ActiveSupport::Dependencies::Reference.clear!
     end
 

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/version.rb

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

data/spec/.rubocop.yml

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

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

@@ -28,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,7 +310,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
 
@@ -361,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,21 @@ Gem::Specification.new do |spec|
   spec.license     = 'MIT'
 
   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.4'
 
-  spec.add_dependency 'activerecord', '>= 5.2', '< 6.1'
+  spec.add_dependency 'activerecord', '>= 5.2'
 
   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'
 

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: with_model
 version: !ruby/object:Gem::Version
-  version: 2.1.4
+  version: 2.1.5
 platform: ruby
 authors:
 - Case Commons, LLC
 - Grant Hutchins
 - Andrew Marshall
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-12-30 00:00:00.000000000 Z
+date: 2020-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -19,9 +19,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,9 +26,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -88,6 +82,48 @@ 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
@@ -140,8 +176,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".jrubyrc"
 - ".rspec"
 - ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".travis.yml"
 - ".yardopts"
 - CHANGELOG.md
@@ -156,6 +194,7 @@ 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
@@ -166,7 +205,7 @@ homepage: https://github.com/Casecommons/with_model
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -181,11 +220,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-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