database_cleaner 0.8.0 → 0.9.1

data/lib/database_cleaner/base.rb

@@ -8,7 +8,7 @@ module DatabaseCleaner
       else
         self.orm = desired_orm
       end
-      self.db = opts[:connection] if opts.has_key? :connection
+      self.db = opts[:connection] || opts[:model] if opts.has_key?(:connection) || opts.has_key?(:model)
       set_default_orm_strategy
     end
 
@@ -85,7 +85,7 @@ module DatabaseCleaner
 
     #TODO make strategies directly comparable
     def ==(other)
-      self.orm == other.orm && self.db == other.db && self.strategy.class == other.strategy.class
+      self.orm == other.orm && self.db == other.db
     end
 
     private

data/lib/database_cleaner/configuration.rb

@@ -6,11 +6,29 @@ module DatabaseCleaner
   class UnknownStrategySpecified < ArgumentError;   end
 
   class << self
+    def init_cleaners
+      @cleaners ||= {}
+      # ghetto ordered hash.. maintains 1.8 compat and old API
+      @connections ||= []
+    end
+    
     def [](orm,opts = {})
       raise NoORMDetected unless orm
-      @connections ||= []
+      init_cleaners
+      # TODO: deprecate
+      # this method conflates creation with lookup.  Both a command and a query. Yuck.
+      if @cleaners.has_key? [orm, opts]
+        @cleaners[[orm, opts]]
+      else
+        add_cleaner(orm, opts)
+      end
+    end
+
+    def add_cleaner(orm,opts = {})
+      init_cleaners
       cleaner = DatabaseCleaner::Base.new(orm,opts)
-      connections.push cleaner
+      @cleaners[[orm, opts]] = cleaner
+      @connections << cleaner
       cleaner
     end
 
@@ -23,7 +41,12 @@ module DatabaseCleaner
     end
 
     def connections
-      @connections ||= [::DatabaseCleaner::Base.new]
+      # double yuck.. can't wait to deprecate this whole class...
+      unless @cleaners
+        autodetected = ::DatabaseCleaner::Base.new
+        add_cleaner(autodetected.orm)
+      end
+      @connections
     end
 
     def logger=(log_source)

data/lib/database_cleaner/data_mapper/truncation.rb

@@ -166,8 +166,8 @@ module DatabaseCleaner
       end
 
       # overwritten
-      def migration_storage_name
-        'migration_info'
+      def migration_storage_names
+        %w[migration_info]
       end
 
     end

data/lib/database_cleaner/generic/truncation.rb

@@ -2,8 +2,8 @@ module DatabaseCleaner
   module Generic
     module Truncation
       def initialize(opts={})
-        if !opts.empty? && !(opts.keys - [:only, :except]).empty?
-          raise ArgumentError, "The only valid options are :only and :except. You specified #{opts.keys.join(',')}."
+        if !opts.empty? && !(opts.keys - [:only, :except, :pre_count, :reset_ids]).empty?
+          raise ArgumentError, "The only valid options are :only, :except, :pre_count or :reset_ids. You specified #{opts.keys.join(',')}."
         end
         if opts.has_key?(:only) && opts.has_key?(:except)
           raise ArgumentError, "You may only specify either :only or :except.  Doing both doesn't really make sense does it?"
@@ -11,7 +11,9 @@ module DatabaseCleaner
 
         @only = opts[:only]
         @tables_to_exclude = (opts[:except] || []).dup
-        @tables_to_exclude << migration_storage_name if migration_storage_name
+        @tables_to_exclude += migration_storage_names
+        @pre_count = opts[:pre_count]
+        @reset_ids = opts[:reset_ids]
       end
 
       def start
@@ -29,8 +31,8 @@ module DatabaseCleaner
 
       # overwrite in subclasses
       # default implementation given because migration storage need not be present
-      def migration_storage_name
-        nil
+      def migration_storage_names
+        %w[]
       end
     end
   end

data/lib/database_cleaner/mongo/base.rb

@@ -0,0 +1,16 @@
+module DatabaseCleaner
+  module Mongo
+    def self.available_strategies
+      %w[truncation]
+    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,22 +1,17 @@
+require 'database_cleaner/mongo/base'
+require 'database_cleaner/generic/truncation'
+require 'database_cleaner/mongo/truncation_mixin'
 module DatabaseCleaner
   module Mongo
-    module Truncation
-
-      def clean
-        if @only
-          collections.each { |c| c.remove if @only.include?(c.name) }
-        else
-          collections.each { |c| c.remove unless @tables_to_exclude.include?(c.name) }
-        end
-        true
-      end
-
+    class Truncation
+      include ::DatabaseCleaner::Generic::Truncation
+      include TruncationMixin
+      include Base
       private
 
-      def collections
-        database.collections.select { |c| c.name !~ /^system\./ }
+      def database
+        db
       end
-
     end
   end
 end

