database_cleaner-mongo 1.99.0.beta → 2.0.0.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 761dd7ff9cb6fc987a767554f6f23e169b7e8f63a96d0df4c51204513154130f
-  data.tar.gz: 7a644b1e2ddf48e79a96e4e16a2089e980289e537770fafc01e37469e013923e
+  metadata.gz: '090438e884857bdd0920e5e97faee912ab745c5f8e5125081bcf8c3f8e4ea858'
+  data.tar.gz: a5034e10651fdb11bcebd852fe4e08104840a6dc98d969ff21ec55c4bff05ac3
 SHA512:
-  metadata.gz: 38ab3a0045fd089d70b49e85d7a2a71bba78facb077f09337f3d7bfae585d40dd42fe2eaae04c4c274ff7e481fe286482b81b6549e1395fdef69eed014029dc3
-  data.tar.gz: 43c252703db7acd515eb269e1ec194b5f3a56c6368930bc9733fab7a523e6e9f1710f882fa1dd27aba8ec6adb3e881661efd63a7105dfb9cc782e0697d10baca
+  metadata.gz: 51c1d0999bd74d9cb11a643fcc5b301eef51ff94b67b9992bfcc3d132c4149b08c7cc17630ede9f39abdb292252d8c549d229b8503a4f52b94d13a7576fe552c
+  data.tar.gz: 27a70e6091addc71d449cf7712d565258cc451b6e22f1a1c9c6095aa756897f19201e3917c3ed9dec6ce37758e4a820818b135cd4ed4749348ec32c69c240abb

data/.gitignore

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

data/.travis.yml

@@ -1,4 +1,9 @@
 language: ruby
+services:
+  - mongodb
 rvm:
-  - 2.2.9
-before_install: gem install bundler -v 1.17.2
+  - 2.5
+  - 2.6
+  - 2.7
+before_script:
+  - bin/setup

data/Gemfile

@@ -1,8 +1,13 @@
 source "https://rubygems.org"
 
-git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
-
 # Specify your gem's dependencies in database_cleaner-mongo.gemspec
 gemspec
 
