database_cleaner 1.8.1 → 1.99.0.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34d0bf0798c85c01252ca0d55beebb591438e41967606e0e0197b5e1789341f5
-  data.tar.gz: 20008c1f0341e3f10da0e9bdd083f03122e0fe0d09c12ae597190109cc5bbf3d
+  metadata.gz: 93b54f2cfbd9e2d5dd08dd667ef971edaa28eecebbcff63b8f8afe464dd58aaa
+  data.tar.gz: 878b944b61afbf9d41ac619864e3fddf6ea7463da29e86ee946403ae7ab383f2
 SHA512:
-  metadata.gz: f4aba72c021caf79c7a22ab362ff7c3907b711997ffebb08ac091accacca5b5c81e73485d40f0376be89f72333fc0b77b06c8ff9e426797450c1a532fe77cc77
-  data.tar.gz: c1a015ca1eec638d714b65270e1294a1065f7a0b4d792d260a632daafb84930e14a8f149d6880a8c6c91c72359eca1c0c63be9b7c2dd16d9b4e4f04fe3ed6079
+  metadata.gz: 071f21db72ba854d2ccb2d23e82369347c6740c76045fee3f9ae8931ca62b50f612d91a74998491d385a0e270f3d7e7689eadbe81ec4c0eec94de852ecbd410d
+  data.tar.gz: 0b42bf542aafc6890ca4fe5d7408eddd95cfc822031bdb6b1100547ba6f96006ed7f68eb175f1f306f9fda9a49eb049b7928fd21d28bab4aac3f7d61678bce05

data/Gemfile.lock

@@ -1,46 +1,45 @@
 PATH
   remote: .
   specs:
-    database_cleaner (1.8.1)
+    database_cleaner (1.99.0.beta)
 
 PATH
   remote: adapters
   specs:
-    database_cleaner-active_record (1.8.0)
+    database_cleaner-active_record (1.99.0.beta)
       activerecord
-      database_cleaner (~> 1.8.0)
-    database_cleaner-couch_potato (1.8.0)
+      database_cleaner (~> 1.99.0.beta)
+    database_cleaner-couch_potato (1.99.0.beta)
       couch_potato
-      database_cleaner (~> 1.8.0)
-    database_cleaner-data_mapper (1.8.0)
-      database_cleaner (~> 1.8.0)
+      database_cleaner (~> 1.99.0.beta)
+    database_cleaner-data_mapper (1.99.0.beta)
+      database_cleaner (~> 1.99.0.beta)
       datamapper
       dm-transactions
-    database_cleaner-mongo (1.8.0)
-      database_cleaner (~> 1.8.0)
+    database_cleaner-mongo (1.99.0.beta)
+      database_cleaner (~> 1.99.0.beta)
       mongo
-    database_cleaner-mongo_mapper (1.8.0)
-      database_cleaner (~> 1.8.0)
+    database_cleaner-mongo_mapper (1.99.0.beta)
+      database_cleaner (~> 1.99.0.beta)
       mongo_mapper
-    database_cleaner-mongoid (1.8.0)
-      database_cleaner (~> 1.8.0)
-      database_cleaner-mongo (~> 1.8.0)
+    database_cleaner-mongoid (1.99.0.beta)
+      database_cleaner (~> 1.99.0.beta)
       mongoid
-    database_cleaner-moped (1.8.0)
-      database_cleaner (~> 1.8.0)
+    database_cleaner-moped (1.99.0.beta)
+      database_cleaner (~> 1.99.0.beta)
       moped
-    database_cleaner-neo4j (1.8.0)
-      database_cleaner (~> 1.8.0)
+    database_cleaner-neo4j (1.99.0.beta)
+      database_cleaner (~> 1.99.0.beta)
       neo4j-core
-    database_cleaner-ohm (1.8.0)
-      database_cleaner (~> 1.8.0)
-      database_cleaner-redis (~> 1.8.0)
+    database_cleaner-ohm (1.99.0.beta)
+      database_cleaner (~> 1.99.0.beta)
+      database_cleaner-redis (~> 1.99.0.beta)
       ohm
-    database_cleaner-redis (1.8.0)
-      database_cleaner (~> 1.8.0)
+    database_cleaner-redis (1.99.0.beta)
+      database_cleaner (~> 1.99.0.beta)
       redis
-    database_cleaner-sequel (1.8.0)
-      database_cleaner (~> 1.8.0)
+    database_cleaner-sequel (1.99.0.beta)
+      database_cleaner (~> 1.99.0.beta)
       sequel
 
 GEM

data/History.rdoc

