database_cleaner 0.4.3 → 0.5.0

data/History.txt

@@ -1,9 +1,19 @@
-0.4.x (In Git)
+0.5.x (In Git)
+
+== 0.5.0 2010-02-22 - The CouchPotato Release
+
+ === New features
+  * Basic truncation support for CouchPotato / CouchDB. (Martin Rehfeld)
+  * SQLite3 on JRuby will fall back to delete if truncate doesn't work. (Darrin Holst)
+  * JDBC is used for ActiveRecord automaticaly when JRuby is detected. (Darrin Holst)
+
+ === Bufixes
+  * MongoMapper truncation strategy now works with :only and :except options. (Ben Mabey)
 
 == 0.4.3 2010-01-17
 
  === New features
-    Truncation for ActiveRecord oracle_enhanced adapter. (Edgars Beigarts)
+  * Truncation for ActiveRecord oracle_enhanced adapter. (Edgars Beigarts)
 
 == 0.4.2 2010-01-12
 

data/README.textile

@@ -5,7 +5,7 @@ The original use case was to ensure a clean state during tests.  Each strategy
 is a small amount of code but is code that is usually needed in any ruby app
 that is testing with a database.
 
-ActiveRecord, DataMapper and MongoMapper are supported.
+ActiveRecord, DataMapper, MongoMapper and CouchPotato are supported.
 
 h2. How to use
 

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
-:minor: 4
-:patch: 3
+:minor: 5
 :build: 
+:patch: 0
 :major: 0

data/examples/features/support/env.rb

@@ -5,9 +5,9 @@ orm      = ENV['ORM']
 strategy = ENV['STRATEGY']
 
 if orm && strategy
-  
+
   begin
-    require "#{File.dirname(__FILE__)}/../../lib/#{orm}"
+    require "#{File.dirname(__FILE__)}/../../lib/#{orm}_models"
   rescue LoadError
     raise "You don't have the #{orm} ORM installed"
   end
@@ -19,5 +19,5 @@ if orm && strategy
   DatabaseCleaner.strategy = strategy.to_sym
   
 else
-  raise "Run 'ORM=activerecord|datamapper|mongomapper STRATEGY=transaction|truncation cucumber examples/features'"
+  raise "Run 'ORM=activerecord|datamapper|mongomapper|couchpotato STRATEGY=transaction|truncation cucumber examples/features'"
 end

data/examples/lib/activerecord_models.rb

@@ -0,0 +1,12 @@
+require 'active_record'
+
+ActiveRecord::Base.establish_connection(:adapter => "#{"jdbc" if defined?(JRUBY_VERSION)}sqlite3", :database => ":memory:")
+
+ActiveRecord::Schema.define(:version => 1) do
+  create_table :widgets do |t|
+    t.string :name
+  end
+end
+
+class Widget < ActiveRecord::Base
+end

data/examples/lib/couchpotato_models.rb

@@ -0,0 +1,21 @@
+require 'couch_potato'
+
+::CouchPotato::Config.database_name = 'couch_potato_test'
+
+class Widget
+  include CouchPotato::Persistence
+  
+  property :name
+  view :by_name, :key => :name
+  
+
+  # mimic the AR interface used in example_steps
+
+  def self.create!(attrs = {})
+    CouchPotato.database.save(self.new)
+  end
+  
+  def self.count
+    CouchPotato.database.view(::Widget.by_name).size
+  end
+end

data/examples/lib/{mongomapper.rb → mongomapper_models.rb}

@@ -1,4 +1,4 @@
-require 'mongo_mapper'
+require 'mongomapper'
 
 ::MongoMapper.connection = Mongo::Connection.new('127.0.0.1')
 ::MongoMapper.database = 'database_cleaner_test'
@@ -7,4 +7,11 @@ class Widget
   include MongoMapper::Document
   key :id, Integer
   key :name, String
+
+  class << self
+    #mongomapper doesn't seem to provide this...
+    def create!(*args)
+      new(*args).save!
+    end
+  end
 end

