database_cleaner-active_record 1.8.0.beta → 2.0.0.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8d7d0428f1d0316620ed6aaf8d5053d7171e47f156fc806a79811a2eca9b91e
-  data.tar.gz: faa79553fe66d634d08557260827d88cd6463622903aae6192ec5126db8112a7
+  metadata.gz: 476fea7e84362519c14f1413c9af334688b3634f1b93eb337b35e52ca0c6aaea
+  data.tar.gz: e9022df4c0c38d5cb422c2f2daca8b5427c6a95ea452c0cddc46367fecfcc616
 SHA512:
-  metadata.gz: 33d786270e2e14441c98f79ad82bf226bb2a4d5a1fe95c777e32433ffb43edddbe4b17516eafc5aef70e557272201dd7997238ad99aa1af1960cb92257f0bbd7
-  data.tar.gz: d3c310d5f09216552da3ac9998cd8a2443610194fc3a8b0f3de2dc8cfd941bf8899b088231a65507c5f45b19767e65e83c6ab58bd5bd3416941e17be234ea7d6
+  metadata.gz: c27d71a958fedeb6391c3218a92bdaed05049f0feafe6402ca2dce691b6d159504f147053ce322f64d05f08216d882d040ea97fce14e39721ee4710da52f4175
+  data.tar.gz: 32e627ff45a35adc27bcbcc08af228f497fcec093ff869c73f3c5ff4febcafa8b216a200b86ff7ece3b2a36882e2d9fe896b83a69aa58deca6239bc19b3118b2

data/.gitignore

@@ -8,6 +8,11 @@
 /spec/support/config.yml
 /tmp/
 !/tmp/.keep
+/.ruby-version
+/.byebug_history
 
 # rspec failure tracking
 .rspec_status