@@ -1,6 +1,47 @@
-== Development (master)
+== 1.99.0 (v1-maintenance)
+
+== Changes
+  * Remove unnecessary dependency on database_cleaner-mongo from database_cleaner-mongoid: @botandrose
+  * Enable the :cache_tables option for the mongo truncation strategy, and default to true: https://github.com/DatabaseCleaner/database_cleaner/pull/646"
+  * Introduce deletion aliases for truncation strategies for mongo, mongoid, and redis adapters. https://github.com/DatabaseCleaner/database_cleaner/pull/654
+  * Add new :db orm configuration key, for consistency with #db and #db=. https://github.com/DatabaseCleaner/database_cleaner/pull/649
+
+== Deprecations
+  * Deprecate all #orm= setter methods: https://github.com/DatabaseCleaner/database_cleaner/pull/643
+  * Deprecate non-functional :reset_ids option in ActiveRecord truncation strategy: https://github.com/DatabaseCleaner/database_cleaner/issues/559
+  * Deprecate mongo truncation's `:cache_tables => true` option in favor of `false`, to prep for caching removal in v2.0: https://github.com/DatabaseCleaner/database_cleaner/pull/646"
+  * Deprecate redis truncation's #url method in favor of #db: @botandrose
+  * Deprecate mongo, mongoid, and redis truncation strategies in favor of deletion. https://github.com/DatabaseCleaner/database_cleaner/pull/654
+  * Deprecate :connection and :model configuration options in favor of :db for consistency: https://github.com/DatabaseCleaner/database_cleaner/pull/650
+
+== Bugfixes
+  * Fix deprecation warning about `DatabaseCleaner.connections` to recommend a better alternative: https://github.com/DatabaseCleaner/database_cleaner/pull/656
+
+== 1.8.5 2020-05-04
+
+=== Bug Fixes
+  * Fix :mongo strategy: https://github.com/DatabaseCleaner/database_cleaner/pull/645
+
+== 1.8.4 2020-04-02
+
 === Bug Fixes
+  * Fix false positive deprecation warnings on Windows: https://github.com/DatabaseCleaner/database_cleaner/pull/633
+
+== 1.8.3 2020-02-18
+
+=== Bug Fixes
+  * Fix performance issue of DatabaseCleaner::Base#orm_module: https://github.com/DatabaseCleaner/database_cleaner/pull/625
+
+== 1.8.2 2020-02-01
+
+=== Bug Fixes
+  * Fix database_cleaner-ohm autodetected adapter loading: https://github.com/DatabaseCleaner/database_cleaner/pull/619
+  * Fix database_cleaner-mongo_mapper autodetected adapter loading: @botandrose
+  * Fix database_cleaner-mongoid autodetected adapter loading: https://github.com/DatabaseCleaner/database_cleaner/pull/617
+  * Exclude ar_internal_metadata from truncation on Rails 5: https://github.com/DatabaseCleaner/database_cleaner/pull/588
+
 === Changes
+  * Deprecate ohm adapter: https://github.com/DatabaseCleaner/database_cleaner/pull/619
 
 == 1.8.1 2020-01-30
 

data/README.markdown