data/features/cleaning.feature

@@ -17,3 +17,4 @@ Feature: database cleaning
     | DataMapper   | transaction   |
     | DataMapper   | truncation    |
     | MongoMapper  | truncation    |
+    | CouchPotato  | truncation    |

data/features/step_definitions/database_cleaner_steps.rb

@@ -1,4 +1,4 @@
-Given /^I am using (ActiveRecord|DataMapper|MongoMapper)$/ do |orm|
+Given /^I am using (ActiveRecord|DataMapper|MongoMapper|CouchPotato)$/ do |orm|
   @orm = orm
 end
 
@@ -11,7 +11,7 @@ When "I run my scenarios that rely on a clean database" do
   Dir.chdir(full_dir) do
     ENV['ORM'] = @orm.downcase
     ENV['STRATEGY'] = @strategy
-    @out = `cucumber features`
+    @out = `#{"jruby -S " if defined?(JRUBY_VERSION)}cucumber features`
     @status = $?.exitstatus
   end
 end

data/lib/database_cleaner/active_record/truncation.rb

@@ -17,7 +17,11 @@ module ActiveRecord
 
     class JdbcAdapter
       def truncate_table(table_name)
-        execute("TRUNCATE TABLE #{quote_table_name(table_name)};")
+        begin
+          execute("TRUNCATE TABLE #{quote_table_name(table_name)};")
+        rescue ActiveRecord::StatementInvalid
+          execute("DELETE FROM #{quote_table_name(table_name)};")
+        end
       end
     end
 

data/lib/database_cleaner/configuration.rb

@@ -22,6 +22,12 @@ module DatabaseCleaner
     end
   end
 
+  module CouchPotato
+    def self.available_strategies
+      %w[truncation]
+    end
+  end
+
   class << self
 
     def create_strategy(*args)
@@ -81,8 +87,10 @@ module DatabaseCleaner
           'data_mapper'
         elsif defined? ::MongoMapper
           'mongo_mapper'
+        elsif defined? ::CouchPotato
+          'couch_potato'
         else
-          raise NoORMDetected, "No known ORM was detected!  Is ActiveRecord or DataMapper loaded?"
+          raise NoORMDetected, "No known ORM was detected!  Is ActiveRecord, DataMapper, MongoMapper or CouchPotato loaded?"
         end
       end
     end
@@ -96,6 +104,8 @@ module DatabaseCleaner
         DatabaseCleaner::DataMapper
       when 'mongo_mapper'
         DatabaseCleaner::MongoMapper
+      when 'couch_potato'
+        DatabaseCleaner::CouchPotato
       end
     end
 

data/lib/database_cleaner/couch_potato/truncation.rb

@@ -0,0 +1,26 @@
+require 'database_cleaner/truncation_base'
+
+module DatabaseCleaner
+  module CouchPotato
+    class Truncation < DatabaseCleaner::TruncationBase
+      def initialize(options = {})
+        if options.has_key?(:only) || options.has_key?(:except)
+          raise ArgumentError, "The :only and :except options are not available for use with CouchPotato/CouchDB."
+        elsif !options.empty?
+          raise ArgumentError, "Unsupported option. You specified #{options.keys.join(',')}."
+        end
+        super
+      end
+
+      def clean
+        database.recreate!
+      end
+
+      private
+
+      def database
+        ::CouchPotato.couchrest_database
+      end
+    end
+  end
+end

data/lib/database_cleaner/mongo_mapper/truncation.rb

@@ -4,7 +4,12 @@ module DatabaseCleaner
   module MongoMapper
     class Truncation < DatabaseCleaner::TruncationBase
       def clean
-        connection.db(database).collections.each { |c| c.remove }
+        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
@@ -13,6 +18,10 @@ module DatabaseCleaner
         ::MongoMapper.connection
       end
 
+      def collections
+        connection.db(database).collections
+      end
+
       def database
         ::MongoMapper.database.name
       end

data/spec/database_cleaner/configuration_spec.rb

