apartment 0.10.1 → 0.10.2

data/Gemfile

@@ -1,8 +1,3 @@
 source "http://rubygems.org"
 
-# Uses patched version of postgresql adapter to enable apartment usage.  
-# Current postgresql adapter in rails doesn't properly support the use of postgresql schemas
-# Pull request sent => https://github.com/rails/rails/pull/1604
-gem 'rails', '3.0.8', :git => 'git://github.com/bradrobertson/rails', :branch => '3-0-stable'
-
 gemspec

data/HISTORY.md

@@ -1,3 +1,8 @@
+# 0.10.2
+  * Sep 15, 2011
+  
+  - Remove all the annoying logging for loading db schema and seeding on create
+
 # 0.10.1
   * Aug 11, 2011
   

data/README.md

@@ -2,16 +2,9 @@
 *Multitenancy for Rails 3*
 
 Apartment provides tools to help you deal with multiple databases in your Rails
-environment. If you need to have certain data sequestered based on account or company,
+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.
 
-## Caveats
-
-Apartment was built to deal with a very particular use-case - the need to spin up 
-multiple databases within the same application instance on-demand while Rails is running.
-If your setup can accomodate creating new databases on deploy (by adding a new database to your
-database.yml), or doesn't need 100% database isolation, other solutions might be far simpler 
-for your use case.
 
 ## Installation
 
@@ -19,11 +12,13 @@ for your use case.
 
 Add the following to your Gemfile:
 
-      gem 'apartment'
+    gem 'apartment'
 
 That's all you need to set up the Apartment libraries. If you want to switch databases 
 on a per-user basis, look under "Usage - Switching databases per request", below.
 
