database_cleaner 1.0.0.RC1 → 1.0.1

data/features/step_definitions/redis_steps.rb

@@ -0,0 +1,31 @@
+Given /^I have setup database cleaner to clean multiple databases using redis$/ do
+  #DatabaseCleaner
+  # require "#{File.dirname(__FILE__)}/../../../lib/redis_models"
+  #
+  # DatabaseCleaner[:redis, {:connection => ENV['REDIS_URL_ONE']} ].strategy = :truncation
+  # DatabaseCleaner[:redis, {:connection => ENV['REDIS_URL_TWO']} ].strategy = :truncation
+end
+
+When /^I create a widget using redis$/ do
+  RedisWidget.create!
+end
+
+Then /^I should see ([\d]+) widget using redis$/ do |widget_count|
+  RedisWidget.count.should == widget_count.to_i
+end
+
+When /^I create a widget in one db using redis$/ do
+  RedisWidgetUsingDatabaseOne.create!
+end
+
+When /^I create a widget in another db using redis$/ do
+  RedisWidgetUsingDatabaseTwo.create!
+end
+
+Then /^I should see ([\d]+) widget in one db using redis$/ do |widget_count|
+  RedisWidgetUsingDatabaseOne.count.should == widget_count.to_i
+end
+
+Then /^I should see ([\d]+) widget in another db using redis$/ do |widget_count|
+  RedisWidgetUsingDatabaseTwo.count.should == widget_count.to_i
+end

data/lib/database_cleaner/active_record/base.rb

@@ -38,10 +38,6 @@ module DatabaseCleaner
         end
       end
 
-      def create_connection_class
-        Class.new(::ActiveRecord::Base)
-      end
-
       def connection_class
         @connection_class ||= if @db && !@db.is_a?(Symbol)
                                 @db
@@ -63,9 +59,7 @@ module DatabaseCleaner
       end
 
       def establish_connection
-        strategy_class = create_connection_class
-        strategy_class.send :establish_connection, connection_hash
-        strategy_class
+        ::ActiveRecord::Base.establish_connection(connection_hash)
       end
 
     end

data/lib/database_cleaner/active_record/transaction.rb

@@ -7,6 +7,10 @@ module DatabaseCleaner::ActiveRecord
     include ::DatabaseCleaner::Generic::Transaction
 
     def start
+      # Hack to make sure that the connection is properly setup for
+      # the clean code.
+      connection_class.connection.transaction{ }
+
       if connection_maintains_transaction_count?
         if connection_class.connection.respond_to?(:increment_open_transactions)
           connection_class.connection.increment_open_transactions

data/lib/database_cleaner/base.rb

@@ -36,12 +36,22 @@ module DatabaseCleaner
 
     def clean_with(*args)
       strategy = create_strategy(*args)
+      set_strategy_db strategy, self.db
+
       strategy.clean
       strategy
     end
 
     alias clean_with! clean_with
 
+    def set_strategy_db(strategy, desired_db)
+      if strategy.respond_to? :db=
+        strategy.db = desired_db
+      elsif desired_db != :default
+        raise ArgumentError, "You must provide a strategy object that supports non default databases when you specify a database"
+      end
+    end
+
     def strategy=(args)
       strategy, *strategy_args = args
        if strategy.is_a?(Symbol)
@@ -52,7 +62,7 @@ module DatabaseCleaner
          raise ArgumentError, "You must provide a strategy object, or a symbol for a known strategy along with initialization params."
        end
 
-       self.strategy_db = self.db
+       set_strategy_db @strategy, self.db
 
        @strategy
     end
@@ -120,8 +130,14 @@ module DatabaseCleaner
           :couch_potato
         elsif defined? ::Sequel
           :sequel
+        elsif defined? ::Moped
+          :moped
+        elsif defined? ::Ohm
+          :ohm
+        elsif defined? ::Redis
+          :redis
         else
