database_cleaner 0.7.2 → 0.8.0

data/History.txt

@@ -1,10 +1,15 @@
-== 0.7.x (in git)
+== 0.8.x (in git)
+
+== 0.8.0 2012-06-02
+
+  * Support for Mongoid 3/Moped (Andrew Bennett)
+  * Postgres Adapter no longer generates invalid SQL when no tables provided. (Michael-Keith Bernard)
 
 == 0.7.2 2012-03-21
 
-  * Proper Mysql2Adapter fix (Jonathan Viney)
-  * Sequel::Transaction works with latest Sequel (David Barri)
-  * Documenation fixes/improvements (David Barri, Ben Mabey, Kevin Moore)
+  * Proper Mysql2Adapter superclass fix. (Jonathan Viney)
+  * Sequel::Transaction works with latest Sequel. (David Barri)
+  * Documenation fixes/improvements. (David Barri, Ben Mabey, Kevin Moore)
 
 == 0.7.1 2012-01-15
 

data/README.textile

@@ -29,6 +29,12 @@ with any ORM library. You can also explicitly use it by setting your strategy to
 
 For support or to discuss development please use the "Google Group":http://groups.google.com/group/database_cleaner.
 
+h2. Dependencies
+
+Because database_cleaner supports multiple ORMs, it doesn't make sense to include all the dependencies
+for each one in the gemspec.  However, the DataMapper adapter does depend on dm-transactions.  Therefore,
+if you use DataMapper, you must include dm-transactions in your Gemfile/bundle/gemset manually.  
+
 h2. How to use
 
 <pre>
@@ -74,6 +80,22 @@ strategy the remaining time.  To accomplish this you can say:
   # then make the DatabaseCleaner.start and DatabaseCleaner.clean calls appropriately
 </pre>
 
+h3. Minitest Example
+
+<pre>
+DatabaseCleaner.strategy = :transaction
+
+class MiniTest::Spec
+  before :each do
+    DatabaseCleaner.clean
+  end
+
+  after :each do
+    DatabaseCleaner.clean
+  end
+end
+</pre>
+
 h3. RSpec Example
 
 <pre>

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 0
 :build: 
-:minor: 7
-:patch: 2
+:minor: 8
+:patch: 0

data/features/cleaning.feature

@@ -19,4 +19,4 @@ Feature: database cleaning
     | DataMapper   | truncation    |
     | MongoMapper  | truncation    |
     | Mongoid      | truncation    |
-    | CouchPotato  | truncation    |
+    #    | CouchPotato  | truncation    |

data/features/cleaning_default_strategy.feature

@@ -16,4 +16,4 @@ Feature: database cleaning
     | DataMapper   |
     | MongoMapper  |
     | Mongoid      |
-    | CouchPotato  |
+    #    | CouchPotato  |

data/features/cleaning_multiple_orms.feature

@@ -14,16 +14,16 @@ Feature: database cleaning using multiple ORMs
     | ActiveRecord | DataMapper   |
     | ActiveRecord | MongoMapper  |
     | ActiveRecord | Mongoid      |
-    | ActiveRecord | CouchPotato  |
+    #| ActiveRecord | CouchPotato  |
     | DataMapper   | ActiveRecord |
     | DataMapper   | MongoMapper  |
     | DataMapper   | Mongoid      |
-    | DataMapper   | CouchPotato  |
+    #| DataMapper   | CouchPotato  |
     | MongoMapper  | ActiveRecord |
     | MongoMapper  | DataMapper   |
     | MongoMapper  | Mongoid      |
-    | MongoMapper  | CouchPotato  |
-    | CouchPotato  | ActiveRecord |
-    | CouchPotato  | DataMapper   |
-    | CouchPotato  | MongoMapper  |
-    | CouchPotato  | Mongoid      |
+    #| MongoMapper  | CouchPotato  |
+    #    | CouchPotato  | ActiveRecord |
+    #| CouchPotato  | DataMapper   |
+    #| CouchPotato  | MongoMapper  |
+    #| CouchPotato  | Mongoid      |

data/lib/database_cleaner/active_record/transaction.rb

@@ -1,7 +1,10 @@
 require 'database_cleaner/active_record/base'
+require 'database_cleaner/generic/transaction'
+
 module DatabaseCleaner::ActiveRecord
   class Transaction
     include ::DatabaseCleaner::ActiveRecord::Base
+    include ::DatabaseCleaner::Generic::Transaction
 
     def start
       if connection_klass.connection.respond_to?(:increment_open_transactions)

data/lib/database_cleaner/active_record/truncation.rb

