database_cleaner 0.6.1.rc → 0.6.1

data/History.txt

@@ -1,10 +1,13 @@
-== 0.6.1 (in git)
+== 0.6.2 (in git)
+
+== 0.6.1 2011-01-27
 
  === New Features
   * Default strategies for all ORM libs are defined. (GH-36, GH-38 Prem Sichanugrist)
   * Add a NullStrategy. (GH-6 Ben Mabey)
 
  === Bugfixes
+  * Mongo colletion indexes are dropped for collections being removed. (GH-41 Ben Mabey)
   * Exclude database views from tables_to_truncate, if the connection adapter
     supports reading from the ANSI standard information_schema views. (GH-25 Samer Abukhait)
   * ORM types can be specified in string format and not mysteriously blowup. (GH-26 Ben Mabey)

data/lib/database_cleaner/mongo/truncation.rb

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

data/lib/database_cleaner/mongo_mapper/truncation.rb

@@ -1,35 +1,18 @@
 require 'database_cleaner/mongo_mapper/base'
 require 'database_cleaner/generic/truncation'
+require 'database_cleaner/mongo/truncation'
 
 module DatabaseCleaner
   module MongoMapper
     class Truncation
       include ::DatabaseCleaner::MongoMapper::Base
       include ::DatabaseCleaner::Generic::Truncation
-
-      def clean
-        if @only
-          collections.each { |c| c.remove if @only.include?(c.name) }
-        elsif @tables_to_exclude
-          collections.each { |c| c.remove unless @tables_to_exclude.include?(c.name) }
-        else
-          collections.each { |c| c.remove }
-        end
-        true
-      end
-
+      include ::DatabaseCleaner::Mongo::Truncation
+      
       private
 
-      def connection
-        ::MongoMapper.connection
-      end
-
-      def collections
-        connection.db(database).collections.select { |c| c.name !~ /^system/ }
-      end
-
       def database
-        ::MongoMapper.database.name
+        ::MongoMapper.database
       end
     end
   end

data/lib/database_cleaner/mongoid/truncation.rb

@@ -1,25 +1,18 @@
 require 'database_cleaner/mongoid/base'
 require 'database_cleaner/generic/truncation'
+require 'database_cleaner/mongo/truncation'
 
 module DatabaseCleaner
   module Mongoid
     class Truncation
       include ::DatabaseCleaner::Mongoid::Base
       include ::DatabaseCleaner::Generic::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
+      include ::DatabaseCleaner::Mongo::Truncation
 
       private
 
-      def collections
-        ::Mongoid.database.collections.select { |c| c.name !~ /^system/ }
+      def database
+        ::Mongoid.database
       end
 
   end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: database_cleaner
 version: !ruby/object:Gem::Version 
-  hash: 7712046
-  prerelease: true
+  hash: 5
+  prerelease: false
   segments: 
   - 0
   - 6
   - 1
-  - rc
-  version: 0.6.1.rc
+  version: 0.6.1
 platform: ruby
 authors: 
 - Ben Mabey
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-16 00:00:00 -07:00
+date: 2011-01-27 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -84,6 +83,7 @@ files:
 - lib/database_cleaner/data_mapper/truncation.rb
 - lib/database_cleaner/generic/base.rb
 - lib/database_cleaner/generic/truncation.rb
+- lib/database_cleaner/mongo/truncation.rb
 - lib/database_cleaner/mongo_mapper/base.rb
 - lib/database_cleaner/mongo_mapper/truncation.rb
 - lib/database_cleaner/mongoid/base.rb
@@ -103,7 +103,6 @@ files:
 - spec/database_cleaner/mongo_mapper/base_spec.rb
 - spec/database_cleaner/mongo_mapper/mongo_examples.rb
 - spec/database_cleaner/mongo_mapper/truncation_spec.rb
-- spec/database_cleaner/mongoid/truncation_spec.rb
 - spec/database_cleaner/shared_strategy_spec.rb
 - spec/rcov.opts
 - spec/spec.opts
@@ -159,7 +158,6 @@ test_files:
 - spec/database_cleaner/mongo_mapper/base_spec.rb
 - spec/database_cleaner/mongo_mapper/mongo_examples.rb
 - spec/database_cleaner/mongo_mapper/truncation_spec.rb
-- spec/database_cleaner/mongoid/truncation_spec.rb
 - spec/database_cleaner/shared_strategy_spec.rb
 - spec/spec_helper.rb
 - examples/features/step_definitions/activerecord_steps.rb

data/spec/database_cleaner/mongoid/truncation_spec.rb

@@ -1,84 +0,0 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require 'mongoid'
-require 'database_cleaner/mongoid/truncation'
-
-TEST_DATABASE = 'database_cleaner_specs'
-Mongoid.configure do |config|
-  name = TEST_DATABASE
-  config.master = Mongo::Connection.new.db(name)
-end
-
-class TestClassA
-  include Mongoid::Document
-  field :name
-end
-
-class TestClassB
-  include Mongoid::Document
-  field :name
-end
-
-
-module DatabaseCleaner
-  module Mongoid
-
-    describe Truncation do
-      before(:each) do
-        ::Mongoid.database.connection.drop_database(TEST_DATABASE)
-        #::MongoMapper.connection.db(TEST_DATABASE).collections.each {|c| c.remove }
-        #::MongoMapper.database = TEST_DATABASE
-      end
-
-      def ensure_counts(expected_counts)
-        # I had to add this sanity_check garbage because I was getting non-determinisc results from mongomapper at times..
-        # very odd and disconcerting...
-        sanity_check = expected_counts.delete(:sanity_check)
-        begin
-          expected_counts.each do |model_class, expected_count|
-            model_class.count.should equal(expected_count), "#{model_class} expected to have a count of #{expected_count} but was #{model_class.count}"
-          end
-        rescue Spec::Expectations::ExpectationNotMetError => e
-          raise !sanity_check ? e : Spec::ExpectationNotMetError::ExpectationNotMetError.new("SANITY CHECK FAILURE! This should never happen here: #{e.message}")
-        end
-      end
-
-      def create_testclassa(attrs={})
-        TestClassA.new({:name => 'some testclassa'}.merge(attrs)).save!
-      end
-
-      def create_testclassb(attrs={})
-        TestClassB.new({:name => 'some testclassb'}.merge(attrs)).save!
-      end
-
-      it "truncates all collections by default" do
-        create_testclassa
-        create_testclassb
-        ensure_counts(TestClassA => 1, TestClassB => 1, :sanity_check => true)
-        Truncation.new.clean
-        ensure_counts(TestClassA => 0, TestClassB => 0)
-      end
-
-      context "when collections are provided to the :only option" do
-        it "only truncates the specified collections" do
-          create_testclassa
-          create_testclassb
-          ensure_counts(TestClassA => 1, TestClassB => 1, :sanity_check => true)
-          Truncation.new(:only => ['test_class_as']).clean
-          ensure_counts(TestClassA => 0, TestClassB => 1)
-        end
-      end
-
-      context "when collections are provided to the :except option" do
-        it "truncates all but the specified collections" do
-          create_testclassa
-          create_testclassb
-          ensure_counts(TestClassA => 1, TestClassB => 1, :sanity_check => true)
-          Truncation.new(:except => ['test_class_as']).clean
-          ensure_counts(TestClassA => 1, TestClassB => 0)
-        end
-      end
-
-    end
-
-  end
-end