-          raise NoORMDetected, "No known ORM was detected!  Is ActiveRecord, DataMapper, Sequel, MongoMapper, Mongoid, or CouchPotato loaded?"
+          raise NoORMDetected, "No known ORM was detected!  Is ActiveRecord, DataMapper, Sequel, MongoMapper, Mongoid, Moped, or CouchPotato, Redis or Ohm loaded?"
         end
       end
     end
@@ -130,7 +146,7 @@ module DatabaseCleaner
       case orm
       when :active_record, :data_mapper, :sequel
         self.strategy = :transaction
-      when :mongo_mapper, :mongoid, :couch_potato
+      when :mongo_mapper, :mongoid, :couch_potato, :moped, :ohm, :redis
         self.strategy = :truncation
       end
     end

data/lib/database_cleaner/configuration.rb

@@ -11,7 +11,7 @@ module DatabaseCleaner
       # ghetto ordered hash.. maintains 1.8 compat and old API
       @connections ||= []
     end
-    
+
     def [](orm,opts = {})
       raise NoORMDetected unless orm
       init_cleaners
@@ -113,6 +113,10 @@ module DatabaseCleaner
           DatabaseCleaner::CouchPotato
         when :sequel
           DatabaseCleaner::Sequel
+        when :ohm
+          DatabaseCleaner::Ohm
+        when :redis
+          DatabaseCleaner::Redis
       end
     end
   end

data/lib/database_cleaner/mongoid/truncation.rb

@@ -1,7 +1,7 @@
 require 'database_cleaner/mongoid/base'
 require 'database_cleaner/generic/truncation'
 require 'database_cleaner/mongo/truncation_mixin'
-require 'database_cleaner/moped/truncation'
+require 'database_cleaner/moped/truncation_base'
 require 'mongoid/version'
 
 module DatabaseCleaner
@@ -22,7 +22,7 @@ module DatabaseCleaner
 
       else
 
-        include ::DatabaseCleaner::Moped::Truncation
+        include ::DatabaseCleaner::Moped::TruncationBase
 
         private
 

data/lib/database_cleaner/moped/base.rb

@@ -0,0 +1,35 @@
+require 'database_cleaner/generic/base'
+
+module DatabaseCleaner
+  module Moped
+    def self.available_strategies
+      %w[truncation]
+    end
+
+    module Base
+      include ::DatabaseCleaner::Generic::Base
+
+      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
+
+      private
+
+      def session
+        ::Moped::Session.new([host], database: db)
+      end
+    end
+  end
+end

data/lib/database_cleaner/moped/truncation.rb

@@ -1,29 +1,9 @@
+require 'database_cleaner/moped/truncation_base'
+
 module DatabaseCleaner
   module Moped
-    module Truncation
-
-      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
-        true
-      end
-
-      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
-        end
-      end
-
+    class Truncation
+      include ::DatabaseCleaner::Moped::TruncationBase
     end
   end
 end

data/lib/database_cleaner/moped/truncation_base.rb

@@ -0,0 +1,34 @@
+require 'database_cleaner/moped/base'
+require 'database_cleaner/generic/truncation'
+
+module DatabaseCleaner
+  module Moped
+    module TruncationBase
+      include ::DatabaseCleaner::Moped::Base
+      include ::DatabaseCleaner::Generic::Truncation
+
+      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
+        true
+      end
+
+      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
+        end
+      end
+
+    end
+  end
+end

data/lib/database_cleaner/ohm/truncation.rb

@@ -0,0 +1,15 @@
+require 'database_cleaner/redis/truncation'
+
+module DatabaseCleaner
+  module Ohm
+    class Truncation < ::DatabaseCleaner::Redis::Truncation
+
+      private
+
+      def default_redis
+        ::Ohm.redis
+      end
+
+    end
+  end
+end

data/lib/database_cleaner/redis/base.rb

