apartment 0.13.0.1 → 0.13.1

data/spec/apartment_spec.rb

@@ -4,7 +4,7 @@ describe Apartment do
   it "should be valid" do
     Apartment.should be_a(Module)
   end
-
+  
   it "should be a valid app" do
     ::Rails.application.should be_a(Dummy::Application)
   end

data/spec/dummy/db/schema.rb

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

data/spec/integration/database_integration_spec.rb

@@ -1,15 +1,15 @@
 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){ "some_new_database" }
     let(:database2){ "yet_another_database" }
-
+    
     before do
       Apartment.use_postgres_schemas = true
       ActiveRecord::Base.establish_connection config
@@ -17,47 +17,47 @@ describe Apartment::Database do
       Apartment::Database.stub(:config).and_return config   # Use postgresql database config for this test
       @schema_search_path = ActiveRecord::Base.connection.schema_search_path
     end
-
+    
     after do
       Apartment::Test.reset
     end
-
+    
     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
-
+    
     describe "#adapter" do
       before do
         Apartment::Database.reload!
       end
-
+      
       it "should load postgresql adapter" do
         Apartment::Database.adapter
         Apartment::Adapters::PostgresqlAdapter.should be_a(Class)
       end
-
+      
       it "should raise exception with invalid adapter specified" do
         Apartment::Database.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 = []
@@ -66,21 +66,21 @@ describe Apartment::Database do
         end
         Apartment::Database.create database
       end
-
+      
       after do
         Apartment::Test.drop_schema database
       end
-
+      
       describe "#process" do
-
+        
         before do
           Apartment::Database.create database2
         end
-
+        
         after do
           Apartment::Test.drop_schema database2
         end
-
+        
         it "should connect to new schema" do
           Apartment::Database.process(database) do
             Apartment::Database.current_database.should == database
@@ -92,49 +92,49 @@ describe Apartment::Database do
           Apartment::Database.process(database)
           Apartment::Database.current_database.should == database2
         end
-
+        
         it "should reset to previous schema if database is nil" do
           Apartment::Database.switch(database)
           Apartment::Database.process
           Apartment::Database.current_database.should == database
         end
-
+        
         it "should set to public schema if database is nil" do
           Apartment::Database.process do
             Apartment::Database.current_database.should == @schema_search_path
           end
         end
-
+        
       end
-
+      
       describe "#create" do
         it "should create new postgres schema" do
           ActiveRecord::Base.connection.execute("SELECT nspname FROM pg_namespace;").collect{|row| row['nspname']}.should include(database)
         end
-
+        
         it "should seed data" do
           Apartment::Database.switch database
           User.count.should be > 0
         end
       end
-
+    
       describe "#switch" do
-
+        
         let(:x){ rand(3) }
-
+        
         it "should connect to new schema" do
           Apartment::Database.switch database
           ActiveRecord::Base.connection.schema_search_path.should == database
         end
-
+        
         it "should fail with invalid schema" do
           expect {
             Apartment::Database.switch('some_nonexistent_schema')
           }.to raise_error Apartment::SchemaNotFound
         end
-
+        
         context "creating models" do
-
+          
           before do
             Apartment::Database.create database2
           end
@@ -142,7 +142,7 @@ describe Apartment::Database do
           after do
             Apartment::Test.drop_schema database2
           end
-
+          
           it "should create a model instance in the current schema" do
             Apartment::Database.switch database2
             db2_count = User.count + x.times{ User.create }
@@ -157,25 +157,25 @@ describe Apartment::Database do
             User.count.should == db_count
           end
         end
-
+        
         context "with excluded models" do
-
+          
           before do
             Apartment.configure do |config|
               config.excluded_models = ["Company"]
             end
             Apartment::Database.init
           end
-
+          
           it "should ignore excluded models" do
             Apartment::Database.switch database
             Company.table_name.should include('public')
           end
-
+          
           it "should create excluded models in public schema" do
             Apartment::Database.reset # ensure we're on public schema
             count = Company.count + x.times{ Company.create }
-
+            
             Apartment::Database.switch database
             x.times{ Company.create }
             Company.count.should == count + x
@@ -183,18 +183,18 @@ describe Apartment::Database do
             Company.count.should == count + x
           end
         end
-
+        
       end
-
+      
       describe "#current_database" do
-
+        
         it "should return the current schema search path" do
           Apartment::Database.switch database
           Apartment::Database.current_database.should == database
         end
       end
-
+      
     end
-
+    
   end
 end

data/spec/integration/middleware/subdomain_elevator_spec.rb

@@ -1,41 +1,41 @@
 require 'spec_helper'
 
 describe Apartment::Elevators::Subdomain do
-
+  
   let(:company){ mock_model(Company, :subdomain => 'foo').as_null_object }
   let(:domain){ "http://#{company.subdomain}.domain.com" }
-
+  
   before do
     Apartment.seed_after_create = false
     Apartment.use_postgres_schemas = true
-
+    
     Apartment::Database.create(company.subdomain)
   end
-
+  
   after do
     Apartment::Test.drop_schema(company.subdomain)
   end
-
+  
   context "single request" do
     it "should switch the db" do
       ActiveRecord::Base.connection.schema_search_path.should_not == 'foo'
-
+      
       visit(domain)
       ActiveRecord::Base.connection.schema_search_path.should == company.subdomain
     end
   end
-
+  
   context "simultaneous requests" do
     let(:company2){ mock_model(Company, :subdomain => 'bar').as_null_object }
     let(:domain2){ "http://#{company2.subdomain}.domain.com" }
