apartment 0.14.4 → 0.15.0

data/spec/config/database.yml

@@ -4,10 +4,10 @@ connections:
     database: apartment_postgresql_test
     min_messages: WARNING
     username: root
-    password: 
+    password:
 
   mysql:
     adapter: mysql2
     database: apartment_mysql_test
     username: root
-    password: 
+    password:

data/spec/database_spec.rb

@@ -0,0 +1,110 @@
+require 'spec_helper'
+
+describe Apartment::Database do
+  
+  context "using postgresql" do
+    
+    # See apartment.yml file in dummy app config
+    
+    let(:config){ Apartment::Test.config['connections']['postgresql'].symbolize_keys }
+    let(:database){ Apartment::Test.next_db }
+    let(:database2){ Apartment::Test.next_db }
+    
+    before do
+      Apartment.use_postgres_schemas = true
+      ActiveRecord::Base.establish_connection config
+      Apartment::Test.load_schema   # load the Rails schema in the public db schema
+      subject.stub(:config).and_return config   # Use postgresql database config for this test
+    end
+    
+    describe "#adapter" do
+      before do
+        subject.reload!
+      end
+      
+      it "should load postgresql adapter" do
+        subject.adapter
+        Apartment::Adapters::PostgresqlAdapter.should be_a(Class)
+      end
+      
+      it "should raise exception with invalid adapter specified" do
+        subject.stub(:config).and_return config.merge(:adapter => 'unkown')
+        
+        expect {
+          Apartment::Database.adapter
+        }.to raise_error
+      end
+      
+    end
+    
+    context "with schemas" do
+      
+      before do
+        Apartment.configure do |config|
+          config.excluded_models = []
+          config.use_postgres_schemas = true
+          config.seed_after_create = true
+        end
+        subject.create database
+      end
+      
+      after{ subject.drop database }
+      
+      describe "#create" do
+        it "should seed data" do
+          subject.switch database
+          User.count.should be > 0
+        end
+      end
+    
+      describe "#switch" do
+        
+        let(:x){ rand(3) }
+        
+        context "creating models" do
+          
+          before{ subject.create database2 }
+          after{ subject.drop database2 }
+          
+          it "should create a model instance in the current schema" do
+            subject.switch database2
+            db2_count = User.count + x.times{ User.create }
+
+            subject.switch database
+            db_count = User.count + x.times{ User.create }
+
+            subject.switch database2
+            User.count.should == db2_count
+
+            subject.switch database
+            User.count.should == db_count
+          end
+        end
+        
+        context "with excluded models" do
+          
+          before do
+            Apartment.configure do |config|
+              config.excluded_models = ["Company"]
+            end
+            subject.init
+          end
+          
+          it "should create excluded models in public schema" do
+            subject.reset # ensure we're on public schema
+            count = Company.count + x.times{ Company.create }
+            
+            subject.switch database
+            x.times{ Company.create }
+            Company.count.should == count + x
+            subject.reset
+            Company.count.should == count + x
+          end
+        end
+        
+      end
+            
+    end
+    
+  end
+end

data/spec/dummy/db/schema.rb

@@ -11,7 +11,13 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20110613152810) do
+ActiveRecord::Schema.define(:version => 20111202022214) do
+
+  create_table "books", :force => true do |t|
+    t.string   "name"
+    t.integer  "pages"
+    t.datetime "published"
+  end
 
   create_table "companies", :force => true do |t|
     t.boolean "dummy"

data/spec/examples/db_adapter_examples.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+shared_examples_for "a db based apartment adapter" do
+  include Apartment::Spec::AdapterRequirements
+  
+  let(:default_database){ subject.process{ ActiveRecord::Base.connection.current_database } }
+  
+  describe "#init" do
+    
+    it "should process model exclusions" do
+      Apartment.configure do |config|
+        config.excluded_models = ["Company"]
+      end
+      
+      Apartment::Database.init
+      
+      Company.connection.object_id.should_not == ActiveRecord::Base.connection.object_id
+    end
+  end
+  
+  describe "#drop" do
+    it "should raise an error for unknown database" do
+      expect {
+        subject.drop 'unknown_database'
+      }.to raise_error(Apartment::DatabaseNotFound)
+    end
+  end  
+  
+  describe "#switch" do
+    it "should raise an error if database is invalid" do
+      expect {
+        subject.switch 'unknown_database'
+      }.to raise_error(Apartment::DatabaseNotFound)
+    end
+  end
+end