@@ -0,0 +1,31 @@
+require 'database_cleaner/generic/base'
+
+module DatabaseCleaner
+  module Redis
+    def self.available_strategies
+      %w{truncation}
+    end
+
+    module Base
+      include ::DatabaseCleaner::Generic::Base
+
+      def db=(desired_db)
+        @db = desired_db
+      end
+
+      def db
+        @db || :default
+      end
+
+      alias url db
+
+      private
+
+      def connection
+        @connection ||= url == :default ? ::Redis.connect : ::Redis.connect(:url => url)
+      end
+
+    end
+  end
+end
+

data/lib/database_cleaner/redis/truncation.rb

@@ -0,0 +1,26 @@
+require 'database_cleaner/redis/base'
+require 'database_cleaner/generic/truncation'
+
+module DatabaseCleaner
+  module Redis
+    class Truncation
+      include ::DatabaseCleaner::Redis::Base
+      include ::DatabaseCleaner::Generic::Truncation
+
+      def clean
+        if @only
+          @only.each do |term|
+            connection.keys(term).each { |k| connection.del k }
+          end
+        elsif @tables_to_exclude
+          keys_except = []
+          @tables_to_exclude.each { |term| keys_except += connection.keys(term) }
+          connection.keys.each { |k| connection.del(k) unless keys_except.include?(k) }
+        else
+          connection.flushdb
+        end
+        connection.quit unless url == :default
+      end
+    end
+  end
+end

data/spec/database_cleaner/active_record/base_spec.rb

@@ -119,16 +119,6 @@ my_db:
         end
       end
 
-      describe "create_connection_class" do
-        it "should return a class" do
-          subject.create_connection_class.should be_a(Class)
-        end
-
-        it "should return a class extending ::ActiveRecord::Base" do
-          subject.create_connection_class.ancestors.should include(::ActiveRecord::Base)
-        end
-      end
-
       describe "connection_class" do
         it { expect { subject.connection_class }.to_not raise_error }
         it "should default to ActiveRecord::Base" do
@@ -158,16 +148,9 @@ my_db:
           before { ::ActiveRecord::Base.stub!(:respond_to?).and_return(false) }
           before { subject.stub(:connection_hash).and_return(hash) }
 
-          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_class if connection_hash is set" do
-            strategy_class = mock('strategy_class')
-            strategy_class.should_receive(:establish_connection).with(hash)
+          it "establish a connection using ActiveRecord::Base" do
+            ::ActiveRecord::Base.should_receive(:establish_connection).with(hash)
 
-            subject.should_receive(:create_connection_class).and_return(strategy_class)
             subject.connection_class
           end
         end

data/spec/database_cleaner/active_record/transaction_spec.rb

@@ -15,6 +15,7 @@ module DatabaseCleaner
         [:begin_transaction, :begin_db_transaction].each do |begin_transaction_method|
           context "using #{begin_transaction_method}" do
             before do
+              connection.stub(:transaction)
               connection.stub(begin_transaction_method)
               connection.stub(:respond_to?).with(:begin_transaction).and_return(:begin_transaction == begin_transaction_method)
             end
@@ -35,6 +36,7 @@ module DatabaseCleaner
               connection.stub(:respond_to?).with(:increment_open_transactions).and_return(true)
               connection.stub(:increment_open_transactions)
               connection.should_receive(begin_transaction_method)
+              connection.should_receive(:transaction)
               Transaction.new.start
             end
           end

data/spec/database_cleaner/base_spec.rb

@@ -18,6 +18,9 @@ module DatabaseCleaner
          Temp_MO = ::Mongoid      if defined?(::Mongoid)      and not defined?(Temp_MO)
          Temp_CP = ::CouchPotato  if defined?(::CouchPotato)  and not defined?(Temp_CP)
          Temp_SQ = ::Sequel       if defined?(::Sequel)       and not defined?(Temp_SQ)
