database_cleaner-mongoid 1.8.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c969d9ee56f6a3f591d7deb4c4b8b9e1d2713ffef29cb236dbbe4294090ebdf
-  data.tar.gz: 0a848d2ff860135f514ef1553b49d20dc28d918304c0f068815778516d99cb6d
+  metadata.gz: b4857fc2f9d36f05ce84b3a48933c55ee817b4b74b1d3e290173861b059e7351
+  data.tar.gz: 86b440044adac4c88079d6e1bf0d9170a6416b13600e0892ae2620feb96dc29b
 SHA512:
-  metadata.gz: d07475b527e1721cdde5811650c13a08f7e5a82f68430c75b8d05b60a5593e73f6c56c43c38910f025eba67a6eddc2fea439280c9ba390a127a570e64195e917
-  data.tar.gz: 7c1d05ed6a46218db54f33291dfc412b6ee758445774a2912a8b0cb30b47b1ee931871a6ab25b6ebeca636057f0db702641643aff7957a3cebabecdb035f4679
+  metadata.gz: d9e5d5cb3dcedfc931d57911db0840906424b5bc9918be302124c8935dff955c81e7041651bf60b37f9f3342cdcdf612ea47cef035c52545939e20515e81cb6a
+  data.tar.gz: 21559884d495ad112819ea036bee4229d53d71911d70529034f89d7e9b75c9ccc2c4415531975590383ffaaf025b31b8a092d7fec1930f85b8eca1e5eaf46142

data/.gitignore

@@ -6,6 +6,11 @@
 /pkg/
 /spec/reports/
 /tmp/
