apartment 0.12.0 → 0.13.0

data/HISTORY.md

@@ -1,5 +1,12 @@
+# 0.13.0
+  * Oct 25, 2011
+  
+  - `process` will now rescue with reset if the previous schema/db is no longer available
+  - `create` now takes an optional block which allows you to process within the newly created db
+  - Fixed Rails version >= 3.0.10 and < 3.1 because there have been significant testing problems with 3.1, next version will hopefully fix this
+  
 # 0.12.0
-  * Oct 4, 2001
+  * Oct 4, 2011
   
   - Added a `drop` method for removing databases/schemas
   - Refactored abstract adapter to further remove duplication in concrete implementations

data/README.md

@@ -1,6 +1,16 @@
 # Apartment
 *Multitenancy for Rails 3*
 
+> IMPORTANT! While I will do everything possible to get Apartment working for Rails 3.1, I haven't, as of yet, had this opportunity.  
+
+> There have been significant changes in the adapters such as prepared statements that might cause some issues.  
+
+> If anyone is successfully using Apartment with 3.1 please let me know, but please ensure that you're testing data integrity properly (ie. that queries are made in the right schema) as prepared_statements
+> could really throw a wrench in that one.
+
+> I know for a fact that Rails 3.1 missed a patch to make postgresql more schema aware, but it seems to have made it into Rails 3.1.1.  So at the very least, use 3.1.1
+
+
 Apartment provides tools to help you deal with multiple databases in your Rails
 application. If you need to have certain data sequestered based on account or company,
 but still allow some data to exist in a common database, Apartment can help.

data/Rakefile

@@ -65,6 +65,7 @@ namespace :mysql do
     
 end
 
+# TODO clean this up
 def config
   Apartment::Test.config['connections']
 end

data/apartment.gemspec

@@ -7,7 +7,6 @@ Gem::Specification.new do |s|
   s.version = Apartment::VERSION
 
   s.authors = ["Ryan Brunner", "Brad Robertson"]
-  s.date = %q{2011-04-18}
   s.summary = %q{A Ruby gem for managing database multitenancy in Rails applications}
   s.description = %q{Apartment allows Rails applications to deal with database multitenancy}
   s.email = %w{ryan@ryanbrunner.com bradleyrobertson@gmail.com}
@@ -19,7 +18,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   
-  s.add_dependency 'rails', '>= 3.0.10'
+  s.add_dependency 'rails', '~> 3.0.10'   # must be >= 3.0.10 due to poor schema support pre 3.0.10, but < 3.1 because it hasn't been fully tested yet
   s.add_development_dependency 'rake', '~> 0.8.7'
   s.add_development_dependency 'sqlite3'
   s.add_development_dependency 'rspec', '~> 2.6.0'

data/lib/apartment/adapters/abstract_adapter.rb

@@ -27,6 +27,8 @@ module Apartment
 
           # Seed data if appropriate
           seed_data if Apartment.seed_after_create
+          
+          yield if block_given?
   			end
   		end
       
@@ -69,7 +71,7 @@ module Apartment
 		    yield if block_given?
 		    
 		  ensure
-  		  switch(current_db)
+  		  switch(current_db) rescue reset
 	    end
 	    
 	    #   Establish a new connection for each specific excluded model
@@ -140,7 +142,7 @@ module Apartment
       #   Import the database schema
       # 
 	    def import_database_schema
-	      ActiveRecord::Schema.verbose = false    # do not log schema load output.  Note that this is slightly duplicated below with silenct_stream, except that this also works with Spork
+	      ActiveRecord::Schema.verbose = false    # do not log schema load output.
 	      load_or_abort("#{Rails.root}/db/schema.rb")
 	    end
 	    

data/lib/apartment/adapters/postgresql_adapter.rb

@@ -78,7 +78,7 @@ module Apartment
   				end
   			end
       end
-  	  
+      
       #   Reset schema search path to the default schema_search_path
       # 
       #   @return {String} default schema search path

data/lib/apartment/version.rb

@@ -1,3 +1,3 @@
 module Apartment
-  VERSION = "0.12.0"
+  VERSION = "0.13.0"
 end

data/spec/adapters/postgresql_adapter_spec.rb

@@ -23,10 +23,13 @@ describe Apartment::Adapters::PostgresqlAdapter do
     before do
       Apartment.use_postgres_schemas = true
       subject.create(schema)
+      subject.create(schema2)
     end
   
     after do
-      Apartment::Test.drop_schema(schema)
+      # sometimes we manually drop these schemas in testing, dont' care if we can't drop hence rescue
+      subject.drop(schema) rescue true 
+      subject.drop(schema2) rescue true
     end
     
     describe "#create" do
@@ -43,12 +46,26 @@ describe Apartment::Adapters::PostgresqlAdapter do
       it "should reset connection when finished" do
         ActiveRecord::Base.connection.schema_search_path.should_not == schema
       end
+      
+      it "should yield to block if passed" do
+        Apartment::Test.migrate   # ensure we have latest schema in the public 
+        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
+          ActiveRecord::Base.connection.schema_search_path.should == schema2
+          User.create
+        end
+        
+        subject.process(schema2){ User.count.should == @count + 1 }
+      end
     end
     
     describe "#drop" do
 
       it "should delete the database" do
-        subject.create schema2
         subject.switch schema    # can't drop db we're currently connected to, ensure these are different
         subject.drop schema2
 
@@ -74,6 +91,16 @@ describe Apartment::Adapters::PostgresqlAdapter do
         subject.process(schema)
         ActiveRecord::Base.connection.schema_search_path.should == @schema_search_path
       end
+      
+      # We're often finding when using Apartment in tests, the `current_database` (ie the previously attached to schema)
+      # gets dropped, but process will try to return to that schema in a test.  We should just reset if it doesnt exist
+      it "should not throw exception if current_database (schema) is no longer accessible" do
+        subject.switch(schema2)
+        
+        expect {
+          subject.process(schema){ subject.drop(schema2) }
+        }.to_not raise_error(Apartment::SchemaNotFound)
+      end
     end
     
     describe "#reset" do

data/spec/integration/apartment_rake_integration_spec.rb

@@ -19,7 +19,7 @@ describe "apartment rake tasks" do
   
   before do
     Apartment.configure do |config|
-      config.excluded_models = [Company]
+      config.excluded_models = ["Company"]
       config.database_names = lambda{ Company.scoped.collect(&:database) }
     end
   end

data/spec/integration/database_integration_spec.rb

@@ -26,7 +26,7 @@ describe Apartment::Database do
       
       it "should process model exclusions" do
         Apartment.configure do |config|
-          config.excluded_models = [Company]
+          config.excluded_models = ["Company"]
         end
         
         Apartment::Database.init
@@ -162,7 +162,7 @@ describe Apartment::Database do
           
           before do
             Apartment.configure do |config|
-              config.excluded_models = [Company]
+              config.excluded_models = ["Company"]
             end
             Apartment::Database.init
           end

metadata

@@ -2,7 +2,7 @@
 name: apartment
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors: 
 - Ryan Brunner
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-18 00:00:00 -04:00
+date: 2011-10-25 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -19,7 +19,7 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         version: 3.0.10
   type: :runtime
@@ -226,7 +226,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1213020352034196308
+      hash: 2098096062583104418
       segments: 
       - 0
       version: "0"
@@ -235,7 +235,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1213020352034196308
+      hash: 2098096062583104418
       segments: 
       - 0
       version: "0"