+         Temp_MP = ::Moped        if defined?(::Moped)        and not defined?(Temp_MP)
+         Temp_RS = ::Redis        if defined?(::Redis)        and not defined?(Temp_RS)
+         Temp_OH = ::Ohm          if defined?(::Ohm)          and not defined?(Temp_OH)
        end
 
        #Remove all ORM mocks and restore from cache
@@ -28,6 +31,9 @@ module DatabaseCleaner
          Object.send(:remove_const, 'Mongoid')      if defined?(::Mongoid)
          Object.send(:remove_const, 'CouchPotato')  if defined?(::CouchPotato)
          Object.send(:remove_const, 'Sequel')       if defined?(::Sequel)
+         Object.send(:remove_const, 'Moped')        if defined?(::Moped)
+         Object.send(:remove_const, 'Ohm')          if defined?(::Ohm)
+         Object.send(:remove_const, 'Redis')        if defined?(::Redis)
 
 
          # Restore ORMs
@@ -36,6 +42,9 @@ module DatabaseCleaner
          ::MongoMapper  = Temp_MM if defined? Temp_MM
          ::Mongoid      = Temp_MO if defined? Temp_MO
          ::CouchPotato  = Temp_CP if defined? Temp_CP
+         ::Moped        = Temp_MP if defined? Temp_MP
+         ::Ohm          = Temp_OH if defined? Temp_OH
+         ::Redis        = Temp_RS if defined? Temp_RS
        end
 
        #reset the orm mocks
@@ -46,8 +55,11 @@ module DatabaseCleaner
          Object.send(:remove_const, 'Mongoid')      if defined?(::Mongoid)
          Object.send(:remove_const, 'CouchPotato')  if defined?(::CouchPotato)
          Object.send(:remove_const, 'Sequel')       if defined?(::Sequel)
+         Object.send(:remove_const, 'Moped')        if defined?(::Moped)
+         Object.send(:remove_const, 'Ohm')          if defined?(::Ohm)
+         Object.send(:remove_const, 'Redis')        if defined?(::Redis)
        end
-       
+
        let(:cleaner) { DatabaseCleaner::Base.new :autodetect }
 
        it "should raise an error when no ORM is detected" do
@@ -61,6 +73,9 @@ module DatabaseCleaner
          Object.const_set('Mongoid',     'Mongoid mock')
          Object.const_set('CouchPotato', 'Couching mock potatos')
          Object.const_set('Sequel',      'Sequel mock')
+         Object.const_set('Moped',       'Moped mock')
+         Object.const_set('Ohm',         'Ohm mock')
+         Object.const_set('Redis',       'Redis mock')
 
          cleaner.orm.should == :active_record
          cleaner.should be_auto_detected
@@ -72,6 +87,9 @@ module DatabaseCleaner
          Object.const_set('Mongoid',     'Mongoid mock')
          Object.const_set('CouchPotato', 'Couching mock potatos')
          Object.const_set('Sequel',      'Sequel mock')
+         Object.const_set('Moped',       'Moped mock')
+         Object.const_set('Ohm',         'Ohm mock')
+         Object.const_set('Redis',       'Redis mock')
 
          cleaner.orm.should == :data_mapper
          cleaner.should be_auto_detected
@@ -82,6 +100,9 @@ module DatabaseCleaner
          Object.const_set('Mongoid',     'Mongoid mock')
          Object.const_set('CouchPotato', 'Couching mock potatos')
          Object.const_set('Sequel',      'Sequel mock')
+         Object.const_set('Moped',       'Moped mock')
+         Object.const_set('Ohm',         'Ohm mock')
+         Object.const_set('Redis',       'Redis mock')
 
          cleaner.orm.should == :mongo_mapper
          cleaner.should be_auto_detected
@@ -91,6 +112,9 @@ module DatabaseCleaner
          Object.const_set('Mongoid',     'Mongoid mock')
          Object.const_set('CouchPotato', 'Couching mock potatos')
          Object.const_set('Sequel',      'Sequel mock')