+*NOTE: If using [postgresl schemas](http://www.postgresql.org/docs/9.0/static/ddl-schemas.html) you must use Rails >= 3.0.10, it contains a [patch](https://github.com/rails/rails/pull/1607) that has better postgresql schema support*
+
 ## Usage
 
 ### Creating new Databases
@@ -31,10 +26,10 @@ on a per-user basis, look under "Usage - Switching databases per request", below
 Before you can switch to a new apartment database, you will need to create it. Whenever
 you need to create a new database, you can run the following command:
 
-     Apartment::Database.create('database_name')
+    Apartment::Database.create('database_name')
 
-Apartment will create a new database in the following format: "environment_database_name". 
-In the case of a sqlite database, this will be created in your 'db/migrate' foler. With
+Apartment will create a new database in the following format: "_environment_\_database_name". 
+In the case of a sqlite database, this will be created in your 'db/migrate' folder. With
 other databases, the database will be created as a new DB within the system.
 
 When you create a new database, all migrations will be run against that database, so it will be 
@@ -43,10 +38,12 @@ up to date when create returns.
 #### Notes on PostgreSQL
 
 PostgreSQL works slightly differently than other databases when creating a new DB. If you
-are using PostgreSQL, Apartment will set up a new **schema** and migrate into there. This
+are using PostgreSQL, Apartment by default will set up a new **schema** and migrate into there. This
 provides better performance, and allows Apartment to work on systems like Heroku, which
 would not allow a full new database to be created.
 
+One can optionally use the full database creation instead if they want, though this is not recommended
+
 ### Switching Databases
 
 To switch databases using Apartment, use the following command:
@@ -72,14 +69,32 @@ to a database schema of the same name. It can be used like so:
       end
     end
     
+## Config
+
+The following config options should be set up in a Rails initializer such as:
+
+    config/initializers/apartment.rb
+    
+To set config options, add this to your initializer:
+
+    Apartment.configure do |config|
+      # set your options (described below) here
+    end
+    
 ### Excluding models
 
 If you have some models that should always access the 'root' database, you can specify this by configuring
 Apartment using `Apartment.configure`.  This will yield a config object for you.  You can set excluded models like so:
+    
+    config.excluded_models = [User, Company]        # these models will not be multi-tenanted, but remain in the global (public) namespace
+    
+### Handling Environments
 
-    Apartment.configure do |config|
-      config.excluded_models = [User, Company]        # these models will not be multi-tenanted, but remain in the global (public) namespace
-    end
+By default, when not using postgresql schemas, Apartment will prepend the environment to the database name
+to ensure there is no conflict between your environments.  This is mainly for the benefit of your development
+and test environments.  If you wish to turn this option off in production, you could do something like:
+
+    config.prepend_environment = !Rails.env.production?
 
 ### Managing Migrations
 
@@ -88,14 +103,10 @@ of dbs to Apartment.  You can make this dynamic by providing a Proc object to be
 This object should yield an array of string representing each database name.  Example:
 
     # Dynamically get database names to migrate
-    Apartment.configure do |config|
-      config.database_names = lambda{ Company.all.collect(&:database_name) }
-    end
+    config.database_names = lambda{ Customer.select(:database_name).map(&:database_name) }
     
     # Use a static list of database names for migrate
-    Apartment.configure do |config|
-      config.database_names = ['db1', 'db2']
-    end
+    config.database_names = ['db1', 'db2']
       
 You can then migration your databases using the rake task:
     
@@ -128,8 +139,11 @@ that a `database` attribute is set on this model *before* it is serialized, to e
       end
     end
 
-## TODO
+## Contributing
 
-* Cross-database associations
+* Please issue pull requests to the `development` branch.  All development happens here, master is used for releases
+* Ensure that your code is accompanied with tests.  No code will be merged without tests
 
-## Contributing
+## TODO
+
+* Shared examples for testing to ensure consistency across all adapters

data/Rakefile

@@ -11,7 +11,7 @@ end
 
 namespace :spec do
   
-  [:tasks, :unit, :integration].each do |type|
+  [:tasks, :unit, :adapters, :integration].each do |type|
     RSpec::Core::RakeTask.new(type) do |spec|
       spec.pattern = "spec/#{type}/**/*_spec.rb"
     end
@@ -33,19 +33,46 @@ namespace :postgres do
   
   desc 'Build the PostgreSQL test databases'
   task :build_db do
-    %x{ createdb -E UTF8 #{config['database']} } rescue "test db already exists"
-    ActiveRecord::Base.establish_connection config
+    %x{ createdb -E UTF8 #{pg_config['database']} } rescue "test db already exists"
+    ActiveRecord::Base.establish_connection pg_config
     load 'spec/dummy/db/schema.rb'
   end
   
   desc "drop the PostgreSQL test database"
   task :drop_db do
-    puts "dropping database #{config['database']}"
-    %x{ dropdb #{config['database']} }
+    puts "dropping database #{pg_config['database']}"
+    %x{ dropdb #{pg_config['database']} }
   end
+    
+end
+
+namespace :mysql do
+  require 'active_record'
+  require "#{File.join(File.dirname(__FILE__), 'spec', 'support', 'config')}"
   
-  def config
-    Apartment::Test.config['connections']['postgresql']
+  desc 'Build the MySQL test databases'
+  task :build_db do
+    %x{ mysqladmin -u root create #{my_config['database']} } rescue "test db already exists"
+    ActiveRecord::Base.establish_connection my_config
+    load 'spec/dummy/db/schema.rb'
   end
   
-end
+  desc "drop the MySQL test database"
+  task :drop_db do
+    puts "dropping database #{my_config['database']}"
+    %x{ mysqladmin -u root drop #{my_config['database']} }
+  end
+    
+end
+
+def config
+  Apartment::Test.config['connections']
+end
+
+def pg_config
+  config['postgresql']
+end
+
+def my_config
+  config['mysql']
+end

data/apartment.gemspec

@@ -14,17 +14,19 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {spec}/*`.split("\n")
   
-  s.homepage = %q{http://github.com/ryanbrunner/apartment}
+  s.homepage = %q{http://github.com/bradrobertson/apartment}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   
-  s.add_dependency 'rails', '~> 3.0.8'
+  s.add_dependency 'rails', '>= 3.0.10'
+  s.add_development_dependency 'rake', '~> 0.8.7'
   s.add_development_dependency 'sqlite3'
   s.add_development_dependency 'rspec', '~> 2.6.0'
   s.add_development_dependency 'rspec-rails', '~> 2.6.1'
   s.add_development_dependency 'capybara', '1.0.0'
   s.add_development_dependency 'pg', '~> 0.11.0'
-  s.add_development_dependency "silent-postgres", "~> 0.0.8"
+  s.add_development_dependency 'mysql2', '0.2.7'
+  s.add_development_dependency "silent-postgres", "~> 0.1.1"
   s.add_development_dependency 'delayed_job', '~> 2.1.4'
 end

data/lib/apartment.rb

@@ -3,7 +3,7 @@ require 'apartment/railtie'
 module Apartment
   
   class << self
-    attr_accessor :use_postgres_schemas, :seed_after_create
+    attr_accessor :use_postgres_schemas, :seed_after_create, :prepend_environment
     attr_writer :database_names, :excluded_models
     
     # configure apartment with available options
@@ -71,4 +71,5 @@ Apartment.configure do |config|
   config.use_postgres_schemas = true
   config.database_names = []
   config.seed_after_create = false
+  config.prepend_environment = true
 end

data/lib/apartment/adapters/abstract_adapter.rb

@@ -10,14 +10,14 @@ module Apartment
       #   @param {Hash} config Database config
       #   @param {Hash} defaults Some default options
       # 
-      def initialize(config, defaults)
+      def initialize(config, defaults = {})
         @config = config
         @defaults = defaults
       end
       
-      #   Connect to db or schema, do stuff, switch back to previous db/schema (equivalent to a switch... do stuff... switch back)
+      #   Connect to db, do your biz, switch back to previous db
       # 
-      #   @param {String?} database Database or schema to connect to, will reset if no database passed in
+      #   @param {String?} database Database or schema to connect to
       def process(database = nil)
         current_db = current_database
 		    switch(database)
@@ -30,14 +30,11 @@ module Apartment
       # 
       #   @param {String} database Database name
   		def create(database)
-        # TODO create_database unless using_schemas?
+        ActiveRecord::Base.connection.execute("CREATE DATABASE #{environmentify(sanitize(database))}")
 
   			process(database) do
     			import_database_schema
 
-    			# Manually init schema migrations table (apparently there were issues with Postgres when this isn't done)
-    			ActiveRecord::Base.connection.initialize_schema_migrations_table
-    			
           # Seed data if appropriate
           seed_data if Apartment.seed_after_create
   			end
@@ -55,6 +52,13 @@ module Apartment
 
         connect_to_new(database)
   		end
+
+      def environmentify(database)
+        # prepend the environment if configured and the environment isn't already there
+        return "#{Rails.env}_#{database}" if Apartment.prepend_environment && !database.include?(Rails.env)
+        
+        database
+  		end
   		
   		def seed_data
 	      load_or_abort("#{Rails.root}/db/seeds.rb")
@@ -68,10 +72,6 @@ module Apartment
       
     protected
     
-      def create_schema
-        # noop
-      end
-    
       def connect_to_new(database)
         ActiveRecord::Base.establish_connection multi_tenantify(database)
 		  end
@@ -83,7 +83,7 @@ module Apartment
 	    # Return a new config that is multi-tenanted
       def multi_tenantify(database)
   			@config.clone.tap do |config|
-  			  config['database'].gsub!(Rails.env.to_s, "#{database}_#{Rails.env}")
+  			  config[:database] = environmentify(database)
 			  end
   		end
       
@@ -92,14 +92,12 @@ module Apartment
 	      database.gsub(/[\W]/,'')
       end
       
-      # Whether or not to use postgresql schemas
-      def using_schemas?
-        false
-      end
-      
       def load_or_abort(file)
         if File.exists?(file)
-          load(file)
+          # Don't log the output of loading files (such as schema or seeds)
+          silence_stream(STDOUT) do
+            load(file)
+          end
         else
           abort %{#{file} doesn't exist yet}
         end
@@ -107,4 +105,4 @@ module Apartment
       
     end
   end
-end
+end

data/lib/apartment/adapters/mysql_adapter.rb

@@ -1,4 +1,11 @@
 module Apartment
+
+  module Database
+    
+    def self.mysql_adapter(config)
+      Adapters::MysqlAdapter.new config
+    end
+  end
   
   module Adapters
   

data/lib/apartment/adapters/postgresql_adapter.rb

@@ -3,56 +3,51 @@ module Apartment
   module Database
     
     def self.postgresql_adapter(config)
-      Adapters::PostgresqlAdapter.new config, :schema_search_path => ActiveRecord::Base.connection.schema_search_path   # this is the initial search path before any switches happen
+      Apartment.use_postgres_schemas ? 
+        Adapters::PostgresqlSchemaAdapter.new(config, :schema_search_path => ActiveRecord::Base.connection.schema_search_path) :
+        Adapters::PostgresqlAdapter.new(config)
     end
   end
   
   module Adapters
     
+    # Default adapter when not using Postgresql Schemas
     class PostgresqlAdapter < AbstractAdapter
+    end
+    
+    # Separate Adapter for Postgresql when using schemas
+    class PostgresqlSchemaAdapter < AbstractAdapter
       
       # Set schema path or connect to new db
-	    def connect_to_new(database)	      
-    		return ActiveRecord::Base.connection.schema_search_path = database if using_schemas?
-
-			  super # if !using_schemas? (implicit)
+      # TODO sanitize method doesn't work with schemas as the default schema uses "$user", stripping out the quotes makes it fail
+	    def connect_to_new(database = nil)
+	      return reset if database.nil?
+    		ActiveRecord::Base.connection.schema_search_path = database
       rescue ActiveRecord::StatementInvalid => e
         raise SchemaNotFound, e
 			end
 			
 			def create(database)
-			  reset
-			  # Postgres will (optionally) use 'schemas' instead of actual dbs, create a new schema while connected to main (global) db
-        create_schema(database) if using_schemas?
-        super(database)
+  		  ActiveRecord::Base.connection.execute("CREATE SCHEMA #{database}")
+
+  		  process(database) do
+    			import_database_schema
+
+          # Seed data if appropriate
+          seed_data if Apartment.seed_after_create
+  			end
+  		rescue ActiveRecord::StatementInvalid => e
+  		  raise SchemaExists, e
       end
 			
+      def current_database
+        ActiveRecord::Base.connection.schema_search_path
+      end
+  	  
 			def reset
-    		return ActiveRecord::Base.connection.schema_search_path = @defaults[:schema_search_path] if using_schemas?
-
-		    super # if !using_schemas?
+    		ActiveRecord::Base.connection.schema_search_path = @defaults[:schema_search_path]
   	  end
   	  
-  	  def current_database
-  	    return ActiveRecord::Base.connection.schema_search_path if using_schemas?
-  	    
-  	    super # if !using_schemas?
-	    end
-      
-    protected
-    
-      def create_schema(database)
-  		  reset
-  		  
-  		  ActiveRecord::Base.connection.execute("CREATE SCHEMA #{sanitize(database)}")
-  		rescue Exception => e
-  		  raise SchemaExists, e
-  	  end
-
-      def using_schemas?
-        Apartment.use_postgres_schemas
-      end
-			
     end
     
   end

data/lib/apartment/version.rb

@@ -1,3 +1,3 @@
 module Apartment
-  VERSION = "0.10.1"
+  VERSION = "0.10.2"
 end

data/spec/adapters/mysql_adapter_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+require 'apartment/adapters/mysql_adapter'   # specific adapters get dynamically loaded based on adapter name, so we must manually require here
+
+describe Apartment::Adapters::MysqlAdapter do
+  
+  before do
+    ActiveRecord::Base.establish_connection Apartment::Test.config['connections']['mysql']
+    @mysql = Apartment::Database.mysql_adapter Apartment::Test.config['connections']['mysql'].symbolize_keys
+  end
+  
+  after do
+    ActiveRecord::Base.clear_all_connections!
+  end
+  
+  context "using databases" do
+    
+    let(:database1){ 'first_database' }
+    
+    before do
+      @mysql.create(database1)
+    end
+  
+    after do
+      ActiveRecord::Base.connection.drop_database(@mysql.environmentify(database1))
+    end
+
+    describe "#create" do
+      it "should create the new database" do
+        ActiveRecord::Base.connection.execute("SELECT schema_name FROM information_schema.schemata").collect{|row| row[0]}.should include(@mysql.environmentify(database1))
+      end
+    end
+
+  end
+  
+  
+end

data/spec/{integration/adapters/postgresql_integration_spec.rb → adapters/postgresql_adapter_spec.rb}

@@ -5,7 +5,7 @@ describe Apartment::Adapters::PostgresqlAdapter do
   
   before do
     ActiveRecord::Base.establish_connection Apartment::Test.config['connections']['postgresql']
-    @pg = Apartment::Database.postgresql_adapter Apartment::Test.config['connections']['postgresql'].symbolize_keys
+    @schema_search_path = ActiveRecord::Base.connection.schema_search_path
   end
   
   after do
@@ -13,72 +13,79 @@ describe Apartment::Adapters::PostgresqlAdapter do
   end
   
   context "using schemas" do
-  
-    let(:schema1){ 'first_db_schema' }
-    let(:schema_search_path){ ActiveRecord::Base.connection.schema_search_path }
     
+    let(:schema){ 'first_db_schema' }
+    
+    subject{ Apartment::Database.postgresql_adapter Apartment::Test.config['connections']['postgresql'].symbolize_keys }
+  
     before do
-      @pg.create(schema1)
+      Apartment.use_postgres_schemas = true
+      subject.create(schema)
     end
   
     after do
-      Apartment::Test.drop_schema(schema1)
+      Apartment::Test.drop_schema(schema)
     end
-  
+    
     describe "#create" do
+      
       it "should create the new schema" do
-        ActiveRecord::Base.connection.execute("SELECT nspname FROM pg_namespace;").collect{|row| row['nspname']}.should include(schema1)
+        ActiveRecord::Base.connection.execute("SELECT nspname FROM pg_namespace;").collect{|row| row['nspname']}.should include(schema)
       end
     
       it "should load schema.rb to new schema" do
-        ActiveRecord::Base.connection.schema_search_path = schema1
+        ActiveRecord::Base.connection.schema_search_path = schema
         ActiveRecord::Base.connection.tables.should include('companies')
       end
     
       it "should reset connection when finished" do
-        ActiveRecord::Base.connection.schema_search_path.should_not == schema1
+        ActiveRecord::Base.connection.schema_search_path.should_not == schema
       end
     end
     
     describe "#process" do
       it "should connect" do
-        @pg.process(schema1) do
-          ActiveRecord::Base.connection.schema_search_path.should == schema1
+        subject.process(schema) do
+          ActiveRecord::Base.connection.schema_search_path.should == schema
         end
       end
       
       it "should reset" do
-        @pg.process(schema1)
-        ActiveRecord::Base.connection.schema_search_path.should == schema_search_path
+        subject.process(schema)
+        ActiveRecord::Base.connection.schema_search_path.should == @schema_search_path
       end
     end
     
     describe "#reset" do
       it "should reset connection" do
-        @pg.switch(schema1)
-        @pg.reset
-        ActiveRecord::Base.connection.schema_search_path.should == schema_search_path
+        subject.switch(schema)
+        subject.reset
+        ActiveRecord::Base.connection.schema_search_path.should == @schema_search_path
       end
     end
     
     describe "#switch" do
       it "should connect to new schema" do
-        @pg.switch(schema1)
-        ActiveRecord::Base.connection.schema_search_path.should == schema1
+        subject.switch(schema)
+        ActiveRecord::Base.connection.schema_search_path.should == schema
       end
       
       it "should reset connection if database is nil" do
-        @pg.switch
-        ActiveRecord::Base.connection.schema_search_path.should == schema_search_path
+        subject.switch
+        ActiveRecord::Base.connection.schema_search_path.should == @schema_search_path
       end
     end
     
     describe "#current_database" do
       it "should return the current schema name" do
-        @pg.switch(schema1)
-        @pg.current_database.should == schema1
+        subject.switch(schema)
+        subject.current_database.should == schema
       end
     end
     
   end
+  
+  context "using databases" do
+    # TODO
+  end
 end

data/spec/apartment_spec.rb

@@ -4,4 +4,8 @@ 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
 end

data/spec/config/database.yml

@@ -3,8 +3,10 @@ connections:
     adapter: postgresql
     database: apartment_postgresql_test
     username: root
-    password:       
-    
+    password: 
+
   mysql:
-    adapater: mysql
-    database: apartment_mysql_test
+    adapter: mysql2
+    database: apartment_mysql_test
+    username: root
+    password: 

data/spec/dummy/db/schema.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.

data/spec/integration/database_integration_spec.rb

@@ -11,6 +11,7 @@ describe Apartment::Database do
     let(:database2){ "yet_another_database" }
     
     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
       Apartment::Database.stub(:config).and_return config   # Use postgresql database config for this test

data/spec/spec_helper.rb

@@ -22,4 +22,10 @@ RSpec.configure do |config|
   
   config.include RSpec::Integration::CapybaraSessions, :type => :request
   
+  config.before(:all) do
+    # Ensure that each test starts with a clean connect
+    # Necessary as some tests will leak things like current_schema into the next
+    ActiveRecord::Base.clear_all_connections!
+  end
+  
 end

data/spec/support/apartment_helpers.rb

@@ -29,5 +29,11 @@ module Apartment
       ActiveRecord::Migrator.rollback(Rails.root + ActiveRecord::Migrator.migrations_path)
     end
     
+    private
+    
+    def sanitize(database)
+      database.gsub(/[\W]/,'')
+    end
+    
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: apartment
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.10.1
+  version: 0.10.2
 platform: ruby
 authors: 
 - Ryan Brunner
@@ -19,15 +19,26 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 3.0.8
+        version: 3.0.10
   type: :runtime
   prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: sqlite3
+  name: rake
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.8.7
+  type: :development
+  prerelease: false
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: sqlite3
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -35,10 +46,10 @@ dependencies:
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -46,10 +57,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: rspec-rails
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -57,10 +68,10 @@ dependencies:
         version: 2.6.1
   type: :development
   prerelease: false
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: capybara
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -68,10 +79,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: pg
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -79,21 +90,32 @@ dependencies:
         version: 0.11.0
   type: :development
   prerelease: false
-  version_requirements: *id006
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: mysql2
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 0.2.7
+  type: :development
+  prerelease: false
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: silent-postgres
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.0.8
+        version: 0.1.1
   type: :development
   prerelease: false
-  version_requirements: *id007
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: delayed_job
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -101,7 +123,7 @@ dependencies:
         version: 2.1.4
   type: :development
   prerelease: false
-  version_requirements: *id008
+  version_requirements: *id010
 description: Apartment allows Rails applications to deal with database multitenancy
 email: 
 - ryan@ryanbrunner.com
@@ -135,6 +157,8 @@ files:
 - lib/apartment/railtie.rb
 - lib/apartment/version.rb
 - lib/tasks/apartment.rake
+- spec/adapters/mysql_adapter_spec.rb
+- spec/adapters/postgresql_adapter_spec.rb
 - spec/apartment_spec.rb
 - spec/config/database.yml
 - spec/dummy/Rakefile
@@ -173,12 +197,10 @@ files:
 - spec/dummy/public/favicon.ico
 - spec/dummy/public/stylesheets/.gitkeep
 - spec/dummy/script/rails
-- spec/integration/adapters/postgresql_integration_spec.rb
 - spec/integration/apartment_rake_integration_spec.rb
 - spec/integration/database_integration_spec.rb
 - spec/integration/delayed_job_integration_spec.rb
 - spec/integration/middleware/subdomain_elevator_spec.rb
-- spec/integration/setup_spec.rb
 - spec/spec_helper.rb
 - spec/support/apartment_helpers.rb
 - spec/support/capybara_sessions.rb
@@ -188,7 +210,7 @@ files:
 - spec/unit/middleware/subdomain_elevator_spec.rb
 - spec/unit/migrator_spec.rb
 has_rdoc: true
-homepage: http://github.com/ryanbrunner/apartment
+homepage: http://github.com/bradrobertson/apartment
 licenses: 
 - MIT
 post_install_message: 
@@ -201,7 +223,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2437262217849019999
+      hash: -795357038977467043
       segments: 
       - 0
       version: "0"
@@ -210,7 +232,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2437262217849019999
+      hash: -795357038977467043
       segments: 
       - 0
       version: "0"

data/spec/integration/setup_spec.rb

@@ -1,8 +0,0 @@
-require 'spec_helper'
-
-describe "Setup" do
-  
-  it "should be a valid app" do
-    ::Rails.application.should be_a(Dummy::Application)
-  end
-end