data/lib/database_cleaner/mongo/truncation_mixin.rb

@@ -0,0 +1,22 @@
+module DatabaseCleaner
+  module Mongo
+    module TruncationMixin
+
+      def clean
+        if @only
+          collections.each { |c| c.remove if @only.include?(c.name) }
+        else
+          collections.each { |c| c.remove unless @tables_to_exclude.include?(c.name) }
+        end
+        true
+      end
+
+      private
+
+      def collections
+        database.collections.select { |c| c.name !~ /^system\./ }
+      end
+
+    end
+  end
+end

data/lib/database_cleaner/mongo_mapper/truncation.rb

@@ -1,13 +1,13 @@
 require 'database_cleaner/mongo_mapper/base'
 require 'database_cleaner/generic/truncation'
-require 'database_cleaner/mongo/truncation'
+require 'database_cleaner/mongo/truncation_mixin'
 
 module DatabaseCleaner
   module MongoMapper
     class Truncation
       include ::DatabaseCleaner::MongoMapper::Base
       include ::DatabaseCleaner::Generic::Truncation
-      include ::DatabaseCleaner::Mongo::Truncation
+      include ::DatabaseCleaner::Mongo::TruncationMixin
       
       private
 

data/lib/database_cleaner/mongoid/truncation.rb

@@ -1,6 +1,6 @@
 require 'database_cleaner/mongoid/base'
 require 'database_cleaner/generic/truncation'
-require 'database_cleaner/mongo/truncation'
+require 'database_cleaner/mongo/truncation_mixin'
 require 'database_cleaner/moped/truncation'
 require 'mongoid/version'
 
@@ -12,7 +12,7 @@ module DatabaseCleaner
 
       if ::Mongoid::VERSION < '3'
 
-        include ::DatabaseCleaner::Mongo::Truncation
+        include ::DatabaseCleaner::Mongo::TruncationMixin
 
         private
 

data/lib/database_cleaner/moped/truncation.rb

@@ -4,9 +4,9 @@ module DatabaseCleaner
 
       def clean
         if @only
-          collections.each { |c| session[c].drop if @only.include?(c.name) }
+          collections.each { |c| session[c].find.remove_all if @only.include?(c) }
         else
-          collections.each { |c| session[c].drop unless @tables_to_exclude.include?(c) }
+          collections.each { |c| session[c].find.remove_all unless @tables_to_exclude.include?(c) }
         end
         true
       end
@@ -14,6 +14,10 @@ module DatabaseCleaner
       private
 
       def collections
+        if db != :default
+          session.use(db)
+        end
+        
         session['system.namespaces'].find(:name => { '$not' => /system|\$/ }).to_a.map do |collection|
           _, name = collection['name'].split('.', 2)
           name

data/lib/database_cleaner/sequel/truncation.rb

@@ -6,9 +6,9 @@ module DatabaseCleaner
     class Truncation
       include ::DatabaseCleaner::Sequel::Base
       include ::DatabaseCleaner::Generic::Truncation
-  
+
       def clean
-        case db_type= db.url.sub(/:.+/,'').to_sym
+        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:
@@ -25,7 +25,7 @@ module DatabaseCleaner
           end
         end
       end
-  
+
       def each_table
         tables_to_truncate(db).each do |table|
           yield db, table
@@ -33,14 +33,14 @@ module DatabaseCleaner
       end
 
       private
-  
+
       def tables_to_truncate(db)
         (@only || db.tables) - @tables_to_exclude
       end
 
       # overwritten
-      def migration_storage_name
-        :schema_info
+      def migration_storage_names
+        %w[schema_info schema_migrations]
       end
 
     end

data/spec/database_cleaner/active_record/base_spec.rb

@@ -1,7 +1,13 @@
 require 'spec_helper'
 require 'active_record'
 require 'database_cleaner/active_record/base'
-require 'database_cleaner/shared_strategy_spec'
+require 'database_cleaner/shared_strategy'
+
+class FakeModel
+  def self.connection
+    :fake_connection
+  end
+end
 
 module DatabaseCleaner
   describe ActiveRecord do
@@ -105,37 +111,43 @@ my_db:
         end
       end
 
-      describe "create_connection_klass" do
+      describe "create_connection_class" do
         it "should return a class" do
-          subject.create_connection_klass.should be_a(Class)
+          subject.create_connection_class.should be_a(Class)
         end
 
         it "should return a class extending ::ActiveRecord::Base" do
-          subject.create_connection_klass.ancestors.should include(::ActiveRecord::Base)
+          subject.create_connection_class.ancestors.should include(::ActiveRecord::Base)
         end
       end
 
-      describe "connection_klass" do
-        it { expect{ subject.connection_klass }.to_not raise_error }
+      describe "connection_class" do
+        it { expect{ subject.connection_class }.to_not raise_error }
         it "should default to ActiveRecord::Base" do