-
+    
     before do
       Apartment::Database.create(company2.subdomain)
       # Create some users for each db
       Apartment::Database.process(company.subdomain) do
         @c1_user_count = (2 + rand(2)).times{ User.create }
       end
-
+      
       Apartment::Database.process(company2.subdomain) do
         @c2_user_count = (@c1_user_count + 2).times{ User.create }
       end
@@ -44,20 +44,20 @@ describe Apartment::Elevators::Subdomain do
     after do
       Apartment::Test.drop_schema(company2.subdomain)
     end
-
+    
     it "should fetch the correct user count for each session based on subdomain" do
       visit(domain)
-
+      
       in_new_session do |session|
         session.visit(domain2)
         User.count.should == @c2_user_count
       end
-
+      
       visit(domain)
       User.count.should == @c1_user_count
     end
-
-
+    
+    
   end
-
+  
 end

data/spec/spec_helper.rb

@@ -19,17 +19,13 @@ Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
 
 RSpec.configure do |config|
-
+  
   config.include RSpec::Integration::CapybaraSessions, :type => :request
-
+  
   config.before(:all) do
     # Ensure that each test starts with a clean connection
     # Necessary as some tests will leak things like current_schema into the next test
     ActiveRecord::Base.clear_all_connections!
   end
-
-  config.before(:each) do
-    Apartment.reset
-  end
-
+  
 end

data/spec/support/apartment_helpers.rb

@@ -1,32 +1,32 @@
 module Apartment
   module Test
-
+    
     extend self
-
+    
     def reset
       Apartment.excluded_models = nil
       Apartment.use_postgres_schemas = nil
     end
-
+    
     def drop_schema(schema)
       ActiveRecord::Base.silence{ ActiveRecord::Base.connection.execute("DROP SCHEMA IF EXISTS #{schema} CASCADE") } rescue true
     end
-
+    
     def create_schema(schema)
       ActiveRecord::Base.connection.execute("CREATE SCHEMA #{schema}")
     end
-
+    
     def load_schema
       silence_stream(STDOUT){ load("#{Rails.root}/db/schema.rb") }
     end
-
+    
     def migrate
       ActiveRecord::Migrator.migrate(Rails.root + ActiveRecord::Migrator.migrations_path)
     end
-
+    
     def rollback
       ActiveRecord::Migrator.rollback(Rails.root + ActiveRecord::Migrator.migrations_path)
     end
-
+    
   end
 end

data/spec/tasks/apartment_rake_spec.rb

@@ -18,6 +18,7 @@ describe "apartment rake tasks" do
   
   after do
     Rake.application = nil
+    ENV['VERSION'] = nil    # linux users reported env variable carrying on between tests
   end
   
   let(:version){ '1234' }

data/spec/unit/config_spec.rb

@@ -1,25 +1,29 @@
 require 'spec_helper'
 
 describe Apartment do
-
+  
   describe "#config" do
-
+    
     let(:excluded_models){ [Company] }
-
+    
+    after do
+      Apartment::Test.reset
+    end
+    
     it "should yield the Apartment object" do
       Apartment.configure do |config|
         config.excluded_models = []
         config.should == Apartment
       end
     end
-
+    
     it "should set excluded models" do
       Apartment.configure do |config|
         config.excluded_models = excluded_models
       end
       Apartment.excluded_models.should == excluded_models
     end
-
+    
     it "should set postgres_schemas" do
       Apartment.configure do |config|
         config.excluded_models = []
@@ -27,7 +31,7 @@ describe Apartment do
       end
       Apartment.use_postgres_schemas.should be_false
     end
-
+    
     it "should set seed_after_create" do
       Apartment.configure do |config|
         config.excluded_models = []
@@ -35,74 +39,40 @@ describe Apartment do
       end
       Apartment.seed_after_create.should be_true
     end
-
-    context "load schema" do
-      it "should default to true" do
-        Apartment.configure
-        Apartment.load_schema.should be_true
-      end
-
-      it "should set load_schema" do
-        Apartment.configure do |config|
-          config.load_schema = false
-        end
-        Apartment.load_schema.should be_false
-      end
-    end
-
+    
     context "databases" do
       it "should return object if it doesnt respond_to call" do
         database_names = ['users', 'companies']
-
+        
         Apartment.configure do |config|
           config.excluded_models = []
           config.database_names = database_names
         end
         Apartment.database_names.should == database_names
       end
-
+      
       it "should invoke the proc if appropriate" do
         database_names = lambda{ ['users', 'users'] }
         database_names.should_receive(:call)
-
+        
         Apartment.configure do |config|
           config.excluded_models = []
           config.database_names = database_names
         end
         Apartment.database_names
       end
-
+      
       it "should return the invoked proc if appropriate" do
         dbs = lambda{ Company.scoped }
-
+        
         Apartment.configure do |config|
           config.excluded_models = []
           config.database_names = dbs
         end
-
+        
         Apartment.database_names.should == Company.scoped
       end
     end
-
-    describe "#reset" do
-
-      before do
-        Apartment.configure do |config|
-          config.excluded_models = ["One", "Two"]
-          config.database_names = ["one", "two"]
-          config.seed_after_create = true
-          config.load_schema = false
-        end
-      end
-
-      it "should reset all the config options" do
-        Apartment.reset
-        Apartment.excluded_models.should == []
-        Apartment.database_names.should be_nil
-        Apartment.seed_after_create.should be_false
-        Apartment.load_schema.should be_true
-      end
-    end
-
+    
   end
 end