@@ -2,16 +2,20 @@ require File.dirname(__FILE__) + '/../spec_helper'
 require 'database_cleaner/active_record/transaction'
 require 'database_cleaner/data_mapper/transaction'
 
+
 describe DatabaseCleaner do
 
   # These examples muck around with the constants for autodetection so we need to clean up....
   before(:all) do
     TempAR = ActiveRecord unless defined?(TempAR)
+    TempMM = MongoMapper unless defined?(TempMM)
+    Object.send(:remove_const, 'MongoMapper') if defined?(::MongoMapper)
     # need to add one for each ORM that we load in the spec helper...
   end
   after(:all) do
     Object.send(:remove_const, 'ActiveRecord') if defined?(::ActiveRecord) #want to make sure we have the real one...
     ActiveRecord = TempAR
+    MongoMapper = TempMM
   end
 
   before(:each) do
@@ -25,7 +29,6 @@ describe DatabaseCleaner do
     it "should initialize and return the appropirate strategy" do
       DatabaseCleaner::ActiveRecord::Transaction.should_receive(:new).with('options' => 'hash')
       result = DatabaseCleaner.create_strategy(:transaction, {'options' => 'hash'})
-
       result.should == @strategy
     end
   end
@@ -34,7 +37,6 @@ describe DatabaseCleaner do
     it "should initialize the appropirate strategy and clean with it" do
       DatabaseCleaner::ActiveRecord::Transaction.should_receive(:new).with('options' => 'hash')
       @strategy.should_receive(:clean)
-
       DatabaseCleaner.clean_with(:transaction, 'options' => 'hash')
     end
   end
@@ -55,6 +57,7 @@ describe DatabaseCleaner do
     it "should raise an error when no ORM is detected" do
       Object.send(:remove_const, 'ActiveRecord') if defined?(::ActiveRecord)
       Object.send(:remove_const, 'DataMapper') if defined?(::DataMapper)
+      Object.send(:remove_const, 'CouchPotato') if defined?(::CouchPotato)
 
       running { DatabaseCleaner.strategy = :transaction }.should raise_error(DatabaseCleaner::NoORMDetected)
     end

data/spec/database_cleaner/couch_potato/truncation_spec.rb

@@ -0,0 +1,40 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+require 'database_cleaner/couch_potato/truncation'
+require 'couch_potato'
+
+module DatabaseCleaner
+  module CouchPotato
+
+    describe Truncation do
+      before(:each) do
+        @database = mock('database')
+        ::CouchPotato.stub!(:couchrest_database).and_return(@database)
+      end
+
+      it "should re-create the database" do
+        @database.should_receive(:recreate!)
+
+        Truncation.new.clean
+      end
+
+      it "should raise an error when the :only option is used" do
+        running {
+          Truncation.new(:only => ['document-type'])
+        }.should raise_error(ArgumentError)
+      end
+
+      it "should raise an error when the :except option is used" do
+        running {
+          Truncation.new(:except => ['document-type'])
+        }.should raise_error(ArgumentError)
+      end
+
+      it "should raise an error when invalid options are provided" do
+        running {
+          Truncation.new(:foo => 'bar')
+        }.should raise_error(ArgumentError)
+      end
+    end
+
+  end
+end

data/spec/database_cleaner/mongo_mapper/truncation_spec.rb