-          subject.connection_klass.should == ::ActiveRecord::Base
+          subject.connection_class.should == ::ActiveRecord::Base
+        end
+
+        it "allows for database models to be passed in" do
+          subject.db = FakeModel
+          subject.connection_class.should == FakeModel
         end
 
         context "when connection_hash is set" do
           let(:hash) { mock("hash") }
+          before { ::ActiveRecord::Base.stub!(:respond_to?).and_return(false)}
           before { subject.stub(:connection_hash).and_return(hash) }
 
-          it "should create connection_klass if it doesnt exist if connection_hash is set" do
-            subject.should_receive(:create_connection_klass).and_return(mock('class').as_null_object)
-            subject.connection_klass
+          it "should create connection_class if it doesnt exist if connection_hash is set" do
+            subject.should_receive(:create_connection_class).and_return(mock('class').as_null_object)
+            subject.connection_class
           end
 
-          it  "should configure the class from create_connection_klass if connection_hash is set" do
-            klass = mock('klass')
-            klass.should_receive(:establish_connection).with(hash)
+          it  "should configure the class from create_connection_class if connection_hash is set" do
+            strategy_class = mock('strategy_class')
+            strategy_class.should_receive(:establish_connection).with(hash)
 
-            subject.should_receive(:create_connection_klass).and_return(klass)
-            subject.connection_klass
+            subject.should_receive(:create_connection_class).and_return(strategy_class)
+            subject.connection_class
           end
         end
       end

data/spec/database_cleaner/active_record/truncation/mysql2_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+require 'active_record'
+require 'support/active_record/mysql2_setup'
+require 'database_cleaner/active_record/truncation'
+require 'database_cleaner/active_record/truncation/shared_fast_truncation'
+
+module ActiveRecord
+  module ConnectionAdapters
+    describe do 
+      before(:all) { active_record_mysql2_setup }
+
+      let(:adapter) { Mysql2Adapter }
+      let(:connection) { active_record_mysql2_connection }
+
+      describe "#truncate_table" do
+        it "should truncate the table" do
+          2.times { User.create }
+
+          connection.truncate_table('users')
+          User.count.should == 0
+        end
+
+        it "should reset AUTO_INCREMENT index of table" do
+          2.times { User.create }
+          User.delete_all
+
+          connection.truncate_table('users')
+
+          User.create.id.should == 1
+        end
+      end
+
+      it_behaves_like "an adapter with pre-count truncation" do
+        let(:adapter) { Mysql2Adapter }
+        let(:connection) { active_record_mysql2_connection }
+      end
+    end
+  end
+end
+

data/spec/database_cleaner/active_record/truncation/mysql_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+require 'active_record'
+require 'support/active_record/mysql_setup'
+require 'database_cleaner/active_record/truncation'
+require 'database_cleaner/active_record/truncation/shared_fast_truncation'
+
+module ActiveRecord
+  module ConnectionAdapters
+    describe do 
+      before(:all) { active_record_mysql_setup }
+
+      let(:adapter) { MysqlAdapter }
+      let(:connection) { active_record_mysql_connection }
+
+      describe "#truncate_table" do
+        it "should truncate the table" do
+          2.times { User.create }
+
+          connection.truncate_table('users')
+          User.count.should == 0
+        end
+
+        it "should reset AUTO_INCREMENT index of table" do
+          2.times { User.create }
+          User.delete_all
+
+          connection.truncate_table('users')
+
+          User.create.id.should == 1
+        end
+      end
+ 
+      it_behaves_like "an adapter with pre-count truncation" do
+        let(:adapter) { MysqlAdapter }
+        let(:connection) { active_record_mysql_connection }
+      end
+    end
+  end
+end
+

data/spec/database_cleaner/active_record/truncation/postgresql_spec.rb

@@ -0,0 +1,48 @@
+require 'spec_helper'
+require 'active_record'
+require 'support/active_record/postgresql_setup'
+require 'database_cleaner/active_record/truncation'
+require 'database_cleaner/active_record/truncation/shared_fast_truncation'
+
+module ActiveRecord
+  module ConnectionAdapters
+    describe do
+      before(:all) { active_record_pg_setup }
+
+      let(:adapter) { PostgreSQLAdapter }
+
+      let(:connection) do
+        active_record_pg_connection
+      end
+
+      before(:each) do
+        connection.truncate_tables connection.tables
+      end
+
+      describe "#truncate_table" do
+        it "truncates the table" do
+          2.times { User.create }
+
+          connection.truncate_table('users')
+          User.count.should == 0
+        end
+
+        it "resets AUTO_INCREMENT index of table" do
+          2.times { User.create }
+          User.delete_all
+
+          connection.truncate_table('users')
+
+          User.create.id.should == 1
+        end
+      end
+
+      it_behaves_like "an adapter with pre-count truncation" do
+        let(:adapter) { PostgreSQLAdapter }
+        let(:connection) { active_record_pg_connection }
+      end
+
+    end
+  end
+end
+