+
+/Gemfile.lock
+/gemfiles/*.lock

data/.travis.yml

@@ -1,5 +1,21 @@
-sudo: false
 language: ruby
+services:
+  - mysql
+  - postgresql
 rvm:
-  - 2.2.9
-before_install: gem install bundler -v 1.17.2
+  - 2.4
+  - 2.5
+  - 2.6
+  - 2.7
+gemfile:
+  - gemfiles/rails_5.1.gemfile
+  - gemfiles/rails_5.2.gemfile
+  - gemfiles/rails_6.0.gemfile
+jobs:
+  exclude:
+  - rvm: 2.4
+    gemfile: gemfiles/rails_6.0.gemfile
+before_install:
+  - gem install bundler -v 1.17.2
+  - bin/setup
+

data/Appraisals

@@ -0,0 +1,11 @@
+appraise "rails-5.1" do
+  gem "rails", "~>5.1.0"
+end
+
+appraise "rails-5.2" do
+  gem "rails", "~>5.2.0"
+end
+
+appraise "rails-6.0" do
+  gem "rails", "~>6.0.0"
+end

data/Gemfile

@@ -5,4 +5,8 @@ git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 # Specify your gem's dependencies in database_cleaner-active_record.gemspec
 gemspec
 
-gem "database_cleaner", path: "../.."
+gem "byebug"
+
+gem "rails", "~>5.2"
+
+gem "database_cleaner-core", branch: "master", github: "DatabaseCleaner/database_cleaner"

data/README.md

@@ -107,4 +107,4 @@ test:
 
 ## COPYRIGHT
 
-See [LICENSE] for details.
+See [LICENSE](LICENSE) for details.

data/bin/setup

@@ -5,4 +5,3 @@ set -vx
 
 bundle check || bundle install
 cp spec/support/sample.config.yml spec/support/config.yml
-

data/database_cleaner-active_record.gemspec

@@ -6,7 +6,7 @@ require "database_cleaner/active_record/version"
 Gem::Specification.new do |spec|
   spec.name          = "database_cleaner-active_record"
   spec.version       = DatabaseCleaner::ActiveRecord::VERSION
-  spec.authors       = ["Ernesto Tagwerker"]
+  spec.authors       = ["Ernesto Tagwerker", "Micah Geisel"]
   spec.email         = ["ernesto@ombulabs.com"]
 
   spec.summary       = "Strategies for cleaning databases using ActiveRecord. Can be used to ensure a clean state for testing."
@@ -21,20 +21,14 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "database_cleaner", "~> 1.8.0.beta"
+  spec.add_dependency "database_cleaner-core", "2.0.0.beta"
   spec.add_dependency "activerecord"
 
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rspec", "~> 3.0"
-
-  unless RUBY_PLATFORM =~ /java/
-    spec.add_development_dependency 'mysql', '~> 2.9.1'
-    spec.add_development_dependency 'mysql2'
-    spec.add_development_dependency "activerecord-mysql2-adapter"
-    spec.add_development_dependency 'pg'
-    spec.add_development_dependency "sqlite3"
-  else
-    spec.add_development_dependency "activerecord-jdbc-adapter"
-  end
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "appraisal"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "mysql2"
+  spec.add_development_dependency "pg"
+  spec.add_development_dependency "sqlite3"
 end

data/gemfiles/.bundle/config

@@ -0,0 +1,2 @@
+---
+BUNDLE_RETRY: "1"

data/gemfiles/rails_5.1.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "byebug"
+gem "rails", "~>5.1.0"
+gem "database_cleaner-core", branch: "master", git: "https://github.com/DatabaseCleaner/database_cleaner"
+
+gemspec path: "../"

data/gemfiles/rails_5.2.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "byebug"
+gem "rails", "~>5.2.0"
+gem "database_cleaner-core", branch: "master", git: "https://github.com/DatabaseCleaner/database_cleaner"
+
+gemspec path: "../"

data/gemfiles/rails_6.0.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "byebug"
+gem "rails", "~>6.0.0"
+gem "database_cleaner-core", branch: "master", git: "https://github.com/DatabaseCleaner/database_cleaner"
+
+gemspec path: "../"

data/lib/database_cleaner/active_record/base.rb

@@ -18,12 +18,7 @@ module DatabaseCleaner
     end
 
     def self.config_file_location
-      @config_file_location ||= begin
-        # Has DC.app_root been set? Check in this intrusive way to avoid triggering deprecation warnings if it hasn't.
-        app_root = DatabaseCleaner.send(:configuration).instance_variable_get(:@app_root)
-        root = app_root || Dir.pwd
-        "#{root}/config/database.yml"
-      end
+      @config_file_location ||= "#{Dir.pwd}/config/database.yml"
     end
 
     module Base

data/lib/database_cleaner/active_record/transaction.rb

@@ -51,9 +51,10 @@ module DatabaseCleaner::ActiveRecord
       end
     end
 
+    private
+
     def connection_maintains_transaction_count?
       ActiveRecord::VERSION::MAJOR < 4
     end
-
   end
 end

data/lib/database_cleaner/active_record/truncation.rb

@@ -4,7 +4,7 @@ require 'active_record/connection_adapters/abstract_adapter'
 
 #Load available connection adapters
 %w(
-  abstract_mysql_adapter postgresql_adapter sqlite3_adapter mysql_adapter mysql2_adapter oracle_enhanced_adapter
+  abstract_mysql_adapter postgresql_adapter sqlite3_adapter mysql2_adapter oracle_enhanced_adapter
 ).each do |known_adapter|
   begin
     require "active_record/connection_adapters/#{known_adapter}"
@@ -31,7 +31,7 @@ module DatabaseCleaner
       end
 
       def database_tables
-        ::ActiveRecord::VERSION::MAJOR >= 5 ? data_sources : tables
+        tables
       end
 
       def truncate_table(table_name)
@@ -145,6 +145,10 @@ module DatabaseCleaner
         @restart_identity ||= db_version >=  80400 ? 'RESTART IDENTITY' : ''
       end
 
+      def database_tables
+        tables_with_schema
+      end
+
       def truncate_table(table_name)
         truncate_tables([table_name])
       end
@@ -260,7 +264,9 @@ module DatabaseCleaner::ActiveRecord
 
     # overwritten
     def migration_storage_names
-      [::DatabaseCleaner::ActiveRecord::Base.migration_table_name]
+      result = [::DatabaseCleaner::ActiveRecord::Base.migration_table_name]
+      result << ::ActiveRecord::Base.internal_metadata_table_name if ::ActiveRecord::VERSION::MAJOR >= 5
+      result
     end
 
     def cache_tables?

data/lib/database_cleaner/active_record/version.rb

@@ -1,5 +1,5 @@
 module DatabaseCleaner
   module ActiveRecord
-    VERSION = "1.8.0.beta"
+    VERSION = "2.0.0.beta"
   end
 end

data/lib/database_cleaner/active_record.rb

@@ -1,6 +1,7 @@
 require 'database_cleaner/active_record/version'
-require 'database_cleaner'
+require 'database_cleaner/core'
 require 'database_cleaner/active_record/deletion'
 require 'database_cleaner/active_record/transaction'
 require 'database_cleaner/active_record/truncation'
 
+DatabaseCleaner[:active_record].strategy = :transaction

metadata

@@ -1,29 +1,30 @@
 --- !ruby/object:Gem::Specification
 name: database_cleaner-active_record
 version: !ruby/object:Gem::Version
-  version: 1.8.0.beta
+  version: 2.0.0.beta
 platform: ruby
 authors:
 - Ernesto Tagwerker
+- Micah Geisel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-21 00:00:00.000000000 Z
+date: 2020-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: database_cleaner
+  name: database_cleaner-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.8.0.beta
+        version: 2.0.0.beta
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.8.0.beta
+        version: 2.0.0.beta
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -38,64 +39,50 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: appraisal
   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: mysql
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.9.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.9.1
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: mysql2
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +96,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activerecord-mysql2-adapter
+  name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -161,14 +148,18 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- Appraisals
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/console
 - bin/setup
 - database_cleaner-active_record.gemspec
+- gemfiles/.bundle/config
+- gemfiles/rails_5.1.gemfile
+- gemfiles/rails_5.2.gemfile
+- gemfiles/rails_6.0.gemfile
 - lib/database_cleaner-active_record.rb
 - lib/database_cleaner/active_record.rb
 - lib/database_cleaner/active_record/base.rb
@@ -196,7 +187,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Strategies for cleaning databases using ActiveRecord. Can be used to ensure

data/Gemfile.lock

@@ -1,73 +0,0 @@
-PATH
-  remote: ../..
-  specs:
-    database_cleaner (1.8.0.beta)
-
-PATH
-  remote: .
-  specs:
-    database_cleaner-active_record (1.8.0.beta)
-      activerecord
-      database_cleaner (~> 1.8.0.beta)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activemodel (5.2.4.1)
-      activesupport (= 5.2.4.1)
-    activerecord (5.2.4.1)
-      activemodel (= 5.2.4.1)
-      activesupport (= 5.2.4.1)
-      arel (>= 9.0)
-    activerecord-mysql2-adapter (0.0.3)
-      mysql2
-    activesupport (5.2.4.1)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    arel (9.0.0)
-    concurrent-ruby (1.1.5)
-    diff-lcs (1.3)
-    i18n (1.5.1)
-      concurrent-ruby (~> 1.0)
-    minitest (5.14.0)
-    mysql (2.9.1)
-    mysql2 (0.3.18)
-    pg (0.18.2)
-    rake (10.4.2)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
-    sqlite3 (1.3.10)
-    thread_safe (0.3.6)
-    tzinfo (1.2.6)
-      thread_safe (~> 0.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord-mysql2-adapter
-  bundler (~> 1.16)
-  database_cleaner!
-  database_cleaner-active_record!
-  mysql (~> 2.9.1)
-  mysql2
-  pg
-  rake (~> 10.0)
-  rspec (~> 3.0)
-  sqlite3
-
-BUNDLED WITH
-   1.17.3