+         Object.const_set('Moped',       'Moped mock')
+         Object.const_set('Ohm',         'Ohm mock')
+         Object.const_set('Redis',       'Redis mock')
 
          cleaner.orm.should == :mongoid
          cleaner.should be_auto_detected
@@ -99,17 +123,45 @@ module DatabaseCleaner
        it "should detect CouchPotato fifth" do
          Object.const_set('CouchPotato', 'Couching mock potatos')
          Object.const_set('Sequel',      'Sequel mock')
+         Object.const_set('Moped',       'Moped mock')
+         Object.const_set('Ohm',         'Ohm mock')
+         Object.const_set('Redis',       'Redis mock')
 
          cleaner.orm.should == :couch_potato
          cleaner.should be_auto_detected
        end
-       
-       it "should detect Sequel last" do
+
+       it "should detect Sequel sixth" do
          Object.const_set('Sequel', 'Sequel mock')
+         Object.const_set('Moped',  'Moped mock')
+         Object.const_set('Ohm',    'Ohm mock')
+         Object.const_set('Redis',  'Redis mock')
 
          cleaner.orm.should == :sequel
          cleaner.should be_auto_detected
        end
+
+       it 'detects Ohm seventh' do
+         Object.const_set('Ohm', 'Ohm mock')
+         Object.const_set('Redis',       'Redis mock')
+
+         cleaner.orm.should == :ohm
+         cleaner.should be_auto_detected
+       end
+
+       it 'detects Redis last' do
+         Object.const_set('Redis',       'Redis mock')
+
+         cleaner.orm.should == :redis
+         cleaner.should be_auto_detected
+       end
+
+       it 'detects Moped seventh' do
+         Object.const_set('Moped', 'Moped mock')
+
+         cleaner.orm.should == :moped
+         cleaner.should be_auto_detected
+       end
     end
 
     describe "orm_module" do
@@ -160,7 +212,7 @@ module DatabaseCleaner
           cleaner = ::DatabaseCleaner::Base.new "mongoid"
           cleaner.orm.should == :mongoid
         end
-        
+
         it "is autodetected if orm is not provided" do
           cleaner = ::DatabaseCleaner::Base.new
           cleaner.should be_auto_detected
@@ -317,7 +369,7 @@ module DatabaseCleaner
 
       it "should attempt to set strategy db" do
         subject.stub(:db).and_return(:my_db)
-        subject.should_receive(:strategy_db=).with(:my_db)
+        subject.should_receive(:set_strategy_db).with(mock_strategy, :my_db)
         subject.strategy = mock_strategy
       end
 
@@ -330,8 +382,7 @@ module DatabaseCleaner
     describe "strategy" do
       subject { ::DatabaseCleaner::Base.new :a_orm }
 
-      it "returns a null strategy when strategy no set and undetectable" do
-        subject.instance_values["@strategy"] = nil
+      it "returns a null strategy when strategy is not set and undetectable" do
         subject.strategy.should == DatabaseCleaner::NullStrategy
       end
 
@@ -487,6 +538,21 @@ module DatabaseCleaner
         cleaner = DatabaseCleaner::Base.new(:couch_potato)
         cleaner.strategy.should be_instance_of DatabaseCleaner::CouchPotato::Truncation
       end
+
+      it 'sets strategy to :truncation for Moped' do
+        cleaner = DatabaseCleaner::Base.new(:moped)
+        cleaner.strategy.should be_instance_of DatabaseCleaner::Moped::Truncation
+      end
+
+      it 'sets strategy to :truncation for Ohm' do
+        cleaner = DatabaseCleaner::Base.new(:ohm)
+        cleaner.strategy.should be_instance_of DatabaseCleaner::Ohm::Truncation
+      end
+
+      it 'sets strategy to :truncation for Redis' do
+        cleaner = DatabaseCleaner::Base.new(:redis)
+        cleaner.strategy.should be_instance_of DatabaseCleaner::Redis::Truncation
+      end
     end
 
   end