data/spec/examples/generic_adapter_examples.rb

@@ -0,0 +1,97 @@
+require 'spec_helper'
+
+shared_examples_for "a generic apartment adapter" do
+  include Apartment::Spec::AdapterRequirements
+  
+  before{ Apartment.prepend_environment = false }
+  
+  #
+  #   Creates happen already in our before_filter
+  #
+  describe "#create" do
+
+    it "should create the new databases" do
+      database_names.should include(db1)
+      database_names.should include(db2)
+    end
+
+    it "should load schema.rb to new schema" do
+      subject.process(db1) do
+        connection.tables.should include('companies')
+      end
+    end
+    
+    it "should yield to block if passed and reset" do
+      subject.drop(db2) # so we don't get errors on creation
+
+      @count = 0  # set our variable so its visible in and outside of blocks
+
+      subject.create(db2) do
+        @count = User.count
+        subject.current_database.should == db2
+        User.create
+      end
+      
+      subject.current_database.should_not == db2
+
+      subject.process(db2){ User.count.should == @count + 1 }
+    end    
+  end
+  
+  describe "#drop" do
+    it "should remove the db" do
+      subject.drop db1
+      database_names.should_not include(db1)
+    end    
+  end
+  
+  describe "#process" do
+    it "should connect" do
+      subject.process(db1) do
+        subject.current_database.should == db1
+      end
+    end
+
+    it "should reset" do
+      subject.process(db1)
+      subject.current_database.should == default_database
+    end
+
+    # We're often finding when using Apartment in tests, the `current_database` (ie the previously connect to db)
+    # gets dropped, but process will try to return to that db in a test.  We should just reset if it doesn't exist
+    it "should not throw exception if current_database is no longer accessible" do
+      subject.switch(db2)
+
+      expect {
+        subject.process(db1){ subject.drop(db2) }
+      }.to_not raise_error
+    end
+  end
+  
+  describe "#reset" do
+    it "should reset connection" do
+      subject.switch(db1)
+      subject.reset
+      subject.current_database.should == default_database
+    end
+  end
+
+  describe "#switch" do
+    it "should connect to new db" do
+      subject.switch(db1)
+      subject.current_database.should == db1
+    end
+
+    it "should reset connection if database is nil" do
+      subject.switch
+      subject.current_database.should == default_database
+    end    
+  end
+
+  describe "#current_database" do
+    it "should return the current db name" do
+      subject.switch(db1)
+      subject.current_database.should == db1
+    end
+  end
+end

data/spec/examples/schema_adapter_examples.rb

