apartment 0.19.0 → 0.20.0

data/.travis.yml

@@ -2,3 +2,4 @@ language: ruby
 rvm:
   - 1.9.2
   - 1.9.3
+bundler_args: --verbose

data/Gemfile

@@ -1,3 +1,15 @@
-source "http://rubygems.org"
+source 'http://rubygems.org'
 
 gemspec
+
+gem 'pry'
+gem 'rails',                    '>= 3.1.2'
+gem 'rake',                     '~> 0.9.2'
+gem 'sqlite3'
+gem 'rspec',                    '~> 2.11'
+gem 'rspec-rails',              '~> 2.11'
+gem 'capybara',                 '~> 1.0'
+gem 'pg',                       '>= 0.11.0'
+gem 'mysql2',                   '~> 0.3.10'
+gem 'delayed_job',              '~> 3.0'
+gem 'delayed_job_active_record'

data/HISTORY.md

@@ -1,3 +1,20 @@
+# 0.20.0
+  * Feb 6, 2013
+
+  - Mysql now has a 'schema like' option to perform like Postgresql (default)
+    - This should be significantly more performant than using connections
+  - Psych is now supported for Delayed::Job yaml parsing
+
+# 0.19.2
+  * Jan 30, 2013
+
+  - Database schema file can now be set manually or skipped altogether
+
+# 0.19.1
+  * Jan 30, 2013
+
+  - Allow schema.rb import file to be specified in config or skip schema.rb import altogether
+
 # 0.19.0
   * Dec 29, 2012
 

data/README.md

@@ -187,7 +187,10 @@ and test environments.  If you wish to turn this option off in production, you c
 ## Delayed::Job
 
 If using Rails ~> 3.2, you *must* use `delayed_job ~> 3.0`.  It has better Rails 3 support plus has some major changes that affect the serialization of models.
-I haven't been able to get `psych` working whatsoever as the YAML parser, so to get things to work properly, you must explicitly set the parser to `syck` *before* requiring `delayed_job`
+
+### If using Ruby 1.9.3-p362 you MUST use psych as your parser. YAML seems to fall down using syck
+
+### If you're using syck on an earlier version of ruby, here's what you must do (in a rails app for instance)
 This can be done in the `boot.rb` of your rails config *just above* where Bundler requires the gems from the Gemfile.  It will look something like:
 
     require 'rubygems'

data/apartment.gemspec

@@ -6,30 +6,18 @@ Gem::Specification.new do |s|
   s.name = %q{apartment}
   s.version = Apartment::VERSION
 
