with_model 2.1.2 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73d3473a8847088dfb50b96f339306c6b853b78d1be908aee3dfbae594df8c5a
-  data.tar.gz: c3c48245f7ec06041f9c99cac9e72e0e490760451bd936a36bf05f274cc75eef
+  metadata.gz: cb3f231c15ce48cb075bcb5fe28ffde183e3432328d7a3797744cef9a9eb27ab
+  data.tar.gz: 1a4ef223a3c590833eaa4886bf471dd0b1e5fe5f79b84b2ed011537812e681d6
 SHA512:
-  metadata.gz: 1d2dbbf33bb33961595848a2974166610a1afc557a8cbf3e460c53a0793278f2132114fbbb5ac396866ec2e736de9067542daf52aaa4283293e1886c65a3b585
-  data.tar.gz: 154318219e3adfa3469e60041c1f8559c3912481f278cc01c117856374f1ac5aee1d32b711d2fc5eb44e3946fc374ce48ce8f3d80c750109f0db25c71a2308cd
+  metadata.gz: 21640ee3c2312f019aa6c83268c6606c96f3fe03b7c1af2be15e2fd2ea9a48e3ed31f48d0581733a65577843cdf7069523b674137650d50187d933f8cb53ef90
+  data.tar.gz: 39aa2e361858be2e75375c02ba272bd39ff2528650b17e6ce197ac92683b3dbf83f0cb968573af37cf60945b847992091e2510f3bde196ba3e7543928f081dc2

data/.rubocop.yml

@@ -4,3 +4,6 @@ inherit_gem:
 
 AllCops:
   TargetRubyVersion: 2.3
+
+Lint/MissingCopEnableDirective:
+  Enabled: false

data/.travis.yml

@@ -1,37 +1,33 @@
 language: ruby
-sudo: false
 
 rvm:
-  - "2.5.1"
-  - "2.4.4"
-  - "2.3.7"
-  - jruby-9.2.0.0
+  - 2.6.5
+  - 2.5.7
+  - 2.4.9
+  - jruby-9.2.8.0
 
 install:
+  - gem install bundler
   - bundle install --retry=3
 
 env:
   - ACTIVE_RECORD_BRANCH="master"
-  - ACTIVE_RECORD_BRANCH="5-2-stable"
+  - ACTIVE_RECORD_VERSION="~> 6.0.0"
   - 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:
+  fast_finish: true
   allow_failures:
     - env: ACTIVE_RECORD_BRANCH="master"
-    - env: ACTIVE_RECORD_BRANCH="5-2-stable"
   exclude:
-    - rvm: 2.3.7
+    - rvm: 2.4.9
       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
+    - rvm: 2.4.9
+      env: ACTIVE_RECORD_VERSION="~> 6.0.0"
+    - rvm: jruby-9.2.8.0
       env: ACTIVE_RECORD_VERSION="~> 4.2.0"
 
 addons:

data/CHANGELOG.md

@@ -1,4 +1,8 @@
-### 2.2.2
+### 2.1.3
+
+- Support ActiveRecord 6.0, working around new dependency tracking API
+
+### 2.1.2
 
 - Don't clobber existing rake executable
 

data/Gemfile

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+# rubocop:disable Bundler/DuplicatedGem, Bundler/OrderedGems
+
 source 'https://rubygems.org'
 
 gemspec
@@ -8,10 +10,25 @@ gem 'lint-config-ruby', git: 'https://github.com/Casecommons/lint-config-ruby.gi
 
 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
+  if is_jruby && Gem::Requirement.new(ar_version).satisfied_by?(Gem::Version.new('6.0.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

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

@@ -181,5 +181,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–2018 [Casebook PBC](https://www.casebook.net).
 Licensed under the MIT license, see [LICENSE](/LICENSE) file.

data/lib/with_model.rb

@@ -6,7 +6,7 @@ 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 [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}.
@@ -24,7 +24,7 @@ module WithModel
     end
   end
 
-  # @param name The table name (as a symbol) to create.
+  # @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}).

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,9 +53,12 @@ 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

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

data/lib/with_model/version.rb

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

data/spec/with_model_spec.rb

@@ -305,20 +305,26 @@ describe 'a temporary ActiveRecord model created with with_model' do
   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
 

data/with_model.gemspec

@@ -20,12 +20,13 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.3'
 
-  spec.add_dependency 'activerecord', '>= 4.2', '< 6.0'
+  spec.add_dependency 'activerecord', '>= 4.2', '< 6.1'
 
-  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 'yard'
 
   if RUBY_PLATFORM == 'java'
     spec.add_development_dependency 'activerecord-jdbcsqlite3-adapter'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: with_model
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
 platform: ruby
 authors:
 - Case Commons, LLC
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-06 00:00:00.000000000 Z
+date: 2019-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -21,7 +21,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -31,21 +31,21 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
 - !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 +88,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.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
@@ -153,8 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Dynamically build a model within an RSpec context