RubyGems - database_cleaner - Versions diffs - 1.8.1 → 1.8.2 - Mend

database_cleaner 1.8.1 → 1.8.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (16) hide show

checksums.yaml CHANGED

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34d0bf0798c85c01252ca0d55beebb591438e41967606e0e0197b5e1789341f5
-  data.tar.gz: 20008c1f0341e3f10da0e9bdd083f03122e0fe0d09c12ae597190109cc5bbf3d
+  metadata.gz: ce938b49b786dde644fba6552ca9ed80d3c4b883b9f59d8d2c96922c3391b4ec
+  data.tar.gz: f6ffaab1c716a8ee0844246fbcfaebddb64dbd01a25ae1f057399121a4c75895
 SHA512:
-  metadata.gz: f4aba72c021caf79c7a22ab362ff7c3907b711997ffebb08ac091accacca5b5c81e73485d40f0376be89f72333fc0b77b06c8ff9e426797450c1a532fe77cc77
-  data.tar.gz: c1a015ca1eec638d714b65270e1294a1065f7a0b4d792d260a632daafb84930e14a8f149d6880a8c6c91c72359eca1c0c63be9b7c2dd16d9b4e4f04fe3ed6079
+  metadata.gz: 4dec342492ed7126c8f3f99ae0cac0ac60aba4559646ee7f680b5b558bc900b2242ad89729abf273389a783651233abf7c4e19a9ff4b58a1c28b3e6c26cfd166
+  data.tar.gz: 1fa1ff665ab2c0e7b87bbf47fda9b0e9ea0787ee5734189e7fd8834745fb14ace49f15373c6e966c65395ddd699465623aa1e155eb42398e7830b08468f9bfb5

data/Gemfile.lock CHANGED

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    database_cleaner (1.8.1)
+    database_cleaner (1.8.2)
 PATH
   remote: adapters
@@ -19,10 +19,10 @@ PATH
     database_cleaner-mongo (1.8.0)
       database_cleaner (~> 1.8.0)
       mongo
-    database_cleaner-mongo_mapper (1.8.0)
+    database_cleaner-mongo_mapper (1.8.1)
       database_cleaner (~> 1.8.0)
       mongo_mapper
-    database_cleaner-mongoid (1.8.0)
+    database_cleaner-mongoid (1.8.1)
       database_cleaner (~> 1.8.0)
       database_cleaner-mongo (~> 1.8.0)
       mongoid

data/History.rdoc CHANGED

@@ -1,6 +1,15 @@
 == Development (master)
+== 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 CHANGED

@@ -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.
@@ -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 CHANGED

@@ -260,7 +260,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-mongo_mapper/lib/database_cleaner/mongo_mapper/truncation.rb CHANGED

@@ -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 CHANGED

@@ -1,5 +1,5 @@
 module DatabaseCleaner
   module MongoMapper
-    VERSION = "1.8.0"
+    VERSION = "1.8.1"
   end
 end

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

@@ -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} RENAMED

@@ -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 ADDED

@@ -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 CHANGED

@@ -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 CHANGED

@@ -1,5 +1,5 @@
 module DatabaseCleaner
   module Mongoid
-    VERSION = "1.8.0"
+    VERSION = "1.8.1"
   end
 end

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

@@ -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 CHANGED

@@ -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/lib/database_cleaner/version.rb CHANGED

@@ -1,3 +1,3 @@
 module DatabaseCleaner
-  VERSION = "1.8.1"
+  VERSION = "1.8.2"
 end

metadata CHANGED

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: database_cleaner
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.8.2
 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-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -451,9 +451,11 @@ 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/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