-  s.authors = ["Ryan Brunner", "Brad Robertson"]
-  s.summary = %q{A Ruby gem for managing database multitenancy}
-  s.description = %q{Apartment allows Rack applications to deal with database multitenancy through ActiveRecord}
-  s.email = %w{ryan@influitive.com brad@influitive.com}
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {spec}/*`.split("\n")
+  s.authors       = ["Ryan Brunner", "Brad Robertson"]
+  s.summary       = %q{A Ruby gem for managing database multitenancy}
+  s.description   = %q{Apartment allows Rack applications to deal with database multitenancy through ActiveRecord}
+  s.email         = ["ryan@influitive.com", "brad@influitive.com"]
+  s.files         = `git ls-files`.split($/)
+  s.executables   = s.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  s.test_files    = s.files.grep(%r{^(test|spec|features)/})
+  s.require_paths = ["lib"]
 
   s.homepage = %q{https://github.com/influitive/apartment}
   s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
 
   s.add_dependency 'activerecord',    '>= 3.1.2'   # must be >= 3.1.2 due to bug in prepared_statements
   s.add_dependency 'rack',            '>= 1.3.6'
-
-  s.add_development_dependency 'pry', '~> 0.9.9'
-  s.add_development_dependency 'rails', '>= 3.1.2'
-  s.add_development_dependency 'rake', '~> 0.9.2'
-  s.add_development_dependency 'sqlite3'
-  s.add_development_dependency 'rspec', '~> 2.11'
-  s.add_development_dependency 'rspec-rails', '~> 2.11'
-  s.add_development_dependency 'capybara', '~> 1.0.0'
-  s.add_development_dependency 'pg', '>= 0.11.0'
-  s.add_development_dependency 'mysql2', '~> 0.3.10'
-  s.add_development_dependency 'delayed_job', '~> 3.0'
-  s.add_development_dependency 'delayed_job_active_record'
 end

data/lib/apartment.rb

@@ -1,17 +1,20 @@
 require 'apartment/railtie' if defined?(Rails)
-require 'active_support/core_ext/module/delegation'
 require 'active_support/core_ext/object/blank'
+require 'forwardable'
 
 module Apartment
 
   class << self
+
+    extend Forwardable
+
     ACCESSOR_METHODS  = [:use_schemas, :seed_after_create, :prepend_environment, :append_environment]
-    WRITER_METHODS    = [:database_names, :excluded_models, :default_schema, :persistent_schemas, :connection_class]
+    WRITER_METHODS    = [:database_names, :database_schema_file, :excluded_models, :default_schema, :persistent_schemas, :connection_class]
 
     attr_accessor(*ACCESSOR_METHODS)
     attr_writer(*WRITER_METHODS)
 
-    delegate :connection, :establish_connection, to: :connection_class
+    def_delegators :connection_class, :connection, :establish_connection
 
     # configure apartment with available options
     def configure
@@ -40,9 +43,15 @@ module Apartment
       @connection_class || ActiveRecord::Base
     end
 
+    def database_schema_file
+      return @database_schema_file if defined?(@database_schema_file)
+
+      @database_schema_file = Rails.root.join('db', 'schema.rb')
+    end
+
     # Reset all the config for Apartment
     def reset
-      (ACCESSOR_METHODS + WRITER_METHODS).each{|method| instance_variable_set(:"@#{method}", nil) }
+      (ACCESSOR_METHODS + WRITER_METHODS).each{|method| remove_instance_variable(:"@#{method}") if instance_variable_defined?(:"@#{method}") }
     end
 
     def use_postgres_schemas

data/lib/apartment/adapters/abstract_adapter.rb

@@ -157,7 +157,8 @@ module Apartment
       #
       def import_database_schema
         ActiveRecord::Schema.verbose = false    # do not log schema load output.
-        load_or_abort("#{Rails.root}/db/schema.rb")
+
+        load_or_abort(Apartment.database_schema_file) if Apartment.database_schema_file
       end
 
       #   Return a new config that is multi-tenanted

data/lib/apartment/adapters/mysql2_adapter.rb

@@ -3,7 +3,9 @@ module Apartment
   module Database
 
     def self.mysql2_adapter(config)
-      Adapters::Mysql2Adapter.new config
+      Apartment.use_schemas ?
+        Adapters::Mysql2SchemaAdapter.new(config) :
+        Adapters::Mysql2Adapter.new(config)
     end
   end
 
@@ -19,12 +21,62 @@ module Apartment
       #
       #   @param {String} database Database name
       #
-      def connect_to_new(database)
+      def connect_to_new(database = nil)
         super
       rescue Mysql2::Error
         Apartment::Database.reset
         raise DatabaseNotFound, "Cannot find database #{environmentify(database)}"
       end
     end
+
+    class Mysql2SchemaAdapter < AbstractAdapter
+      attr_reader :default_database
+
+      def initialize(config)
+        @default_database = config[:database]
+
+        super
+      end
+
+      #   Reset current_database to the default_database
+      #
+      def reset
+        connect_to_new(default_database)
+      end
+
+      #   Set the table_name to always use the default database for excluded models
+      #
+      def process_excluded_models
+        Apartment.excluded_models.each{ |model| process_excluded_model(model) }
+      end
+
+    protected
+
+      #   Set schema current_database to new db
+      #
+      def connect_to_new(database)
+        return reset if database.nil?
+
+        Apartment.connection.execute "use #{database}"
+
+      rescue ActiveRecord::StatementInvalid
+        Apartment::Database.reset
+        raise DatabaseNotFound, "Cannot find database #{environmentify(database)}"
+      end
+
+      def process_excluded_model(model)
+        model.constantize.tap do |klass|
+          # some models (such as delayed_job) seem to load and cache their column names before this,
+          # so would never get the default prefix, so reset first
+          klass.reset_column_information
+
+          # Ensure that if a schema *was* set, we override
+          table_name = klass.table_name.split('.', 2).last
+
+          # Not sure why, but Delayed::Job somehow ignores table_name_prefix...  so we'll just manually set table name instead
+          klass.table_name = "#{default_database}.#{table_name}"
+        end
+      end
+    end
   end
 end

data/lib/apartment/database.rb

@@ -1,4 +1,4 @@
-require 'active_support/core_ext/module/delegation'
+require 'forwardable'
 
 module Apartment
 
@@ -7,8 +7,9 @@ module Apartment
   module Database
 
     extend self
+    extend Forwardable
 
-    delegate :create, :current_database, :current, :drop, :process, :process_excluded_models, :reset, :seed, :switch, :to => :adapter
+    def_delegators :adapter, :create, :current_database, :current, :drop, :process, :process_excluded_models, :reset, :seed, :switch
 
     attr_writer :config
 
@@ -42,9 +43,9 @@ module Apartment
 
     #   Reset config and adapter so they are regenerated
     #
-    def reload!
+    def reload!(config = nil)
       Thread.current[:apartment_adapter] = nil
-      @config = nil
+      @config = config
     end
 
   private

data/lib/apartment/delayed_job/enqueue.rb

@@ -1,5 +1,11 @@
 require 'delayed_job'
-require 'apartment/delayed_job/active_record'   # ensure that our AR hooks are loaded when queueing
+require 'yaml'
+
+if YAML.parser.class.name =~ /syck|yecht/i
+  require 'apartment/delayed_job/syck_ext'
+else
+  require 'apartment/delayed_job/psych_ext'
+end
 
 module Apartment
   module Delayed

data/lib/apartment/delayed_job/psych_ext.rb

@@ -0,0 +1,61 @@
+if defined?(ActiveRecord)
+  class ActiveRecord::Base
+    # @override
+    # serialize to YAML
+    def encode_with(coder)
+      coder["attributes"] = @attributes
+      coder["database"] =   @database unless @database.nil?
+      coder.tag = ['!ruby/ActiveRecord', self.class.name].join(':')
+    end
+  end
+end
+
+module Psych
+  module Visitors
+    class ToRuby
+      #   @override
+      #
+      #   NOTE I don't have a great idea what's going on here...
+      #   The only change is the `Apartment::Database.process`
+      #
+      def visit_Psych_Nodes_Mapping_with_class_and_db(object)
+        return revive(Psych.load_tags[object.tag], object) if Psych.load_tags[object.tag]
+
+        case object.tag
+        when /^!ruby\/ActiveRecord:(.+)$/
+          klass = resolve_class($1)
+          payload = Hash[*object.children.map { |c| accept c }]
+          id = payload["attributes"][klass.primary_key]
+          begin
+            Apartment::Database.process(payload['database']) do
+              klass.unscoped.find(id)
+            end
+          rescue ActiveRecord::RecordNotFound
+            raise Delayed::DeserializationError
+          end
+        when /^!ruby\/Mongoid:(.+)$/
+          klass = resolve_class($1)
+          payload = Hash[*object.children.map { |c| accept c }]
+          begin
+            klass.find(payload["attributes"]["_id"])
+          rescue Mongoid::Errors::DocumentNotFound
+            raise Delayed::DeserializationError
+          end
+        when /^!ruby\/DataMapper:(.+)$/
+          klass = resolve_class($1)
+          payload = Hash[*object.children.map { |c| accept c }]
+          begin
+            primary_keys = klass.properties.select { |p| p.key? }
+            key_names = primary_keys.map { |p| p.name.to_s }
+            klass.get!(*key_names.map { |k| payload["attributes"][k] })
+          rescue DataMapper::ObjectNotFoundError
+            raise Delayed::DeserializationError
+          end
+        else
+          visit_Psych_Nodes_Mapping_without_class_and_db(object)
+        end
+      end
+      alias_method_chain :visit_Psych_Nodes_Mapping, :class_and_db
+    end
+  end
+end

data/lib/apartment/delayed_job/requirements.rb

@@ -1,4 +1,4 @@
-require 'apartment/delayed_job/active_record'   # ensure that our AR hooks are loaded when queueing
+require 'apartment/delayed_job/enqueue'
 
 module Apartment
   module Delayed

data/lib/apartment/version.rb

@@ -1,3 +1,3 @@
 module Apartment
-  VERSION = "0.19.0"
+  VERSION = "0.20.0"
 end

data/spec/adapters/mysql2_adapter_spec.rb

@@ -3,8 +3,8 @@ require 'apartment/adapters/mysql2_adapter'
 
 describe Apartment::Adapters::Mysql2Adapter do
 
-  let(:config){ Apartment::Test.config['connections']['mysql'] }
-  subject{ Apartment::Database.mysql2_adapter config.symbolize_keys }
+  let(:config){ Apartment::Test.config['connections']['mysql'].symbolize_keys }
+  subject(:adapter){ Apartment::Database.mysql2_adapter config }
 
   def database_names
     ActiveRecord::Base.connection.execute("SELECT schema_name FROM information_schema.schemata").collect{|row| row[0]}
@@ -12,6 +12,36 @@ describe Apartment::Adapters::Mysql2Adapter do
 
   let(:default_database){ subject.process{ ActiveRecord::Base.connection.current_database } }
 
-  it_should_behave_like "a generic apartment adapter"
-  it_should_behave_like "a db based apartment adapter"
-end
+  context "using - the equivalent of - schemas" do
+    before { Apartment.use_schemas = true }
+
+    it_should_behave_like "a generic apartment adapter"
+
+    describe "#default_database" do
+      its(:default_database){ should == config[:database] }
+    end
+
+    describe "#init" do
+      include Apartment::Spec::AdapterRequirements
+
+      before do
+        Apartment.configure do |config|
+          config.excluded_models = ["Company"]
+        end
+      end
+
+      it "should process model exclusions" do
+        Apartment::Database.init
+
+        Company.table_name.should == "#{default_database}.companies"
+      end
+    end
+  end
+
+  context "using connections" do
+    before { Apartment.use_schemas = false }
+
+    it_should_behave_like "a generic apartment adapter"
+    it_should_behave_like "a connection based apartment adapter"
+  end
+end

data/spec/adapters/postgresql_adapter_spec.rb

@@ -3,8 +3,8 @@ require 'apartment/adapters/postgresql_adapter'
 
 describe Apartment::Adapters::PostgresqlAdapter do
 
-  let(:config){ Apartment::Test.config['connections']['postgresql'] }
-  subject{ Apartment::Database.postgresql_adapter config.symbolize_keys }
+  let(:config){ Apartment::Test.config['connections']['postgresql'].symbolize_keys }
+  subject{ Apartment::Database.postgresql_adapter config }
 
   context "using schemas" do
 
@@ -21,7 +21,7 @@ describe Apartment::Adapters::PostgresqlAdapter do
     it_should_behave_like "a schema based apartment adapter"
   end
 
-  context "using databases" do
+  context "using connections" do
 
     before{ Apartment.use_schemas = false }
 
@@ -33,6 +33,6 @@ describe Apartment::Adapters::PostgresqlAdapter do
     let(:default_database){ subject.process{ ActiveRecord::Base.connection.current_database } }
 
     it_should_behave_like "a generic apartment adapter"
-    it_should_behave_like "a db based apartment adapter"
+    it_should_behave_like "a connection based apartment adapter"
   end
 end

data/spec/dummy/config/boot.rb

@@ -1,8 +1,5 @@
 require 'rubygems'
 
-require 'yaml'
-YAML::ENGINE.yamler = 'syck'
-
 gemfile = File.expand_path('../../../../Gemfile', __FILE__)
 
 if File.exist?(gemfile)

data/spec/examples/{db_adapter_examples.rb → connection_adapter_examples.rb}

@@ -1,17 +1,15 @@
 require 'spec_helper'
 
-shared_examples_for "a db based apartment adapter" do
+shared_examples_for "a connection 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

data/spec/examples/generic_adapter_examples.rb

@@ -89,6 +89,12 @@ shared_examples_for "a generic apartment adapter" do
       subject.switch
       subject.current_database.should == default_database
     end
+
+    it "should raise an error if database is invalid" do
+      expect {
+        subject.switch 'unknown_database'
+      }.to raise_error(Apartment::ApartmentError)
+    end
   end
 
   describe "#current_database" do

data/spec/support/config.rb

@@ -1,11 +1,10 @@
-module Apartment
+require 'yaml'
 
+module Apartment
   module Test
 
     def self.config
       @config ||= YAML.load_file('spec/config/database.yml')
     end
-
   end
-
 end

data/spec/support/requirements.rb

@@ -16,7 +16,9 @@ module Apartment
         let(:connection){ ActiveRecord::Base.connection }
 
         before do
+          Apartment::Database.reload!(config.symbolize_keys)
           ActiveRecord::Base.establish_connection config
+
           subject.create(db1)
           subject.create(db2)
         end
@@ -29,8 +31,15 @@ module Apartment
           subject.drop(db1) rescue true
           subject.drop(db2) rescue true
 
+          # This is annoying, but for each sublcass that establishes its own connection (ie Company for excluded models for connection based adapters)
+          # a separate connection is maintained (clear_all_connections! doesn't appear to deal with these)
+          # This causes problems because previous tests that established this connection could F up the next test, so we'll just remove them all for each test :(
+          Apartment.excluded_models.each do |m|
+            klass = m.constantize
+            Apartment.connection_class.remove_connection(klass)
+            klass.reset_table_name
+          end
           ActiveRecord::Base.clear_all_connections!
-          Apartment::Database.reload!
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apartment
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.20.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-30 00:00:00.000000000 Z
+date: 2013-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -44,182 +44,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.3.6
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.9
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.9
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.1.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.1.2
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.2
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.11'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.11'
-- !ruby/object:Gem::Dependency
-  name: rspec-rails
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.11'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.11'
-- !ruby/object:Gem::Dependency
-  name: capybara
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: pg
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.11.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.11.0
-- !ruby/object:Gem::Dependency
-  name: mysql2
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.3.10
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.3.10
-- !ruby/object:Gem::Dependency
-  name: delayed_job
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: delayed_job_active_record
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Apartment allows Rack applications to deal with database multitenancy
   through ActiveRecord
 email:
@@ -229,7 +53,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .DS_Store
 - .gitignore
 - .pryrc
 - .rspec
@@ -248,10 +71,11 @@ files:
 - lib/apartment/adapters/postgresql_adapter.rb
 - lib/apartment/console.rb
 - lib/apartment/database.rb
-- lib/apartment/delayed_job/active_record.rb
 - lib/apartment/delayed_job/enqueue.rb
 - lib/apartment/delayed_job/hooks.rb
+- lib/apartment/delayed_job/psych_ext.rb
 - lib/apartment/delayed_job/requirements.rb
+- lib/apartment/delayed_job/syck_ext.rb
 - lib/apartment/elevators/domain.rb
 - lib/apartment/elevators/first_subdomain.rb
 - lib/apartment/elevators/generic.rb
@@ -306,7 +130,7 @@ files:
 - spec/dummy/public/favicon.ico
 - spec/dummy/public/stylesheets/.gitkeep
 - spec/dummy/script/rails
-- spec/examples/db_adapter_examples.rb
+- spec/examples/connection_adapter_examples.rb
 - spec/examples/elevator_examples.rb
 - spec/examples/generic_adapter_examples.rb
 - spec/examples/schema_adapter_examples.rb
@@ -343,7 +167,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3842088920209676639
+      hash: 1986473667684990578
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -352,11 +176,73 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3842088920209676639
+      hash: 1986473667684990578
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A Ruby gem for managing database multitenancy
-test_files: []
+test_files:
+- spec/adapters/mysql2_adapter_spec.rb
+- spec/adapters/postgresql_adapter_spec.rb
+- spec/apartment_spec.rb
+- spec/config/database.yml.sample
+- spec/database_spec.rb
+- spec/dummy/Rakefile
+- spec/dummy/app/controllers/application_controller.rb
+- spec/dummy/app/helpers/application_helper.rb
+- spec/dummy/app/models/company.rb
+- spec/dummy/app/models/user.rb
+- spec/dummy/app/views/application/index.html.erb
+- spec/dummy/app/views/layouts/application.html.erb
+- spec/dummy/config.ru
+- spec/dummy/config/application.rb
+- spec/dummy/config/boot.rb
+- spec/dummy/config/database.yml.sample
+- spec/dummy/config/environment.rb
+- spec/dummy/config/environments/development.rb
+- spec/dummy/config/environments/production.rb
+- spec/dummy/config/environments/test.rb
+- spec/dummy/config/initializers/apartment.rb
+- spec/dummy/config/initializers/backtrace_silencers.rb
+- spec/dummy/config/initializers/inflections.rb
+- spec/dummy/config/initializers/mime_types.rb
+- spec/dummy/config/initializers/secret_token.rb
+- spec/dummy/config/initializers/session_store.rb
+- spec/dummy/config/locales/en.yml
+- spec/dummy/config/routes.rb
+- spec/dummy/db/migrate/20110613152810_create_dummy_models.rb
+- spec/dummy/db/migrate/20111202022214_create_table_books.rb
+- spec/dummy/db/schema.rb
+- spec/dummy/db/seeds.rb
+- spec/dummy/db/test.sqlite3
+- spec/dummy/lib/fake_dj_class.rb
+- spec/dummy/public/404.html
+- spec/dummy/public/422.html
+- spec/dummy/public/500.html
+- spec/dummy/public/favicon.ico
+- spec/dummy/public/stylesheets/.gitkeep
+- spec/dummy/script/rails
+- spec/examples/connection_adapter_examples.rb
+- spec/examples/elevator_examples.rb
+- spec/examples/generic_adapter_examples.rb
+- spec/examples/schema_adapter_examples.rb
+- spec/integration/apartment_rake_integration_spec.rb
+- spec/integration/delayed_job_integration_spec.rb
+- spec/integration/middleware/domain_elevator_spec.rb
+- spec/integration/middleware/first_subdomain_elevator_spec.rb
+- spec/integration/middleware/generic_elevator_spec.rb
+- spec/integration/middleware/subdomain_elevator_spec.rb
+- spec/spec_helper.rb
+- spec/support/apartment_helpers.rb
+- spec/support/capybara_sessions.rb
+- spec/support/config.rb
+- spec/support/contexts.rb
+- spec/support/requirements.rb
+- spec/tasks/apartment_rake_spec.rb
+- spec/unit/config_spec.rb
+- spec/unit/middleware/domain_elevator_spec.rb
+- spec/unit/middleware/subdomain_elevator_spec.rb
+- spec/unit/migrator_spec.rb
+- spec/unit/reloader_spec.rb