-gem "database_cleaner", 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-mongo.svg?branch=master)](https://travis-ci.org/DatabaseCleaner/database_cleaner-mongo)
 [![Code Climate](https://codeclimate.com/github/DatabaseCleaner/database_cleaner-mongo/badges/gpa.svg)](https://codeclimate.com/github/DatabaseCleaner/database_cleaner-mongo)
+[![codecov](https://codecov.io/gh/DatabaseCleaner/database_cleaner-mongo/branch/master/graph/badge.svg)](https://codecov.io/gh/DatabaseCleaner/database_cleaner-mongo)
 
 Clean your Mongo databases with Database Cleaner.
 
@@ -18,40 +19,12 @@ 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)
+The mongo adapter only has one strategy: the deletion strategy.
 
 ## Configuration options
 
-<table>
-  <tbody>
-    <tr>
-      <th>ORM</th>
-      <th>How to access</th>
-      <th>Notes</th>
-    </tr>
-    <tr>
-      <td> Mongo</td>
-      <td> <code>DatabaseCleaner[:mongo]</code></td>
-      <td> </td>
-    </tr>
-  </tbody>
-</table>
+The deletion strategy has no options.
 
 ## COPYRIGHT
 
-See [LICENSE] for details.
+See [LICENSE](LICENSE) for details.

data/database_cleaner-mongo.gemspec

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

data/lib/database_cleaner/mongo.rb

@@ -1,11 +1,5 @@
 require 'database_cleaner/mongo/version'
-require 'database_cleaner'
-require 'database_cleaner/mongo/truncation'
+require 'database_cleaner/core'
 require 'database_cleaner/mongo/deletion'
 
-module DatabaseCleaner::Mongo
-  def self.default_strategy
-    :truncation
-  end
-end
-
+DatabaseCleaner[:mongo].strategy = :deletion

data/lib/database_cleaner/mongo/deletion.rb

@@ -1,8 +1,37 @@
-require 'database_cleaner/mongo/truncation'
+require 'database_cleaner/strategy'
+require 'database_cleaner/deprecation'
+require 'mongo'
 
 module DatabaseCleaner
   module Mongo
-    class Deletion < Truncation
+    class Deletion < Strategy
+      def initialize only: [], except: [], cache_tables: nil
+        @only = only
+        @except = except
+        if !cache_tables.nil?
+          DatabaseCleaner.deprecate "The mongo adapter's :cache_tables option has no effect, and will be removed in database_cleaner-mongo 3.0."
+        end
+      end
+
+      def db
+        @db || raise("You have not specified a database.  (see Mongo::Database)")
+      end
+
+      def clean
+        collections_to_delete.each(&:delete_many)
+      end
+
+      private
+
+      def collections_to_delete
+        collections.select do |c|
+          (@only.none? || @only.include?(c.name)) && !@except.include?(c.name)
+        end
+      end
+
+      def collections
+        db.collections.select { |c| c.name !~ /^system\./ }
+      end
     end
   end
 end

data/lib/database_cleaner/mongo/version.rb

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

metadata

@@ -1,85 +1,86 @@
 --- !ruby/object:Gem::Specification
 name: database_cleaner-mongo
 version: !ruby/object:Gem::Version
-  version: 1.99.0.beta
+  version: 2.0.0.beta
 platform: ruby
 authors:
 - Ernesto Tagwerker
+- Micah Geisel
 autorequire: 
 bindir: exe
 cert_chain: []
 date: 2020-05-30 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.99.0.beta
+        version: 2.0.0.beta2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.99.0.beta
+        version: 2.0.0.beta2
 - !ruby/object:Gem::Dependency
   name: mongo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.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: 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 Mongo. Can be used to ensure
   a clean state for testing.
 email:
@@ -92,7 +93,6 @@ files:
 - ".rspec"
 - ".travis.yml"
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -101,10 +101,7 @@ files:
 - database_cleaner-mongo.gemspec
 - lib/database_cleaner-mongo.rb
 - lib/database_cleaner/mongo.rb
-- lib/database_cleaner/mongo/base.rb
 - lib/database_cleaner/mongo/deletion.rb
-- lib/database_cleaner/mongo/truncation.rb
-- lib/database_cleaner/mongo/truncation_mixin.rb
 - lib/database_cleaner/mongo/version.rb
 homepage: https://github.com/DatabaseCleaner/database_cleaner-mongo
 licenses:
@@ -125,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Strategies for cleaning databases using Mongo. Can be used to ensure a clean

data/Gemfile.lock

@@ -1,46 +0,0 @@
-PATH
-  remote: ../..
-  specs:
-    database_cleaner (1.99.0.beta)
-
-PATH
-  remote: .
-  specs:
-    database_cleaner-mongo (1.99.0.beta)
-      database_cleaner (~> 1.99.0.beta)
-      mongo
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    bson (1.12.5)
-    diff-lcs (1.3)
-    mongo (1.12.5)
-      bson (= 1.12.5)
-    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)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.16)
-  database_cleaner!
-  database_cleaner-mongo!
-  rake (~> 10.0)
-  rspec (~> 3.0)
-
-BUNDLED WITH
-   1.17.3

data/lib/database_cleaner/mongo/base.rb

@@ -1,16 +0,0 @@
-module DatabaseCleaner
-  module Mongo
-    def self.available_strategies
-      %w[truncation deletion]
-    end
-    module Base
-      def db=(desired_db)
-        @db = desired_db
-      end
-
-      def db
-        @db || raise("You have not specified a database.  (see Mongo::Database)")
-      end
-    end
-  end
-end

data/lib/database_cleaner/mongo/truncation.rb

@@ -1,74 +0,0 @@
-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
-        db
-      end
-
-      def collections_cache
-        @collections_cache ||= {}
-      end
-
-      def mongoid_collection_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
-        end
-      end
-
-      def not_caching(db_name, list)
-        @not_caching ||= {}
-
-        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) && @cache_tables
-        db_collections = database.collections.select { |c| c.name !~ /^system\./ }
-
-        missing_collections = mongoid_collection_names[database.name] - db_collections.map(&:name)
-
-        if missing_collections.empty?
-          collections_cache[database.name] = db_collections
-        else
-          not_caching(database.name, missing_collections)
-        end
-
-        db_collections
-      end
-
-      private
-
-      def valid_collection_name?(klass)
-        klass.ancestors.map(&:to_s).include?('Mongoid::Document') &&
-        !klass.embedded &&
-        !klass.collection_name.empty?
-      end
-    end
-  end
-end

data/lib/database_cleaner/mongo/truncation_mixin.rb

@@ -1,26 +0,0 @@
-module DatabaseCleaner
-  module Mongo
-    module 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
-    end
-  end
-end