@@ -0,0 +1,81 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+require 'mongomapper'
+require 'database_cleaner/mongo_mapper/truncation'
+
+MongoMapper.connection = Mongo::Connection.new('127.0.0.1')
+TEST_DATABASE = 'database_cleaner_specs'
+MongoMapper.database = TEST_DATABASE
+
+class Widget
+  include MongoMapper::Document
+  key :name, String
+end
+class Gadget
+  include MongoMapper::Document
+  key :name, String
+end
+
+
+module DatabaseCleaner
+  module MongoMapper
+
+    describe Truncation do
+      before(:each) do
+        ::MongoMapper.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_widget(attrs={})
+        Widget.new({:name => 'some widget'}.merge(attrs)).save!
+      end
+
+      def create_gadget(attrs={})
+        Gadget.new({:name => 'some gadget'}.merge(attrs)).save!
+      end
+
+      it "truncates all collections by default" do
+        create_widget
+        create_gadget
+        ensure_counts(Widget => 1, Gadget => 1, :sanity_check => true)
+        Truncation.new.clean
+        ensure_counts(Widget => 0, Gadget => 0)
+      end
+
+      context "when collections are provided to the :only option" do
+        it "only truncates the specified collections" do
+          create_widget
+          create_gadget
+          ensure_counts(Widget => 1, Gadget => 1, :sanity_check => true)
+          Truncation.new(:only => ['widgets']).clean
+          ensure_counts(Widget => 0, Gadget => 1)
+        end
+      end
+
+      context "when collections are provided to the :except option" do
+        it "truncates all but the specified collections" do
+          create_widget
+          create_gadget
+          ensure_counts(Widget => 1, Gadget => 1, :sanity_check => true)
+          Truncation.new(:except => ['widgets']).clean
+          ensure_counts(Widget => 1, Gadget => 0)
+        end
+      end
+
+    end
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: database_cleaner
 version: !ruby/object:Gem::Version 
-  version: 0.4.3
+  version: 0.5.0
 platform: ruby
 authors: 
 - Ben Mabey
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-17 00:00:00 -07:00
+date: 2010-02-22 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -32,9 +32,10 @@ files:
 - examples/features/example.feature
 - examples/features/step_definitions/example_steps.rb
 - examples/features/support/env.rb
-- examples/lib/activerecord.rb
-- examples/lib/datamapper.rb
-- examples/lib/mongomapper.rb
+- examples/lib/activerecord_models.rb
+- examples/lib/couchpotato_models.rb
+- examples/lib/datamapper_models.rb
+- examples/lib/mongomapper_models.rb
 - features/cleaning.feature
 - features/step_definitions/database_cleaner_steps.rb
 - features/support/env.rb
@@ -42,6 +43,7 @@ files:
 - lib/database_cleaner/active_record/transaction.rb
 - lib/database_cleaner/active_record/truncation.rb
 - lib/database_cleaner/configuration.rb
+- lib/database_cleaner/couch_potato/truncation.rb
 - lib/database_cleaner/cucumber.rb
 - lib/database_cleaner/data_mapper/transaction.rb
 - lib/database_cleaner/data_mapper/truncation.rb
@@ -49,6 +51,8 @@ files:
 - lib/database_cleaner/truncation_base.rb
 - spec/database_cleaner/active_record/truncation_spec.rb
 - spec/database_cleaner/configuration_spec.rb
+- spec/database_cleaner/couch_potato/truncation_spec.rb
+- spec/database_cleaner/mongo_mapper/truncation_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - LICENSE
@@ -84,9 +88,12 @@ summary: Strategies for cleaning databases.  Can be used to ensure a clean state
 test_files: 
 - spec/database_cleaner/active_record/truncation_spec.rb
 - spec/database_cleaner/configuration_spec.rb
+- spec/database_cleaner/couch_potato/truncation_spec.rb
+- spec/database_cleaner/mongo_mapper/truncation_spec.rb
 - spec/spec_helper.rb
 - examples/features/step_definitions/example_steps.rb
 - examples/features/support/env.rb
-- examples/lib/activerecord.rb
-- examples/lib/datamapper.rb
-- examples/lib/mongomapper.rb
+- examples/lib/activerecord_models.rb
+- examples/lib/couchpotato_models.rb
+- examples/lib/datamapper_models.rb
+- examples/lib/mongomapper_models.rb

data/examples/lib/activerecord.rb

@@ -1,12 +0,0 @@
-require 'activerecord'
-
-ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :dbfile => ":memory:")
-
-ActiveRecord::Schema.define(:version => 1) do
-  create_table :widgets do |t|
-    t.string :name
-  end
-end
-
-class Widget < ActiveRecord::Base
-end