@@ -96,6 +96,7 @@ module ActiveRecord
       end
       
       def truncate_tables(table_names)
+        return if table_names.nil? || table_names.empty?
         execute("TRUNCATE TABLE #{table_names.map{|name| quote_table_name(name)}.join(', ')} #{restart_identity} #{cascade};")
       end
 

data/lib/database_cleaner/configuration.rb

@@ -84,6 +84,8 @@ module DatabaseCleaner
           DatabaseCleaner::Mongoid
         when :mongo_mapper
           DatabaseCleaner::MongoMapper
+        when :moped
+          DatabaseCleaner::Moped
         when :couch_potato
           DatabaseCleaner::CouchPotato
         when :sequel

data/lib/database_cleaner/data_mapper/transaction.rb

@@ -1,8 +1,10 @@
 require 'database_cleaner/data_mapper/base'
+require 'database_cleaner/generic/transaction'
 
 module DatabaseCleaner::DataMapper
   class Transaction
     include ::DatabaseCleaner::DataMapper::Base
+    include ::DatabaseCleaner::Generic::Transaction
 
     def start(repository = self.db)
       ::DataMapper.repository(repository) do |r|

data/lib/database_cleaner/generic/transaction.rb

@@ -0,0 +1,11 @@
+module DatabaseCleaner
+  module Generic
+    module Transaction
+      def initialize(opts = {})
+        if !opts.empty?
+          raise ArgumentError, "Options are not available for transaction strategies."
+        end
+      end
+    end
+  end
+end

data/lib/database_cleaner/mongoid/truncation.rb

@@ -1,20 +1,37 @@
 require 'database_cleaner/mongoid/base'
 require 'database_cleaner/generic/truncation'
 require 'database_cleaner/mongo/truncation'
+require 'database_cleaner/moped/truncation'
+require 'mongoid/version'
 
 module DatabaseCleaner
   module Mongoid
     class Truncation
       include ::DatabaseCleaner::Mongoid::Base
       include ::DatabaseCleaner::Generic::Truncation
-      include ::DatabaseCleaner::Mongo::Truncation
 
-      private
+      if ::Mongoid::VERSION < '3'
+
+        include ::DatabaseCleaner::Mongo::Truncation
+
+        private
+
+        def database
+          ::Mongoid.database
+        end
+
+      else
+
+        include ::DatabaseCleaner::Moped::Truncation
+
+        private
+
+        def session
+          ::Mongoid.default_session
+        end
 
-      def database
-        ::Mongoid.database
       end
 
-  end
+    end
   end
 end

data/lib/database_cleaner/moped/truncation.rb

@@ -0,0 +1,25 @@
+module DatabaseCleaner
+  module Moped
+    module Truncation
+
+      def clean
+        if @only
+          collections.each { |c| session[c].drop if @only.include?(c.name) }
+        else
+          collections.each { |c| session[c].drop unless @tables_to_exclude.include?(c) }
+        end
+        true
+      end
+
+      private
+
+      def collections
+        session['system.namespaces'].find(:name => { '$not' => /system|\$/ }).to_a.map do |collection|
+          _, name = collection['name'].split('.', 2)
+          name
+        end
+      end
+
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: database_cleaner
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 63
   prerelease: 
   segments: 
   - 0
-  - 7
-  - 2
-  version: 0.7.2
+  - 8
+  - 0
+  version: 0.8.0
 platform: ruby
 authors: 
 - Ben Mabey
@@ -15,7 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-21 00:00:00 Z
+date: 2012-06-02 00:00:00 -06:00
+default_executable: 
 dependencies: []
 
 description: Strategies for cleaning databases.  Can be used to ensure a clean state for testing.
@@ -75,12 +76,14 @@ files:
 - lib/database_cleaner/data_mapper/transaction.rb
 - lib/database_cleaner/data_mapper/truncation.rb
 - lib/database_cleaner/generic/base.rb
+- lib/database_cleaner/generic/transaction.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
 - lib/database_cleaner/mongoid/truncation.rb
+- lib/database_cleaner/moped/truncation.rb
 - lib/database_cleaner/null_strategy.rb
 - lib/database_cleaner/sequel/base.rb
 - lib/database_cleaner/sequel/transaction.rb
@@ -108,6 +111,7 @@ files:
 - spec/spec_helper.rb
 - LICENSE
 - TODO
+has_rdoc: true
 homepage: http://github.com/bmabey/database_cleaner
 licenses: []
 
@@ -137,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Strategies for cleaning databases.  Can be used to ensure a clean state for testing.