database_cleaner 1.7.0 → 1.8.5

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

@@ -0,0 +1,10 @@
+require "database_cleaner/mongoid/version"
+require "database_cleaner"
+require "database_cleaner/mongoid/truncation"
+
+module DatabaseCleaner::Mongoid
+  def self.default_strategy
+    :truncation
+  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/{lib/database_cleaner/mongo2/truncation_mixin.rb → adapters/database_cleaner-mongoid/lib/database_cleaner/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/{lib → 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

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

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

@@ -0,0 +1 @@
+require "database_cleaner/moped"

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

@@ -0,0 +1,10 @@
+require "database_cleaner/moped/version"
+require "database_cleaner"
+require "database_cleaner/moped/truncation"
+
+module DatabaseCleaner::Moped
+  def self.default_strategy
+    :truncation
+  end
+end
+

data/{lib → adapters/database_cleaner-moped/lib}/database_cleaner/moped/base.rb

@@ -32,7 +32,7 @@ module DatabaseCleaner
       private
 
       def session
-        ::Moped::Session.new([host], database: db)
+        @session ||= ::Moped::Session.new([host], database: db)
       end
     end
   end

data/{lib → adapters/database_cleaner-moped/lib}/database_cleaner/moped/truncation_base.rb

@@ -13,6 +13,7 @@ module DatabaseCleaner
         else
           collections.each { |c| session[c].find.remove_all unless @tables_to_exclude.include?(c) }
         end
+        wait_for_removals_to_finish
         true
       end
 
@@ -35,6 +36,9 @@ module DatabaseCleaner
         end
       end
 
+      def wait_for_removals_to_finish
+        session.command(getlasterror: 1)
+      end
     end
   end
 end

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

@@ -0,0 +1,5 @@
+module DatabaseCleaner
+  module Moped
+    VERSION = "1.8.0"
+  end
+end

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

@@ -0,0 +1 @@
+require "database_cleaner/neo4j"

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

@@ -0,0 +1,6 @@
+require "database_cleaner/neo4j/version"
+require "database_cleaner"
+require "database_cleaner/neo4j/transaction"
+require "database_cleaner/neo4j/truncation"
+require "database_cleaner/neo4j/deletion"
+

data/{lib → adapters/database_cleaner-neo4j/lib}/database_cleaner/neo4j/base.rb

@@ -5,6 +5,10 @@ module DatabaseCleaner
       %w[transaction truncation deletion]
     end
 
+    def self.default_strategy
+      :transaction
+    end
+
     module Base
       include ::DatabaseCleaner::Generic::Base
 

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

@@ -0,0 +1,5 @@
+module DatabaseCleaner
+  module Neo4j
+    VERSION = "1.8.0"
+  end
+end

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

@@ -0,0 +1 @@
+require "database_cleaner/ohm"

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

@@ -0,0 +1,12 @@
+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
+  end
+end
+

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

@@ -0,0 +1,24 @@
+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
+    def self.available_strategies
+      %w(truncation)
+    end
+
+    class Truncation < ::DatabaseCleaner::Redis::Truncation
+
+      private
+
+      def default_redis
+        ::Ohm.redis
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,5 @@
+module DatabaseCleaner
+  module Ohm
+    VERSION = "1.8.1"
+  end
+end

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

@@ -0,0 +1 @@
+require "database_cleaner/redis"

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

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

data/{lib → adapters/database_cleaner-redis/lib}/database_cleaner/redis/base.rb

@@ -6,6 +6,10 @@ module DatabaseCleaner
       %w{truncation}
     end
 
+    def self.default_strategy
+      :truncation
+    end
+
     module Base
       include ::DatabaseCleaner::Generic::Base
 

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

@@ -0,0 +1,5 @@
+module DatabaseCleaner
+  module Redis
+    VERSION = "1.8.0"
+  end
+end

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

@@ -0,0 +1 @@
+require "database_cleaner/sequel"

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

@@ -0,0 +1,6 @@
+require "database_cleaner/sequel/version"
+require "database_cleaner"
+require "database_cleaner/sequel/truncation"
+require "database_cleaner/sequel/transaction"
+require "database_cleaner/sequel/deletion"
+

data/{lib → adapters/database_cleaner-sequel/lib}/database_cleaner/sequel/base.rb

@@ -5,6 +5,10 @@ module DatabaseCleaner
       %w(truncation transaction deletion)
     end
 
+    def self.default_strategy
+      :transaction
+    end
+
     module Base
       include ::DatabaseCleaner::Generic::Base
 

data/{lib → adapters/database_cleaner-sequel/lib}/database_cleaner/sequel/truncation.rb

@@ -14,39 +14,40 @@ module DatabaseCleaner
       def clean
         return unless dirty?
 
+        tables = tables_to_truncate(db)
+
+        # Count rows before truncating
+        if pre_count?
+          tables = pre_count_tables(tables)
+        end
+
         case db.database_type
         when :postgres
           # PostgreSQL requires all tables with FKs to be truncates in the same command, or have the CASCADE keyword
           # appended. Bulk truncation without CASCADE is:
           # * Safer. Tables outside of tables_to_truncate won't be affected.
           # * Faster. Less roundtrips to the db.
-          unless (tables = tables_to_truncate(db)).empty?
-            all_tables = tables.map { |t| %("#{t}") }.join(',')
-            db.run "TRUNCATE TABLE #{all_tables};"
+          unless tables.empty?
+            tables_sql = tables.map { |t| %("#{t}") }.join(',')
+            db.run "TRUNCATE TABLE #{tables_sql} RESTART IDENTITY;"
           end
         else
-          tables = tables_to_truncate(db)
-
-          if pre_count?
-            # Count rows before truncating
-            pre_count_truncate_tables(db, tables)
-          else
-            # Truncate each table normally
-            truncate_tables(db, tables)
-          end
+          truncate_tables(db, tables)
         end
       end
 
       private
 
-      def pre_count_truncate_tables(db, tables)
-        tables = tables.reject { |table| db[table.to_sym].count == 0 }
-        truncate_tables(db, tables)
+      def pre_count_tables tables
+        tables.reject { |table| db[table.to_sym].count == 0 }
       end
 
       def truncate_tables(db, tables)
         tables.each do |table|
           db[table.to_sym].truncate
+          if db.database_type == :sqlite && db.table_exists?(:sqlite_sequence)
+            db[:sqlite_sequence].where(name: table).delete
+          end
         end
       end
 

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

@@ -0,0 +1,5 @@
+module DatabaseCleaner
+  module Sequel
+    VERSION = "1.8.0"
+  end
+end

data/lib/database_cleaner.rb

@@ -1,12 +1,47 @@
 $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__))) unless $LOAD_PATH.include?(File.expand_path(File.dirname(__FILE__)))
+require 'database_cleaner/version'
 require 'database_cleaner/configuration'
+require 'database_cleaner/deprecation'
+require 'forwardable'
 
 module DatabaseCleaner
   class << self
-    attr_accessor :allow_remote_database_url, :allow_production
+    extend Forwardable
+    delegate [
+      :[],
+      :app_root=,
+      :app_root,
+      :logger=,
+      :logger,
+      :cleaners,
+      :cleaners=,
+      :strategy=,
+      :orm=,
+      :start,
+      :clean,
+      :clean_with,
+      :cleaning,
+
+      # TODO remove in 2.0
+      :clean!,
+      :clean_with!,
+      :init_cleaners,
+      :add_cleaner,
+      :connections,
+      :remove_duplicates,
+    ] => :configuration
+
+    attr_accessor :allow_remote_database_url, :allow_production, :url_whitelist
 
     def can_detect_orm?
+      DatabaseCleaner.deprecate "Calling `DatabaseCleaner.can_detect_orm?` is deprecated, and will be removed in database_cleaner 2.0 with no replacement."
       DatabaseCleaner::Base.autodetect_orm
     end
+
+    private
+
+    def configuration
+      @configuration ||= Configuration.new
+    end
   end
 end