database_cleaner-mongoid 1.8.0 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c969d9ee56f6a3f591d7deb4c4b8b9e1d2713ffef29cb236dbbe4294090ebdf
-  data.tar.gz: 0a848d2ff860135f514ef1553b49d20dc28d918304c0f068815778516d99cb6d
+  metadata.gz: 311f86c29e38791d5046c4b377a44713b127c75fd8c2f0bd7fb879f0d22a18df
+  data.tar.gz: c73bc11fa65341aabde2a7563271512a825b401ea9a4604c904f61a7ee3b03cf
 SHA512:
-  metadata.gz: d07475b527e1721cdde5811650c13a08f7e5a82f68430c75b8d05b60a5593e73f6c56c43c38910f025eba67a6eddc2fea439280c9ba390a127a570e64195e917
-  data.tar.gz: 7c1d05ed6a46218db54f33291dfc412b6ee758445774a2912a8b0cb30b47b1ee931871a6ab25b6ebeca636057f0db702641643aff7957a3cebabecdb035f4679
+  metadata.gz: 7003aa892b7f56b04b5e17cee7de5f632df9d44b9391e239c76f15f43cee0774410dc1071606e81741064cda6ed69d133dc4ce6fa6f96159379951a54f2bf1aa
+  data.tar.gz: 5670338f7592343076f4de02008a4cc205bb3918aa8d6297dc8694e32f0dbcf3a1e28e79d328182ce605ae427c04f796056c526d3dad51a371b42178b04f3190

data/.travis.yml

@@ -1,4 +1,4 @@
-sudo: false
+
 language: ruby
 rvm:
   - 2.2.9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    database_cleaner (1.8.0)
+    database_cleaner (1.8.1)
 
 PATH
   remote: ..
@@ -13,7 +13,7 @@ PATH
 PATH
   remote: .
   specs:
-    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/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/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/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/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/lib/database_cleaner/mongoid/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: database_cleaner-mongoid
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.8.1
 platform: ruby
 authors:
 - Ernesto Tagwerker
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-30 00:00:00.000000000 Z
+date: 2020-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: database_cleaner
@@ -114,9 +114,11 @@ files:
 - bin/setup
 - database_cleaner-mongoid.gemspec
 - lib/database_cleaner-mongoid.rb
-- lib/database_cleaner/mongo2/truncation_mixin.rb
 - lib/database_cleaner/mongoid.rb
 - lib/database_cleaner/mongoid/base.rb
+- lib/database_cleaner/mongoid/mongo1_truncation_mixin.rb
+- lib/database_cleaner/mongoid/mongo2_truncation_mixin.rb
+- lib/database_cleaner/mongoid/mongoid_truncation_mixin.rb
 - lib/database_cleaner/mongoid/truncation.rb
 - lib/database_cleaner/mongoid/version.rb
 homepage: https://github.com/DatabaseCleaner/database_cleaner-mongoid