@@ -8,6 +8,8 @@ you're reading the documentation for the `master` branch.
 
 [![Build Status](https://travis-ci.org/DatabaseCleaner/database_cleaner.svg?branch=master)](https://travis-ci.org/DatabaseCleaner/database_cleaner)
 [![Code Climate](https://codeclimate.com/github/DatabaseCleaner/database_cleaner/badges/gpa.svg)](https://codeclimate.com/github/DatabaseCleaner/database_cleaner)
+![Gem Version](https://badge.fury.io/rb/database_cleaner.svg)
+[![SemVer](https://api.dependabot.com/badges/compatibility_score?dependency-name=database_cleaner&package-manager=bundler&version-scheme=semver)](https://dependabot.com/compatibility-score.html?dependency-name=database_cleaner&package-manager=bundler&version-scheme=semver)
 
 Database Cleaner is a set of gems containing strategies for cleaning your database in Ruby.
 
@@ -304,10 +306,10 @@ DatabaseCleaner[:active_record].strategy = :transaction
 DatabaseCleaner[:mongo_mapper].strategy = :truncation
 
 # How to specify particular connections
-DatabaseCleaner[:active_record, { :connection => :two }]
+DatabaseCleaner[:active_record, { :db => :two }]
 
 # You may also pass in the model directly:
-DatabaseCleaner[:active_record, { :model => ModelWithDifferentConnection }]
+DatabaseCleaner[:active_record, { :db => ModelWithDifferentConnection }]
 ```
 
 Usage beyond that remains the same with `DatabaseCleaner.start` calling any setup on the different configured connections, and `DatabaseCleaner.clean` executing afterwards.
@@ -384,4 +386,4 @@ DatabaseCleaner.url_whitelist = ['postgres://postgres@localhost', 'postgres://fo
 
 ## COPYRIGHT
 
-See [LICENSE] for details.
+See [LICENSE](LICENSE) for details.

data/adapters/database_cleaner-active_record/lib/database_cleaner/active_record/truncation.rb

@@ -1,6 +1,7 @@
 require 'active_record/base'
 require 'database_cleaner/active_record/base'
 require 'active_record/connection_adapters/abstract_adapter'
+require 'database_cleaner/deprecation'
 
 #Load available connection adapters
 %w(
@@ -233,6 +234,13 @@ module DatabaseCleaner::ActiveRecord
     include ::DatabaseCleaner::ActiveRecord::Base
     include ::DatabaseCleaner::Generic::Truncation
 
+    def initialize(*)
+      super
+      if !@reset_ids.nil?
+        DatabaseCleaner.deprecate "The `:reset_ids` option for the ActiveRecord truncation strategy has no effect, and is deprecated. It will be removed in database_cleaner 2.0 with no replacement."
+      end
+    end
+
     def clean
       connection = connection_class.connection
       connection.disable_referential_integrity do
@@ -260,7 +268,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/adapters/database_cleaner-active_record/lib/database_cleaner/active_record/version.rb

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

data/adapters/database_cleaner-couch_potato/lib/database_cleaner/couch_potato.rb

@@ -3,6 +3,8 @@ require "database_cleaner"
 require "database_cleaner/couch_potato/base"
 require "database_cleaner/couch_potato/truncation"
 
+DatabaseCleaner.deprecate "Due to lack of maintenance, the Couch Potato adapter for DatabaseCleaner is deprecated, and will be removed in v2.0 with no replacement. Contact us if you are interested in resurrecting this adapter!"
+
 module DatabaseCleaner::CouchPotato
   def self.default_strategy
     :truncation

data/adapters/database_cleaner-couch_potato/lib/database_cleaner/couch_potato/version.rb

@@ -1,5 +1,5 @@
 module DatabaseCleaner
   module CouchPotato
-    VERSION = "1.8.0"
+    VERSION = "1.99.0.beta"
   end
 end

data/adapters/database_cleaner-data_mapper/lib/database_cleaner/data_mapper.rb

@@ -2,3 +2,5 @@ require "database_cleaner/data_mapper/version"
 require "database_cleaner"
 require "database_cleaner/data_mapper/transaction"
 require "database_cleaner/data_mapper/truncation"
+
+DatabaseCleaner.deprecate "Due to lack of maintenance, the DataMapper adapter for DatabaseCleaner is deprecated, and will be removed in v2.0 with no replacement. Contact us if you are interested in resurrecting this adapter!"

data/adapters/database_cleaner-data_mapper/lib/database_cleaner/data_mapper/version.rb

@@ -1,5 +1,5 @@
 module DatabaseCleaner
   module DataMapper
-    VERSION = "1.8.0"
+    VERSION = "1.99.0.beta"
   end
 end

data/adapters/database_cleaner-mongo/lib/database_cleaner/mongo.rb

@@ -1,6 +1,7 @@
 require 'database_cleaner/mongo/version'
 require 'database_cleaner'
 require 'database_cleaner/mongo/truncation'
+require 'database_cleaner/mongo/deletion'
 
 module DatabaseCleaner::Mongo
   def self.default_strategy

data/adapters/database_cleaner-mongo/lib/database_cleaner/mongo/base.rb

@@ -1,7 +1,7 @@
 module DatabaseCleaner
   module Mongo
     def self.available_strategies
-      %w[truncation]
+      %w[truncation deletion]
     end
     module Base
       def db=(desired_db)

data/adapters/database_cleaner-mongo/lib/database_cleaner/mongo/deletion.rb

@@ -0,0 +1,8 @@
+require 'database_cleaner/mongo/truncation'
+
+module DatabaseCleaner
+  module Mongo
+    class Deletion < Truncation
+    end
+  end
+end

data/adapters/database_cleaner-mongo/lib/database_cleaner/mongo/truncation.rb

@@ -1,12 +1,24 @@
 require 'database_cleaner/mongo/base'
+require 'database_cleaner/generic/base'
 require 'database_cleaner/generic/truncation'
 require 'database_cleaner/mongo/truncation_mixin'
+require 'database_cleaner/deprecation'
+
 module DatabaseCleaner
   module Mongo
     class Truncation
+      include ::DatabaseCleaner::Generic::Base
       include ::DatabaseCleaner::Generic::Truncation
       include TruncationMixin
       include Base
+
+      def initialize(opts={})
+        super
+        if !opts.has_key?(:cache_tables) || opts[:cache_tables]
+          DatabaseCleaner.deprecate "The mongo adapter caches collection names between cleanings. However, this behavior can introduce test-order-dependency issues, because the collections that exist after the first test has executed are saved and used for the remainder of the suite. This means that any collection created during the subsequent tests are not cleaned! This is fixed in database_cleaner-mongo 2.0 by removing this collection caching functionality altogether. To ease the transition into this new behavior, it can be opted into by specifying the `:cache_tables` option to false: `DatabaseCleaner[:mongo].strategy = :deletion, cache_tables: false`. For more information, see https://github.com/DatabaseCleaner/database_cleaner/pull/646"
+        end
+      end
+
       private
 
       def database
@@ -14,11 +26,11 @@ module DatabaseCleaner
       end
 
       def collections_cache
-        @@collections_cache ||= {}
+        @collections_cache ||= {}
       end
 
       def mongoid_collection_names
-        @@mongoid_collection_names ||= Hash.new{|h,k| h[k]=[]}.tap do |names|
+        @mongoid_collection_names ||= Hash.new{|h,k| h[k]=[]}.tap do |names|
           ObjectSpace.each_object(Class) do |klass|
             (names[klass.db.name] << klass.collection_name) if valid_collection_name?(klass)
           end
@@ -26,17 +38,17 @@ module DatabaseCleaner
       end
 
       def not_caching(db_name, list)
-        @@not_caching ||= {}
+        @not_caching ||= {}
 
-        unless @@not_caching.has_key?(db_name)
-          @@not_caching[db_name] = true
+        unless @not_caching.has_key?(db_name)
+          @not_caching[db_name] = true
 
           puts "Not caching collection names for db #{db_name}. Missing these from models: #{list}"
         end
       end
 
       def collections
-        return collections_cache[database.name] if collections_cache.has_key?(database.name)
+        return collections_cache[database.name] if collections_cache.has_key?(database.name) && @cache_tables
         db_collections = database.collections.select { |c| c.name !~ /^system\./ }
 
         missing_collections = mongoid_collection_names[database.name] - db_collections.map(&:name)

data/adapters/database_cleaner-mongo/lib/database_cleaner/mongo/version.rb

@@ -1,5 +1,5 @@
 module DatabaseCleaner
   module Mongo
-    VERSION = "1.8.0"
+    VERSION = "1.99.0.beta"
   end
 end

data/adapters/database_cleaner-mongo_mapper/lib/database_cleaner/mongo_mapper.rb

@@ -2,3 +2,4 @@ require "database_cleaner/mongo_mapper/version"
 require "database_cleaner"
 require "database_cleaner/mongo_mapper/truncation"
 
+DatabaseCleaner.deprecate "Due to lack of maintenance, the MongoMapper adapter for DatabaseCleaner is deprecated, and will be removed in v2.0 with no replacement. Contact us if you are interested in resurrecting this adapter!"

data/adapters/database_cleaner-mongo_mapper/lib/database_cleaner/mongo_mapper/truncation.rb

@@ -1,16 +1,32 @@
 require 'database_cleaner/mongo_mapper/base'
 require 'database_cleaner/generic/truncation'
-require 'database_cleaner/mongo/truncation_mixin'
 
 module DatabaseCleaner
   module MongoMapper
     class Truncation
       include ::DatabaseCleaner::MongoMapper::Base
       include ::DatabaseCleaner::Generic::Truncation
-      include ::DatabaseCleaner::Mongo::TruncationMixin
-      
+
+      def clean
+        if @only
+          collections.each { |c| c.send(truncate_method_name) if @only.include?(c.name) }
+        else
+          collections.each { |c| c.send(truncate_method_name) unless @tables_to_exclude.include?(c.name) }
+        end
+        true
+      end
+
       private
 
+      def collections
+        database.collections.select { |c| c.name !~ /^system\./ }
+      end
+
+      def truncate_method_name
+        # This constant only exists in the 2.x series.
+        defined?(::Mongo::VERSION) ? :delete_many : :remove
+      end
+
       def database
         ::MongoMapper.database
       end

data/adapters/database_cleaner-mongo_mapper/lib/database_cleaner/mongo_mapper/version.rb

@@ -1,5 +1,5 @@
 module DatabaseCleaner
   module MongoMapper
-    VERSION = "1.8.0"
+    VERSION = "1.99.0.beta"
   end
 end

data/adapters/database_cleaner-mongoid/lib/database_cleaner/mongoid.rb

@@ -1,6 +1,7 @@
 require "database_cleaner/mongoid/version"
 require "database_cleaner"
 require "database_cleaner/mongoid/truncation"
+require "database_cleaner/mongoid/deletion"
 
 module DatabaseCleaner::Mongoid
   def self.default_strategy

data/adapters/database_cleaner-mongoid/lib/database_cleaner/mongoid/base.rb

@@ -2,7 +2,7 @@ require 'database_cleaner/generic/base'
 module DatabaseCleaner
   module Mongoid
     def self.available_strategies
-      %w[truncation]
+      %w[truncation deletion]
     end
 
     module Base

data/adapters/database_cleaner-mongoid/lib/database_cleaner/mongoid/deletion.rb

@@ -0,0 +1,10 @@
+require 'database_cleaner/mongoid/truncation'
+
+module DatabaseCleaner
+  module Mongoid
+    class Deletion < Truncation
+    end
+  end
+end
+
+

data/adapters/database_cleaner-mongoid/lib/database_cleaner/mongoid/mongo1_truncation_mixin.rb

@@ -0,0 +1,26 @@
+module DatabaseCleaner
+  module Mongoid
+    module Mongo1TruncationMixin
+      def clean
+        if @only
+          collections.each { |c| c.send(truncate_method_name) if @only.include?(c.name) }
+        else
+          collections.each { |c| c.send(truncate_method_name) unless @tables_to_exclude.include?(c.name) }
+        end
+        true
+      end
+
+      private
+
+      def collections
+        database.collections.select { |c| c.name !~ /^system\./ }
+      end
+
+      def truncate_method_name
+        # This constant only exists in the 2.x series.
+        defined?(::Mongo::VERSION) ? :delete_many : :remove
+      end
+    end
+  end
+end
+

data/adapters/database_cleaner-mongoid/lib/database_cleaner/{mongo2/truncation_mixin.rb → mongoid/mongo2_truncation_mixin.rb}

@@ -1,7 +1,6 @@
 module DatabaseCleaner
-  module Mongo2
-    module TruncationMixin
-
+  module Mongoid
+    module Mongo2TruncationMixin
       def clean
         if @only
           collections.each { |c| database[c].find.delete_many if @only.include?(c) }
@@ -33,7 +32,7 @@ module DatabaseCleaner
         #   name
         # end
       end
-
     end
   end
 end
+

data/adapters/database_cleaner-mongoid/lib/database_cleaner/mongoid/mongoid_truncation_mixin.rb

@@ -0,0 +1,65 @@
+require 'database_cleaner/generic/base'
+require 'database_cleaner/generic/truncation'
+
+module DatabaseCleaner
+  module Mongoid
+    module MongoidTruncationMixin
+      include ::DatabaseCleaner::Generic::Base
+      include ::DatabaseCleaner::Generic::Truncation
+
+      def db=(desired_db)
+        @db = desired_db
+      end
+
+      def db
+        @db ||= :default
+      end
+
+      def host_port=(desired_host)
+        @host = desired_host
+      end
+
+      def host
+        @host ||= '127.0.0.1:27017'
+      end
+
+      def db_version
+        @db_version ||= session.command('buildinfo' => 1)['version']
+      end
+
+      def clean
+        if @only
+          collections.each { |c| session[c].find.remove_all if @only.include?(c) }
+        else
+          collections.each { |c| session[c].find.remove_all unless @tables_to_exclude.include?(c) }
+        end
+        wait_for_removals_to_finish
+        true
+      end
+
+      private
+
+      def collections
+        if db != :default
+          session.use(db)
+        end
+
+        if db_version.split('.').first.to_i >= 3
+          session.command(listCollections: 1, filter: { 'name' => { '$not' => /.?system\.|\$/ } })['cursor']['firstBatch'].map do |collection|
+            collection['name']
+          end
+        else
+          session['system.namespaces'].find(name: { '$not' => /\.system\.|\$/ }).to_a.map do |collection|
+            _, name = collection['name'].split('.', 2)
+            name
+          end
+        end
+      end
+
+      def wait_for_removals_to_finish
+        session.command(getlasterror: 1)
+      end
+    end
+  end
+end
+

data/adapters/database_cleaner-mongoid/lib/database_cleaner/mongoid/truncation.rb

@@ -1,8 +1,8 @@
 require 'database_cleaner/mongoid/base'
 require 'database_cleaner/generic/truncation'
-require 'database_cleaner/mongo/truncation_mixin'
-require 'database_cleaner/mongo2/truncation_mixin'
-require 'database_cleaner/moped/truncation_base'
+require 'database_cleaner/mongoid/mongo1_truncation_mixin'
+require 'database_cleaner/mongoid/mongo2_truncation_mixin'
+require 'database_cleaner/mongoid/mongoid_truncation_mixin'
 require 'mongoid/version'
 
 module DatabaseCleaner
@@ -13,7 +13,7 @@ module DatabaseCleaner
 
       if ::Mongoid::VERSION < '3'
 
-        include ::DatabaseCleaner::Mongo::TruncationMixin
+        include ::DatabaseCleaner::Mongoid::Mongo1TruncationMixin
 
         private
 
@@ -23,7 +23,7 @@ module DatabaseCleaner
 
       elsif ::Mongoid::VERSION < '5'
 
-        include ::DatabaseCleaner::Moped::TruncationBase
+        include ::DatabaseCleaner::Mongoid::MongoidTruncationMixin
 
         private
 
@@ -41,7 +41,7 @@ module DatabaseCleaner
 
       else
 
-        include ::DatabaseCleaner::Mongo2::TruncationMixin
+        include ::DatabaseCleaner::Mongoid::Mongo2TruncationMixin
 
       end
     end

data/adapters/database_cleaner-mongoid/lib/database_cleaner/mongoid/version.rb

@@ -1,5 +1,5 @@
 module DatabaseCleaner
   module Mongoid
-    VERSION = "1.8.0"
+    VERSION = "1.99.0.beta"
   end
 end

data/adapters/database_cleaner-moped/lib/database_cleaner/moped.rb

@@ -2,6 +2,8 @@ require "database_cleaner/moped/version"
 require "database_cleaner"
 require "database_cleaner/moped/truncation"
 
+DatabaseCleaner.deprecate "Due to lack of maintenance, the Moped adapter for DatabaseCleaner is deprecated, and will be removed in v2.0 with no replacement. Contact us if you are interested in resurrecting this adapter!"
+
 module DatabaseCleaner::Moped
   def self.default_strategy
     :truncation

data/adapters/database_cleaner-moped/lib/database_cleaner/moped/version.rb

@@ -1,5 +1,5 @@
 module DatabaseCleaner
   module Moped
-    VERSION = "1.8.0"
+    VERSION = "1.99.0.beta"
   end
 end

data/adapters/database_cleaner-neo4j/lib/database_cleaner/neo4j.rb

@@ -4,3 +4,4 @@ require "database_cleaner/neo4j/transaction"
 require "database_cleaner/neo4j/truncation"
 require "database_cleaner/neo4j/deletion"
 
+DatabaseCleaner.deprecate "Due to lack of maintenance, the Neo4j adapter for DatabaseCleaner is deprecated, and will be removed in v2.0 with no replacement. Contact us if you are interested in resurrecting this adapter!"

data/adapters/database_cleaner-neo4j/lib/database_cleaner/neo4j/version.rb

@@ -1,5 +1,5 @@
 module DatabaseCleaner
   module Neo4j
-    VERSION = "1.8.0"
+    VERSION = "1.99.0.beta"
   end
 end

data/adapters/database_cleaner-ohm/lib/database_cleaner/ohm.rb

@@ -2,6 +2,8 @@ require "database_cleaner/ohm/version"
 require "database_cleaner"
 require "database_cleaner/ohm/truncation"
 
+DatabaseCleaner.deprecate "The Ohm adapter for DatabaseCleaner is deprecated, and will be removed in v2.0. Please use the Redis adapter instead."
+
 module DatabaseCleaner::Ohm
   def self.default_strategy
     :truncation

data/adapters/database_cleaner-ohm/lib/database_cleaner/ohm/truncation.rb

@@ -1,4 +1,9 @@
-require 'database_cleaner/redis/truncation'
+begin # when database_cleaner-ohm is loaded as a gem
+  require 'database_cleaner/redis/truncation'
+rescue LoadError # when database_cleaner is loaded as a gem
+  $LOAD_PATH.unshift File.expand_path("#{File.dirname(__FILE__)}/../../../../../adapters/database_cleaner-redis/lib")
+  require 'database_cleaner/redis/truncation'
+end
 
 module DatabaseCleaner
   module Ohm

data/adapters/database_cleaner-ohm/lib/database_cleaner/ohm/version.rb

@@ -1,5 +1,5 @@
 module DatabaseCleaner
   module Ohm
-    VERSION = "1.8.0"
+    VERSION = "1.99.0.beta"
   end
 end

data/adapters/database_cleaner-redis/lib/database_cleaner/redis.rb

@@ -1,4 +1,5 @@
 require "database_cleaner/redis/version"
 require "database_cleaner"
 require "database_cleaner/redis/truncation"
+require "database_cleaner/redis/deletion"
 

data/adapters/database_cleaner-redis/lib/database_cleaner/redis/base.rb

@@ -1,9 +1,10 @@
 require 'database_cleaner/generic/base'
+require 'database_cleaner/deprecation'
 
 module DatabaseCleaner
   module Redis
     def self.available_strategies
-      %w{truncation}
+      %w{truncation deletion}
     end
 
     def self.default_strategy
@@ -21,7 +22,10 @@ module DatabaseCleaner
         @db ||= :default
       end
 
-      alias url db
+      def url
+        DatabaseCleaner.deprecate "The redis deletion strategy's #url method is deprecated. It will be removed in database_cleaner-redis 2.0 in favor of #db."
+        db
+      end
 
       private
 
@@ -32,7 +36,7 @@ module DatabaseCleaner
           elsif db.is_a?(::Redis) # pass directly the connection
             db
           else
-            ::Redis.new(:url => url)
+            ::Redis.new(:url => db)
           end
         end
       end

data/adapters/database_cleaner-redis/lib/database_cleaner/redis/deletion.rb

@@ -0,0 +1,9 @@
+require 'database_cleaner/redis/truncation'
+
+module DatabaseCleaner
+  module Redis
+    class Deletion < Truncation
+    end
+  end
+end
+

data/adapters/database_cleaner-redis/lib/database_cleaner/redis/truncation.rb

@@ -19,7 +19,7 @@ module DatabaseCleaner
         else
           connection.flushdb
         end
-        connection.quit unless url == :default
+        connection.quit unless db == :default
       end
     end
   end

data/adapters/database_cleaner-redis/lib/database_cleaner/redis/version.rb

@@ -1,5 +1,5 @@
 module DatabaseCleaner
   module Redis
-    VERSION = "1.8.0"
+    VERSION = "1.99.0.beta"
   end
 end

data/adapters/database_cleaner-sequel/lib/database_cleaner/sequel/version.rb

@@ -1,5 +1,5 @@
 module DatabaseCleaner
   module Sequel
-    VERSION = "1.8.0"
+    VERSION = "1.99.0.beta"
   end
 end

data/lib/database_cleaner/base.rb

@@ -15,7 +15,13 @@ module DatabaseCleaner
     def initialize(desired_orm = nil, opts = {})
       @orm_autodetector = ORMAutodetector.new
       self.orm = desired_orm
-      self.db = opts[:connection] || opts[:model] if opts.has_key?(:connection) || opts.has_key?(:model)
+      if opts.has_key?(:model)
+        DatabaseCleaner.deprecate "Using the `:model` key in `DatabaseCleaner[:orm, model: ...]` is deprecated, and will be removed in database_cleaner 2.0. Please use the new `:db` key, instead, which has identical behavior: `DatabaseCleaner[:orm, db: ...]`."
+      end
+      if opts.has_key?(:connection)
+        DatabaseCleaner.deprecate "Using the `:connection` key in `DatabaseCleaner[:orm, connection: ...]` is deprecated, and will be removed in database_cleaner 2.0. Please use the new `:db` key, instead, which has identical behavior: `DatabaseCleaner[:orm, db: ...]`."
+      end
+      self.db = opts[:db] || opts[:connection] || opts[:model] if opts.has_key?(:db) || opts.has_key?(:connection) || opts.has_key?(:model)
       self.strategy = orm_module && orm_module.default_strategy
       Safeguard.new.run
     end
@@ -30,6 +36,13 @@ module DatabaseCleaner
 
     def strategy=(args)
       strategy, *strategy_args = args
+
+      if DatabaseCleaner.called_externally?(__FILE__, caller) \
+        && [:redis, :mongo, :mongoid].include?(orm) \
+        && strategy == :truncation
+        DatabaseCleaner.deprecate "The #{orm} adapter's :truncation strategy will be renamed to :deletion in database_cleaner-#{orm} 2.0. Please specify the :deletion adapter to resolve this deprecation notice."
+      end
+
       @strategy = if strategy.is_a?(Symbol)
         create_strategy(*args)
       elsif strategy_args.empty?
@@ -48,6 +61,9 @@ module DatabaseCleaner
     attr_reader :orm
 
     def orm=(desired_orm)
+      if DatabaseCleaner.called_externally?(__FILE__, caller)
+        DatabaseCleaner.deprecate "Calling `DatabaseCleaner[:orm].orm=` is deprecated, and will be removed in database_cleaner 2.0 with no replacement."
+      end
       @orm = (desired_orm || :autodetect).to_sym
       @orm = @orm_autodetector.orm if @orm == :autodetect
     end
@@ -87,14 +103,14 @@ module DatabaseCleaner
     # TODO privatize the following methods in 2.0
 
     def strategy_db=(desired_db)
-      if called_externally?(caller)
+      if DatabaseCleaner.called_externally?(__FILE__, caller)
         DatabaseCleaner.deprecate "Calling `DatabaseCleaner[...].strategy_db=` is deprecated, and will be removed in database_cleaner 2.0. Use `DatabaseCleaner[...].db=` instead."
       end
       set_strategy_db(strategy, desired_db)
     end
 
     def set_strategy_db(strategy, desired_db)
-      if called_externally?(caller)
+      if DatabaseCleaner.called_externally?(__FILE__, caller)
         DatabaseCleaner.deprecate "Calling `DatabaseCleaner[...].set_strategy_db=` is deprecated, and will be removed in database_cleaner 2.0. Use `DatabaseCleaner[...].db=` instead."
       end
       if strategy.respond_to? :db=
@@ -105,7 +121,7 @@ module DatabaseCleaner
     end
 
     def create_strategy(*args)
-      if called_externally?(caller)
+      if DatabaseCleaner.called_externally?(__FILE__, caller)
         DatabaseCleaner.deprecate "Calling `DatabaseCleaner[...].create_strategy` is deprecated, and will be removed in database_cleaner 2.0. Use `DatabaseCleaner[...].strategy=` instead."
       end
       strategy, *strategy_args = args
@@ -116,15 +132,23 @@ module DatabaseCleaner
 
     def orm_module
       return unless [:active_record, :data_mapper, :mongo, :mongoid, :mongo_mapper, :moped, :couch_potato, :sequel, :ohm, :redis, :neo4j].include?(orm)
+      load_adapter(orm) if !adapter_loaded?(orm)
+      orm_module_name = ORMAutodetector::ORMS[orm]
+      DatabaseCleaner.const_get(orm_module_name, false)
+    end
+
+    def adapter_loaded? orm
+      $LOADED_FEATURES.grep(%r{/lib/database_cleaner/#{orm}\.rb$}).any?
+    end
+
+    def load_adapter orm
       $LOAD_PATH.unshift File.expand_path("#{File.dirname(__FILE__)}/../../adapters/database_cleaner-#{orm}/lib")
       require "database_cleaner/#{orm}"
-      orm_module_name = ORMAutodetector::ORMS[orm]
-      DatabaseCleaner.const_get(orm_module_name)
     end
 
     def orm_strategy(strategy)
       strategy_module_name = strategy.to_s.capitalize
-      orm_module.const_get(strategy_module_name)
+      orm_module.const_get(strategy_module_name, false)
     rescue NameError
       if orm != :active_record
         DatabaseCleaner.deprecate <<-TEXT
@@ -141,9 +165,5 @@ module DatabaseCleaner
     rescue LoadError
       raise UnknownStrategySpecified, "The '#{strategy}' strategy does not exist for the #{orm} ORM!  Available strategies: #{orm_module.available_strategies.join(', ')}"
     end
-
-    def called_externally?(caller)
-      __FILE__ != caller.first.split(":").first
-    end
   end
 end

data/lib/database_cleaner/configuration.rb

@@ -21,6 +21,7 @@ module DatabaseCleaner
     end
 
     def orm=(orm)
+      DatabaseCleaner.deprecate "Calling `DatabaseCleaner.orm=` is deprecated, and will be removed in database_cleaner 2.0 with no replacement."
       add_cleaner(:autodetect) if none?
       values.each { |cleaner| cleaner.orm = orm }
       remove_duplicates
@@ -109,8 +110,8 @@ module DatabaseCleaner
     end
 
     def connections
-      if called_externally?(caller)
-        DatabaseCleaner.deprecate "Calling `DatabaseCleaner.connections` is deprecated, and will be removed in database_cleaner 2.0. Use `DatabaseCleaner.cleaners`, instead."
+      if DatabaseCleaner.called_externally?(__FILE__, caller)
+        DatabaseCleaner.deprecate "Calling `DatabaseCleaner.connections` is deprecated, and will be removed in database_cleaner 2.0. Use `DatabaseCleaner.cleaners.values`, instead."
       end
       add_cleaner(:autodetect) if @cleaners.none?
       @cleaners.values
@@ -119,23 +120,17 @@ module DatabaseCleaner
     # TODO privatize the following methods in 2.0
 
     def add_cleaner(orm, opts = {})
-      if called_externally?(caller)
+      if DatabaseCleaner.called_externally?(__FILE__, caller)
         DatabaseCleaner.deprecate "Calling `DatabaseCleaner.add_cleaner` is deprecated, and will be removed in database_cleaner 2.0. Use `DatabaseCleaner.[]`, instead."
       end
       @cleaners.add_cleaner(orm, opts = {})
     end
 
     def remove_duplicates
-      if called_externally?(caller)
+      if DatabaseCleaner.called_externally?(__FILE__, caller)
         DatabaseCleaner.deprecate "Calling `DatabaseCleaner.remove_duplicates` is deprecated, and will be removed in database_cleaner 2.0 with no replacement."
       end
       @cleaners.remove_duplicates
     end
-
-    private
-
-    def called_externally?(caller)
-      __FILE__ != caller.first.split(":").first
-    end
   end
 end

data/lib/database_cleaner/deprecation.rb

@@ -6,6 +6,11 @@ module DatabaseCleaner
   end
   module_function :deprecate
 
+  def called_externally?(file, caller)
+    file != caller.first[/^(.+\.rb):\d+/, 1]
+  end
+  module_function :called_externally?
+
   class Deprecator
     def initialize
       @methods_already_warned = {}

data/lib/database_cleaner/orm_autodetector.rb

@@ -5,6 +5,7 @@ module DatabaseCleaner
       data_mapper: "DataMapper",
       mongo_mapper: "MongoMapper",
       mongoid: "Mongoid",
+      mongo: "Mongo",
       couch_potato: "CouchPotato",
       sequel: "Sequel",
       moped: "Moped",

data/lib/database_cleaner/version.rb

@@ -1,3 +1,3 @@
 module DatabaseCleaner
-  VERSION = "1.8.1"
+  VERSION = "1.99.0.beta"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: database_cleaner
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.99.0.beta
 platform: ruby
 authors:
 - Ben Mabey
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-31 00:00:00.000000000 Z
+date: 2020-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -442,6 +442,7 @@ files:
 - adapters/database_cleaner-mongo/lib/database_cleaner-mongo.rb
 - adapters/database_cleaner-mongo/lib/database_cleaner/mongo.rb
 - adapters/database_cleaner-mongo/lib/database_cleaner/mongo/base.rb
+- adapters/database_cleaner-mongo/lib/database_cleaner/mongo/deletion.rb
 - adapters/database_cleaner-mongo/lib/database_cleaner/mongo/truncation.rb
 - adapters/database_cleaner-mongo/lib/database_cleaner/mongo/truncation_mixin.rb
 - adapters/database_cleaner-mongo/lib/database_cleaner/mongo/version.rb
@@ -451,9 +452,12 @@ files:
 - adapters/database_cleaner-mongo_mapper/lib/database_cleaner/mongo_mapper/truncation.rb
 - adapters/database_cleaner-mongo_mapper/lib/database_cleaner/mongo_mapper/version.rb
 - adapters/database_cleaner-mongoid/lib/database_cleaner-mongoid.rb
-- adapters/database_cleaner-mongoid/lib/database_cleaner/mongo2/truncation_mixin.rb
 - adapters/database_cleaner-mongoid/lib/database_cleaner/mongoid.rb
 - adapters/database_cleaner-mongoid/lib/database_cleaner/mongoid/base.rb
+- adapters/database_cleaner-mongoid/lib/database_cleaner/mongoid/deletion.rb
+- adapters/database_cleaner-mongoid/lib/database_cleaner/mongoid/mongo1_truncation_mixin.rb
+- adapters/database_cleaner-mongoid/lib/database_cleaner/mongoid/mongo2_truncation_mixin.rb
+- adapters/database_cleaner-mongoid/lib/database_cleaner/mongoid/mongoid_truncation_mixin.rb
 - adapters/database_cleaner-mongoid/lib/database_cleaner/mongoid/truncation.rb
 - adapters/database_cleaner-mongoid/lib/database_cleaner/mongoid/version.rb
 - adapters/database_cleaner-moped/lib/database_cleaner-moped.rb
@@ -476,6 +480,7 @@ files:
 - adapters/database_cleaner-redis/lib/database_cleaner-redis.rb
 - adapters/database_cleaner-redis/lib/database_cleaner/redis.rb
 - adapters/database_cleaner-redis/lib/database_cleaner/redis/base.rb
+- adapters/database_cleaner-redis/lib/database_cleaner/redis/deletion.rb
 - adapters/database_cleaner-redis/lib/database_cleaner/redis/truncation.rb
 - adapters/database_cleaner-redis/lib/database_cleaner/redis/version.rb
 - adapters/database_cleaner-sequel/lib/database_cleaner-sequel.rb
@@ -516,11 +521,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Strategies for cleaning databases. Can be used to ensure a clean slate for