@@ -0,0 +1,130 @@
+require 'spec_helper'
+
+shared_examples_for "a schema based apartment adapter" do
+  include Apartment::Spec::AdapterRequirements
+  
+  let(:schema1){ db1 }
+  let(:schema2){ db2 }
+  let(:public_schema){ default_database }
+
+  describe "#init" do
+    
+    it "should process model exclusions" do
+      Apartment.configure do |config|
+        config.excluded_models = ["Company"]
+      end
+      
+      Apartment::Database.init
+      
+      Company.table_name.should == "public.companies"
+    end
+  end
+
+  #
+  #   Creates happen already in our before_filter
+  #
+  describe "#create" do
+
+    it "should load schema.rb to new schema" do
+      connection.schema_search_path = schema1
+      connection.tables.should include('companies')
+    end
+    
+    it "should yield to block if passed and reset" do
+      subject.drop(schema2) # so we don't get errors on creation
+
+      @count = 0  # set our variable so its visible in and outside of blocks
+
+      subject.create(schema2) do
+        @count = User.count
+        connection.schema_search_path.should == schema2
+        User.create
+      end
+      
+      connection.schema_search_path.should_not == schema2
+
+      subject.process(schema2){ User.count.should == @count + 1 }
+    end
+    
+    it "should allow numeric database names" do
+      expect {
+        subject.create(1234)
+      }.to_not raise_error
+      database_names.should include("1234")
+      # cleanup
+      subject.drop(1234)
+    end
+    
+  end
+  
+  describe "#drop" do
+    it "should raise an error for unknown database" do
+      expect {
+        subject.drop "unknown_database"
+      }.to raise_error(Apartment::SchemaNotFound)
+    end
+    
+    it "should be able to drop numeric dbs" do
+      subject.create(1234)
+      expect {
+        subject.drop(1234)
+      }.to_not raise_error
+      database_names.should_not include("1234")
+    end
+  end
+
+  describe "#process" do
+    it "should connect" do
+      subject.process(schema1) do
+        connection.schema_search_path.should == schema1
+      end
+    end
+
+    it "should reset" do
+      subject.process(schema1)
+      connection.schema_search_path.should == public_schema
+    end
+  end
+
+  describe "#reset" do
+    it "should reset connection" do
+      subject.switch(schema1)
+      subject.reset
+      connection.schema_search_path.should == public_schema
+    end
+  end
+
+  describe "#switch" do
+    it "should connect to new schema" do
+      subject.switch(schema1)
+      connection.schema_search_path.should == schema1
+    end
+
+    it "should reset connection if database is nil" do
+      subject.switch
+      connection.schema_search_path.should == public_schema
+    end
+    
+    it "should raise an error if schema is invalid" do
+      expect {
+        subject.switch 'unknown_schema'
+      }.to raise_error(Apartment::SchemaNotFound)
+    end
+    
+    it "should connect to numeric dbs" do
+      subject.create(1234)
+      expect {
+        subject.switch(1234)
+      }.to_not raise_error
+      subject.drop(1234)
+    end
+  end
+
+  describe "#current_database" do
+    it "should return the current schema name" do
+      subject.switch(schema1)
+      subject.current_database.should == schema1
+    end
+  end
+
+end

data/spec/integration/apartment_rake_integration_spec.rb

@@ -29,7 +29,8 @@ describe "apartment rake tasks" do
   context "with x number of databases" do
 
     let(:x){ 1 + rand(5) }    # random number of dbs to create
-    let(:db_names){ x.times.map{|y| "database_#{y}" } }
+    let(:db_names){ x.times.map{ Apartment::Test.next_db } }
+    let!(:company_count){ Company.count + db_names.length }
 
     before do
       db_names.collect do |db_name|
@@ -45,7 +46,7 @@ describe "apartment rake tasks" do
 
     describe "#migrate" do
       it "should migrate all databases" do
-        Apartment::Migrator.should_receive(:migrate).exactly(db_names.length).times
+        Apartment::Migrator.should_receive(:migrate).exactly(company_count).times
 
         @rake['apartment:migrate'].invoke
       end
@@ -64,7 +65,7 @@ describe "apartment rake tasks" do
 
     describe "apartment:seed" do
       it "should seed all databases" do
-        Apartment::Database.should_receive(:seed).exactly(db_names.length).times
+        Apartment::Database.should_receive(:seed).exactly(company_count).times
 
         @rake['apartment:seed'].invoke
       end

data/spec/integration/delayed_job_integration_spec.rb

@@ -7,14 +7,13 @@ describe Apartment::Delayed do
   # See apartment.yml file in dummy app config
 
   let(:config){ Apartment::Test.config['connections']['postgresql'].symbolize_keys }
-  let(:database){ "some_new_database" }
-  let(:database2){ "another_db" }
+  let(:database){ Apartment::Test.next_db }
+  let(:database2){ Apartment::Test.next_db }
 
   before do
     ActiveRecord::Base.establish_connection config
     Apartment::Test.load_schema   # load the Rails schema in the public db schema
     Apartment::Database.stub(:config).and_return config   # Use postgresql database config for this test
-    @schema_search_path = ActiveRecord::Base.connection.schema_search_path
 
     Apartment.configure do |config|
       config.use_postgres_schemas = true