+/.ruby-version
+/.byebug_history
+
+/Gemfile.lock
+/gemfiles/*.lock
 
 # rspec failure tracking
 .rspec_status

data/.travis.yml

@@ -1,5 +1,24 @@
-sudo: false
 language: ruby
+services:
+  - mongodb
 rvm:
-  - 2.2.9
-before_install: gem install bundler -v 1.17.2
+  - 2.5
+  - 2.6
+  - 2.7
+gemfile:
+  - gemfiles/mongoid3.gemfile
+  - gemfiles/mongoid4.gemfile
+  - gemfiles/mongoid5.gemfile
+  - gemfiles/mongoid6.gemfile
+  - gemfiles/mongoid7.gemfile
+jobs:
+  exclude:
+  # mongoid3-5 incompatible with BigDecimal changes in 2.7, it seems?
+  - rvm: 2.7
+    gemfile: gemfiles/mongoid3.gemfile
+  - rvm: 2.7
+    gemfile: gemfiles/mongoid4.gemfile
+  - rvm: 2.7
+    gemfile: gemfiles/mongoid5.gemfile
+before_script:
+  - bin/setup

data/Appraisals

@@ -0,0 +1,20 @@
+appraise "mongoid3" do
+  gem "mongoid", "~>3.0"
+end
+
+appraise "mongoid4" do
+  gem "mongoid", "~>4.0"
+end
+
+appraise "mongoid5" do
+  gem "mongoid", "~>5.0"
+end
+
+appraise "mongoid6" do
+  gem "mongoid", "~>6.0"
+end
+
+appraise "mongoid7" do
+  gem "mongoid", "~>7.0"
+end
+

data/Gemfile

@@ -1,9 +1,13 @@
 source "https://rubygems.org"
 
-git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
-
 # Specify your gem's dependencies in database_cleaner-mongoid.gemspec
 gemspec
 
-gem "database_cleaner", path: "../.."
-gem "database_cleaner-mongo", path: ".."
+gem "database_cleaner-core", git: "https://github.com/DatabaseCleaner/database_cleaner"
+
+gem "byebug"
+
+group :test do
+  gem "simplecov", require: false
+  gem "codecov", require: false
+end

data/README.md

@@ -2,6 +2,7 @@
 
 [![Build Status](https://travis-ci.org/DatabaseCleaner/database_cleaner-mongoid.svg?branch=master)](https://travis-ci.org/DatabaseCleaner/database_cleaner-mongoid)
 [![Code Climate](https://codeclimate.com/github/DatabaseCleaner/database_cleaner-mongoid/badges/gpa.svg)](https://codeclimate.com/github/DatabaseCleaner/database_cleaner-mongoid)
+[![codecov](https://codecov.io/gh/DatabaseCleaner/database_cleaner-mongoid/branch/master/graph/badge.svg)](https://codecov.io/gh/DatabaseCleaner/database_cleaner-mongoid)
 
 Clean your Mongoid databases with Database Cleaner.
 
@@ -18,40 +19,37 @@ end
 
 ## Supported Strategies
 
-<table>
-  <tbody>
-    <tr>
-      <th>Truncation</th>
-      <th>Transaction</th>
-      <th>Deletion</th>
-    </tr>
-    <tr>
-      <td> <b>Yes</b></td>
-      <td> No</td>
-      <td> No</td>
-    </tr>
-  </tbody>
-</table>
-
-(Default strategy is denoted in bold)
-
-## Configuration options
-
-<table>
-  <tbody>
-    <tr>
-      <th>ORM</th>
-      <th>How to access</th>
-      <th>Notes</th>
-    </tr>
-    <tr>
-      <td> Mongoid</td>
-      <td> <code>DatabaseCleaner[:mongoid]</code></td>
-      <td> Multiple databases supported for Mongoid 3. Specify <code>DatabaseCleaner[:mongoid, {:connection =&gt; :db_name}]</code> </td>
-    </tr>
-  </tbody>
-</table>
+The mongoid adapter only has one strategy: the deletion strategy.
+
+## Strategy configuration options
+
+`:only` and `:except` may take a list of collection names:
+
+```ruby
+# Only delete the "users" collection.
+DatabaseCleaner[:mongoid].strategy = :deletion, { only: ["users"] }
+
+# Delete all collections except the "users" collection.
+DatabaseCleaner[:mongoid].strategy = :deletion, { except: ["users"] }
+```
+
+## Adapter configuration options
+
+`#db` defaults to the default Mongoid database, but can be specified manually in a few ways:
+
+```ruby
+# Redis URI string:
+DatabaseCleaner[:mongoid].db = :logs
+
+# Back to default:
+DatabaseCleaner[:mongoid].db = :default
+
+# Multiple Mongoid databases can be specified:
+DatabaseCleaner[:mongoid, connection: :default]
+DatabaseCleaner[:mongoid, connection: :shard_1]
+DatabaseCleaner[:mongoid, connection: :shard_2]
+```
 
 ## COPYRIGHT
 
-See [LICENSE] for details.
+See [LICENSE](LICENSE) for details.

data/database_cleaner-mongoid.gemspec

@@ -1,12 +1,9 @@
-
-lib = File.expand_path("../lib", __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "database_cleaner/mongoid/version"
+require_relative "./lib/database_cleaner/mongoid/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "database_cleaner-mongoid"
   spec.version       = DatabaseCleaner::Mongoid::VERSION
-  spec.authors       = ["Ernesto Tagwerker"]
+  spec.authors       = ["Ernesto Tagwerker", "Micah Geisel"]
   spec.email         = ["ernesto@ombulabs.com"]
 
   spec.summary       = "Strategies for cleaning databases using Mongoid. Can be used to ensure a clean state for testing."
@@ -21,11 +18,11 @@ 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"
-  spec.add_dependency "database_cleaner-mongo", "~> 1.8.0"
+  spec.add_dependency "database_cleaner-core", "~>2.0.0"
   spec.add_dependency "mongoid"
 
-  spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "appraisal"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
 end

data/gemfiles/.bundle/config

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

data/gemfiles/mongoid3.gemfile

@@ -0,0 +1,14 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "database_cleaner-core", git: "https://github.com/DatabaseCleaner/database_cleaner"
+gem "byebug"
+gem "mongoid", "~>3.0"
+
+group :test do
+  gem "simplecov", require: false
+  gem "codecov", require: false
+end
+
+gemspec path: "../"

data/gemfiles/mongoid4.gemfile

@@ -0,0 +1,14 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "database_cleaner-core", git: "https://github.com/DatabaseCleaner/database_cleaner"
+gem "byebug"
+gem "mongoid", "~>4.0"
+
+group :test do
+  gem "simplecov", require: false
+  gem "codecov", require: false
+end
+
+gemspec path: "../"

data/gemfiles/mongoid5.gemfile

@@ -0,0 +1,14 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "database_cleaner-core", git: "https://github.com/DatabaseCleaner/database_cleaner"
+gem "byebug"
+gem "mongoid", "~>5.0"
+
+group :test do
+  gem "simplecov", require: false
+  gem "codecov", require: false
+end
+
+gemspec path: "../"

data/gemfiles/mongoid6.gemfile

@@ -0,0 +1,14 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "database_cleaner-core", git: "https://github.com/DatabaseCleaner/database_cleaner"
+gem "byebug"
+gem "mongoid", "~>6.0"
+
+group :test do
+  gem "simplecov", require: false
+  gem "codecov", require: false
+end
+
+gemspec path: "../"

data/gemfiles/mongoid7.gemfile

@@ -0,0 +1,14 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "database_cleaner-core", git: "https://github.com/DatabaseCleaner/database_cleaner"
+gem "byebug"
+gem "mongoid", "~>7.0"
+
+group :test do
+  gem "simplecov", require: false
+  gem "codecov", require: false
+end
+
+gemspec path: "../"

data/lib/database_cleaner/mongoid.rb

@@ -1,10 +1,5 @@
 require "database_cleaner/mongoid/version"
-require "database_cleaner"
-require "database_cleaner/mongoid/truncation"
-
-module DatabaseCleaner::Mongoid
-  def self.default_strategy
-    :truncation
-  end
-end
+require "database_cleaner/core"
+require "database_cleaner/mongoid/deletion"
 
+DatabaseCleaner[:mongoid].strategy = :deletion

data/lib/database_cleaner/mongoid/deletion.rb

@@ -0,0 +1,30 @@
+require 'database_cleaner/strategy'
+require 'database_cleaner/mongoid/mongoid4_mixin'
+require 'database_cleaner/mongoid/mongoid5_mixin'
+require 'mongoid/version'
+
+module DatabaseCleaner
+  module Mongoid
+    class Deletion < Strategy
+      def initialize only: [], except: []
+        @only = only
+        @except = except
+      end
+
+      if ::Mongoid::VERSION < '5'
+        include ::DatabaseCleaner::Mongoid::Mongoid4Mixin
+      else
+        include ::DatabaseCleaner::Mongoid::Mongoid5Mixin
+      end
+
+      private
+
+      def collections_to_delete
+        only = @only.any? ? @only : collections
+        (only - @except).map do |name|
+          database[name].find
+        end
+      end
+    end
+  end
+end

data/lib/database_cleaner/mongoid/mongoid4_mixin.rb

@@ -0,0 +1,30 @@
+module DatabaseCleaner
+  module Mongoid
+    module Mongoid4Mixin
+      def clean
+        collections_to_delete.each(&:remove_all)
+        wait_for_removals_to_finish
+      end
+
+      private
+
+      def database
+        ::Mongoid.default_session
+      end
+
+      def collections
+        if db != :default
+          database.use(db)
+        end
+
+        database.command(listCollections: 1, filter: { 'name' => { '$not' => /.?system\.|\$/ } })['cursor']['firstBatch'].map do |collection|
+          collection['name']
+        end
+      end
+
+      def wait_for_removals_to_finish
+        database.command(getlasterror: 1)
+      end
+    end
+  end
+end

data/lib/database_cleaner/mongoid/mongoid5_mixin.rb

@@ -0,0 +1,27 @@
+module DatabaseCleaner
+  module Mongoid
+    module Mongoid5Mixin
+      def clean
+        collections_to_delete.each(&:delete_many)
+      end
+
+      private
+
+      def database
+        if @db.nil? || @db == :default
+          ::Mongoid::Clients.default
+        else
+          ::Mongoid::Clients.with_name(@db)
+        end
+      end
+
+      def collections
+        if db != :default
+          database.use(db)
+        end
+
+        database.collections.collect { |c| c.namespace.split('.',2)[1] }
+      end
+    end
+  end
+end

data/lib/database_cleaner/mongoid/version.rb

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

metadata

@@ -1,51 +1,52 @@
 --- !ruby/object:Gem::Specification
 name: database_cleaner-mongoid
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Ernesto Tagwerker
+- Micah Geisel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-30 00:00:00.000000000 Z
+date: 2021-01-31 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
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
-  name: database_cleaner-mongo
+  name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: mongoid
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -53,47 +54,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: appraisal
   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: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   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'
 description: Strategies for cleaning databases using Mongoid. Can be used to ensure
   a clean state for testing.
 email:
@@ -105,19 +106,25 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- Appraisals
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/console
 - bin/setup
 - database_cleaner-mongoid.gemspec
+- gemfiles/.bundle/config
+- gemfiles/mongoid3.gemfile
+- gemfiles/mongoid4.gemfile
+- gemfiles/mongoid5.gemfile
+- gemfiles/mongoid6.gemfile
+- gemfiles/mongoid7.gemfile
 - 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/truncation.rb
+- lib/database_cleaner/mongoid/deletion.rb
+- lib/database_cleaner/mongoid/mongoid4_mixin.rb
+- lib/database_cleaner/mongoid/mongoid5_mixin.rb
 - lib/database_cleaner/mongoid/version.rb
 homepage: https://github.com/DatabaseCleaner/database_cleaner-mongoid
 licenses:
@@ -138,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Strategies for cleaning databases using Mongoid. Can be used to ensure a

data/Gemfile.lock

@@ -1,72 +0,0 @@
-PATH
-  remote: ../..
-  specs:
-    database_cleaner (1.8.0)
-
-PATH
-  remote: ..
-  specs:
-    database_cleaner-mongo (1.8.0)
-      database_cleaner (~> 1.8.0)
-      mongo
-
-PATH
-  remote: .
-  specs:
-    database_cleaner-mongoid (1.8.0)
-      database_cleaner (~> 1.8.0)
-      database_cleaner-mongo (~> 1.8.0)
-      mongoid
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activemodel (5.2.4.1)
-      activesupport (= 5.2.4.1)
-    activesupport (5.2.4.1)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    bson (4.5.0)
-    concurrent-ruby (1.1.5)
-    diff-lcs (1.3)
-    i18n (1.5.1)
-      concurrent-ruby (~> 1.0)
-    minitest (5.14.0)
-    mongo (2.10.2)
-      bson (>= 4.4.2, < 5.0.0)
-    mongoid (7.0.5)
-      activemodel (>= 5.1, < 6.1)
-      mongo (>= 2.5.1, < 3.0.0)
-    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)
-    thread_safe (0.3.6)
-    tzinfo (1.2.6)
-      thread_safe (~> 0.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.16)
-  database_cleaner!
-  database_cleaner-mongo!
-  database_cleaner-mongoid!
-  rake (~> 10.0)
-  rspec (~> 3.0)
-
-BUNDLED WITH
-   1.17.3

data/lib/database_cleaner/mongo2/truncation_mixin.rb

@@ -1,39 +0,0 @@
-module DatabaseCleaner
-  module Mongo2
-    module TruncationMixin
-
-      def clean
-        if @only
-          collections.each { |c| database[c].find.delete_many if @only.include?(c) }
-        else
-          collections.each { |c| database[c].find.delete_many unless @tables_to_exclude.include?(c) }
-        end
-        true
-      end
-
-      private
-
-      def database
-        if @db.nil? || @db == :default
-          ::Mongoid::Clients.default
-        else
-          ::Mongoid::Clients.with_name(@db)
-        end
-      end
-
-      def collections
-        if db != :default
-          database.use(db)
-        end
-
-        database.collections.collect { |c| c.namespace.split('.',2)[1] }
-
-        # database['system.namespaces'].find(:name => { '$not' => /\.system\.|\$/ }).to_a.map do |collection|
-        #   _, name = collection['name'].split('.', 2)
-        #   name
-        # end
-      end
-
-    end
-  end
-end

data/lib/database_cleaner/mongoid/base.rb

@@ -1,20 +0,0 @@
-require 'database_cleaner/generic/base'
-module DatabaseCleaner
-  module Mongoid
-    def self.available_strategies
-      %w[truncation]
-    end
-
-    module Base
-      include ::DatabaseCleaner::Generic::Base
-
-      def db=(desired_db)
-        @db = desired_db
-      end
-
-      def db
-        @db || :default
-      end
-    end
-  end
-end

data/lib/database_cleaner/mongoid/truncation.rb

@@ -1,49 +0,0 @@
-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 'mongoid/version'
-
-module DatabaseCleaner
-  module Mongoid
-    class Truncation
-      include ::DatabaseCleaner::Mongoid::Base
-      include ::DatabaseCleaner::Generic::Truncation
-
-      if ::Mongoid::VERSION < '3'
-
-        include ::DatabaseCleaner::Mongo::TruncationMixin
-
-        private
-
-        def database
-          ::Mongoid.database
-        end
-
-      elsif ::Mongoid::VERSION < '5'
-
-        include ::DatabaseCleaner::Moped::TruncationBase
-
-        private
-
-        def session
-          ::Mongoid::VERSION > "5.0.0" ? ::Mongoid.default_client : ::Mongoid.default_session
-        end
-
-        def database
-          if not(@db.nil? or @db == :default)
-            ::Mongoid.databases[@db]
-          else
-            ::Mongoid.database
-          end
-        end
-
-      else
-
-        include ::DatabaseCleaner::Mongo2::TruncationMixin
-
-      end
-    end
-  end
-end