apartment 0.21.1 → 0.22.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 633c827866f4356529e375c9fe6b1b2f8886dbf3
+  data.tar.gz: 8b568ba43bbc49eb726ecc439b314b9c19c73ff3
+SHA512:
+  metadata.gz: 96084d067de04ce41892a639887c7ce2d248e556c1624879721f0bf4529348cf504f04c408f7f82a6cbb17366078d48b542bf75f5b569cd32f85b684ff380739
+  data.tar.gz: 1173968bbe02e081870bba50bbbab33775e16a6f42e213b34bb15b0a47929fe1d8dcc8ca83eca243669ded99a8dd9a52d1cf46e49d995fb62209b0f877d71336

data/.ruby-gemset

@@ -0,0 +1 @@
+apartment

data/.ruby-version

@@ -0,0 +1 @@
+ruby-2.0.0

data/.travis.yml

@@ -3,5 +3,5 @@ rvm:
   - 1.9.2
   - 1.9.3
   - 2.0.0
-  - jruby-19mode
+  - jruby-19mode-1.7.4
 bundler_args: --without local --verbose

data/HISTORY.md

@@ -1,3 +1,14 @@
+# 0.22.0
+  * June 9, 2013
+
+  - Numerous bug fixes:
+    - Mysql reset could connect to wrong database [eric88]
+    - Postgresql schema names weren't quoted properly [gdott9]
+    - Fixed error message on SchemaNotFound in `process`
+  - HostHash elevator allows mapping host based on hash contents [gdott9]
+  - Official Sidekiq support with the [apartment-sidekiq gem](https://github.com/influitive/apartment-sidekiq)
+
+
 # 0.21.1
   * May 31, 2013
 

data/README.md

@@ -94,6 +94,18 @@ module My Application
 end
 ```
 
+**Switch on full host using a hash**
+To switch based on full host with a hash to find corresponding database name use the following:
+
+```ruby
+# application.rb
+module My Application
+  class Application < Rails::Application
+    config.middleware.use 'Apartment::Elevators::HostHash', {'example.com' => 'example_database'}
+  end
+end
+```
+
 **Custom Elevator**
 A Generic Elevator exists that allows you to pass a `Proc` (or anything that responds to `call`) to the middleware. This Object will be passed in an `ActionDispatch::Request` object when called for you to do your magic. Apartment will use the return value of this proc to switch to the appropriate database.  Use like so:
 
@@ -281,7 +293,7 @@ All jobs *must* stored in the global (public) namespace, so add it to the list o
 config.excluded_models = ["Delayed::Job"]
 ```
 
-## Development
+## Contributing
 
 * In both `spec/dummy/config` and `spec/config`, you will see `database.yml.sample` files
   * Copy them into the same directory but with the name `database.yml`
@@ -290,6 +302,8 @@ config.excluded_models = ["Delayed::Job"]
 * 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
 
+* If you're looking to help, check out the TODO file for some upcoming changes I'd like to implement in Apartment.
+
 ## License
 
 Apartment is released under the [MIT License](http://www.opensource.org/licenses/MIT).

data/TODO.md

@@ -0,0 +1,52 @@
+# Apartment TODOs
+
+### Below is a list of tasks in the approximate order to be completed of for Apartment
+### Any help along the way is greatly appreciated (on any items, not particularly in order)
+
+1.  Apartment was originally written (and TDD'd) with just Postgresql in mind. Different adapters were added at a later date.
+    As such, the test suite is a bit of a mess. There's no formal structure for fully integration testing all adapters to ensure
+    proper quality and prevent regressions.
+
+    There's also a test order dependency as some tests run assuming a db connection and if that test randomly ran before a previous
+    one that makes the connection, it would fail.
+
+    I'm proposing the first thing to be done is to write up a standard, high livel integration test case that can be applied to all adapters
+    and makes no assumptions about implementation. It should ensure that each adapter conforms to the Apartment Interface and CRUD's properly.
+    It would be nice if a user can 'register' an adapter such that it would automatically be tested (nice to have). Otherwise one could just use
+    a shared behaviour to run through all of this.
+
+    Then, I'd like to see all of the implementation specific tests just in their own test file for each adapter (ie the postgresql schema adapter
+    checks a lot of things with `schema_search_path`)
+
+    This should ensure that going forward nothing breaks, and we should *ideally* be able to randomize the test order
+
+2.  `Apartment::Database` is the wrong abstraction. When dealing with a multi-tenanted system, users shouldn't thing about 'Databases', they should
+    think about Tenants. I proprose that we deprecate the `Apartment::Database` constant in favour of `Apartment::Tenant` for a nicer abstraction. See
+    http://myronmars.to/n/dev-blog/2011/09/deprecating-constants-and-classes-in-ruby for ideas on how to achieve this.
+
+3.  `Delayed::Job` has proven to be an absolute P.I.T.A. It's YAML hacks are beyond reproach and require further hacks in order to work properly.
+    I want to completely remove the Delayed::Job dependency from Apartment and make an `apartment-delayed-job` gem that can be worked on independently
+    (and hopefully eventually deprecated). To this end, I've started an `apartment-sidekiq` gem and would love to see an `apartment-resque` gem to deal
+    with those background workers from a multi-tenant perspective also.
+
+4.  Apartment::Database.process should be deprecated in favour of just passing an optional block to `switch`
+
+5.  Migrations right now can be a bit of a pain. Apartment currently migrates a single tenant completely up to date, then goes onto the next. If one of these
+    migrations fails on a tenant, the previous one does NOT get reverted and leaves you in an awkward state. Ideally we'd want to wrap all of the migrations in
+    a transaction so if one fails, the whole thing reverts. Once we can ensure an all-or-nothing approach to migrations, we can optimize the migration strategy
+    to not even iterate over the tenants if there are no migrations to run on public. I also thought id would be nice to provide an optional file to require in one's
+    Rakefile such that it would override `db:migrate` to do `apartment:migrate`. That way people don't have to remember to use a different task and there's no confusion.
+
+6.  Apartment has be come one of the most popular/robust Multi-tenant gems for Rails, but it still doesn't work for everyone's use case. It's fairly limited
+    in implementation to either schema based (ie postgresql schemas) or connection based. I'd like to abstract out these implementation details such that one
+    could write a pluggable strategy for Apartment and choose it based on a config selection (something like `config.strategy = :schema`). The next implementation
+    I'd like to see is a scoped based approach that uses a `tenant_id` scoping on all records for multi-tenancy. This is probably the most popular multi-tenant approach
+    and is db independent and really the simplest mechanism for a type of multi-tenancy.
+
+7.  Right now excluded tables still live in all tenanted environments. This is basically because it doesn't matter if they're there, we always query from the public.
+    It's a bit of an annoyance though and confuses lots of people. I'd love to see only tenanted tables in the tenants and only excluded tables in the public tenant.
+    This will be hard because Rails uses public to generate schema.rb. One idea is to have an `excluded` schema that holds all the excluded models and the public can
+    maintain everything.
+
+8.  This one is pretty lofty, but I'd also like to abstract out the fact that Apartment uses ActiveRecord. With the new DataMapper coming out soon and other popular
+    DBMS's (ie. mongo, couch etc...), it'd be nice if Apartment could be the de-facto interface for multi-tenancy on these systems.

data/lib/apartment.rb

@@ -80,6 +80,7 @@ module Apartment
     autoload :Subdomain,      'apartment/elevators/subdomain'
     autoload :FirstSubdomain, 'apartment/elevators/first_subdomain'
     autoload :Domain,     'apartment/elevators/domain'
+    autoload :HostHash,     'apartment/elevators/host_hash'
   end
 
   module Delayed

data/lib/apartment/adapters/mysql2_adapter.rb

@@ -41,7 +41,7 @@ module Apartment
       #   Reset current_database to the default_database
       #
       def reset
-        connect_to_new(default_database)
+        Apartment.connection.execute "use #{default_database}"
       end
 
       #   Set the table_name to always use the default database for excluded models
@@ -57,7 +57,7 @@ module Apartment
       def connect_to_new(database)
         return reset if database.nil?
 
-        Apartment.connection.execute "use #{database}"
+        Apartment.connection.execute "use #{environmentify(database)}"
 
       rescue ActiveRecord::StatementInvalid
         Apartment::Database.reset

data/lib/apartment/adapters/postgresql_adapter.rb

@@ -79,7 +79,7 @@ module Apartment
         Apartment.connection.schema_search_path = full_search_path
 
       rescue *rescuable_exceptions
-        raise SchemaNotFound, "One of the following schema(s) is invalid: #{full_search_path}"
+        raise SchemaNotFound, "One of the following schema(s) is invalid: #{database}, #{full_search_path}"
       end
 
       #   Create the new schema
@@ -96,8 +96,8 @@ module Apartment
       #   Generate the final search path to set including persistent_schemas
       #
       def full_search_path
-        persistent_schemas = Apartment.persistent_schemas.join(', ')
-        @current_database.to_s + (persistent_schemas.empty? ? "" : ", #{persistent_schemas}")
+        persistent_schemas = Apartment.persistent_schemas.map { |schema| %{"#{schema}"} }.join(', ')
+        %{"#{@current_database.to_s}"} + (persistent_schemas.empty? ? "" : ", #{persistent_schemas}")
       end
     end
   end

data/lib/apartment/elevators/domain.rb

@@ -11,7 +11,7 @@ module Apartment
       def parse_database_name(request)
         return nil if request.host.blank?
 
-        request.host.match(/(www.)?(?<sld>[^.]*)/)["sld"]
+        request.host.match(/(www\.)?(?<sld>[^.]*)/)["sld"]
       end
     end
   end

data/lib/apartment/elevators/host_hash.rb

@@ -0,0 +1,20 @@
+module Apartment
+  module Elevators
+    #   Provides a rack based db switching solution based on hosts
+    #   Uses a hash to find the corresponding database name for the host
+    #
+    class HostHash < Generic
+      def initialize(app, hash = {}, processor = nil)
+        super app, processor
+        @hash = hash
+      end
+
+      def parse_database_name(request)
+        raise DatabaseNotFound,
+          "Cannot find database for host #{request.host}" unless @hash.has_key?(request.host)
+
+        @hash[request.host]
+      end
+    end
+  end
+end

data/lib/apartment/version.rb

@@ -1,3 +1,3 @@
 module Apartment
-  VERSION = "0.21.1"
+  VERSION = "0.22.0"
 end

data/lib/tasks/apartment.rake

@@ -1,21 +1,41 @@
 apartment_namespace = namespace :apartment do
 
+  desc "Create all multi-tenant databases"
+  task :create => 'db:migrate' do
+    database_names.each do |db|
+      begin
+        puts("Creating #{db} database")
+        quietly { Apartment::Database.create(db) }
+      rescue Apartment::DatabaseExists, Apartment::SchemaExists => e
+        puts e.message
+      end
+    end
+  end
+
   desc "Migrate all multi-tenant databases"
   task :migrate => 'db:migrate' do
 
-    Apartment.database_names.each do |db|
-      puts("Migrating #{db} database")
-      Apartment::Migrator.migrate db
+    database_names.each do |db|
+      begin
+        puts("Migrating #{db} database")
+        Apartment::Migrator.migrate db
+      rescue Apartment::DatabaseNotFound, Apartment::SchemaNotFound => e
+        puts e.message
+      end
     end
   end
 
   desc "Seed all multi-tenant databases"
   task :seed => 'db:seed' do
 
-    Apartment.database_names.each do |db|
-      puts("Seeding #{db} database")
-      Apartment::Database.process(db) do
-        Apartment::Database.seed
+    database_names.each do |db|
+      begin
+        puts("Seeding #{db} database")
+        Apartment::Database.process(db) do
+          Apartment::Database.seed
+        end
+      rescue Apartment::DatabaseNotFound, Apartment::SchemaNotFound => e
+        puts e.message
       end
     end
   end
@@ -24,9 +44,13 @@ apartment_namespace = namespace :apartment do
   task :rollback => 'db:rollback' do
     step = ENV['STEP'] ? ENV['STEP'].to_i : 1
 
-    Apartment.database_names.each do |db|
-      puts("Rolling back #{db} database")
-      Apartment::Migrator.rollback db, step
+    database_names.each do |db|
+      begin
+        puts("Rolling back #{db} database")
+        Apartment::Migrator.rollback db, step
+      rescue Apartment::DatabaseNotFound, Apartment::SchemaNotFound => e
+        puts e.message
+      end
     end
   end
 
@@ -37,9 +61,13 @@ apartment_namespace = namespace :apartment do
       version = ENV['VERSION'] ? ENV['VERSION'].to_i : nil
       raise 'VERSION is required' unless version
 
-      Apartment.database_names.each do |db|
-        puts("Migrating #{db} database up")
-        Apartment::Migrator.run :up, db, version
+      database_names.each do |db|
+        begin
+          puts("Migrating #{db} database up")
+          Apartment::Migrator.run :up, db, version
+        rescue Apartment::DatabaseNotFound, Apartment::SchemaNotFound => e
+          puts e.message
+        end
       end
     end
 
@@ -48,9 +76,13 @@ apartment_namespace = namespace :apartment do
       version = ENV['VERSION'] ? ENV['VERSION'].to_i : nil
       raise 'VERSION is required' unless version
 
-      Apartment.database_names.each do |db|
-        puts("Migrating #{db} database down")
-        Apartment::Migrator.run :down, db, version
+      database_names.each do |db|
+        begin
+          puts("Migrating #{db} database down")
+          Apartment::Migrator.run :down, db, version
+        rescue Apartment::DatabaseNotFound, Apartment::SchemaNotFound => e
+          puts e.message
+        end
       end
     end
 
@@ -67,4 +99,7 @@ apartment_namespace = namespace :apartment do
 
   end
 
-end
+  def database_names
+    ENV['DB'] ? ENV['DB'].split(',').map { |s| s.strip } : Apartment.database_names
+  end
+end

data/spec/adapters/jdbc_postgresql_adapter_spec.rb

@@ -18,7 +18,7 @@ if defined?(JRUBY_VERSION)
         ActiveRecord::Base.connection.execute("SELECT nspname FROM pg_namespace;").collect { |row| row['nspname'] }
       end
 
-      let(:default_database) { subject.process { ActiveRecord::Base.connection.schema_search_path } }
+      let(:default_database) { subject.process { ActiveRecord::Base.connection.schema_search_path.gsub('"', '') } }
 
       it_should_behave_like "a generic apartment adapter"
       it_should_behave_like "a schema based apartment adapter"
@@ -40,4 +40,4 @@ if defined?(JRUBY_VERSION)
 
     end
   end
-end
+end

data/spec/adapters/postgresql_adapter_spec.rb

@@ -16,7 +16,7 @@ describe Apartment::Adapters::PostgresqlAdapter do
         ActiveRecord::Base.connection.execute("SELECT nspname FROM pg_namespace;").collect { |row| row['nspname'] }
       end
 
-      let(:default_database) { subject.process { ActiveRecord::Base.connection.schema_search_path } }
+      let(:default_database) { subject.process { ActiveRecord::Base.connection.schema_search_path.gsub('"', '') } }
 
       it_should_behave_like "a generic apartment adapter"
       it_should_behave_like "a schema based apartment adapter"
@@ -37,4 +37,4 @@ describe Apartment::Adapters::PostgresqlAdapter do
       it_should_behave_like "a connection based apartment adapter"
     end
   end
-end
+end

data/spec/database_spec.rb

@@ -44,6 +44,24 @@ describe Apartment::Database do
       end
 
     end
+    
+    context "with prefix and schemas" do
+      describe "#create" do
+        before do
+          Apartment.configure do |config|
+            config.prepend_environment = true
+            config.use_schemas = true
+          end
+          subject.reload!(config) # switch to Mysql2SchemaAdapter
+        end
+        
+        after { subject.drop "db_with_prefix" rescue nil }
+        
+        it "should create a new database" do
+          subject.create "db_with_prefix"
+        end
+      end
+    end
   end
 
   context "using postgresql" do

data/spec/examples/elevator_examples.rb

@@ -4,10 +4,10 @@ shared_examples_for "an apartment elevator" do
 
   context "single request" do
     it "should switch the db" do
-      ActiveRecord::Base.connection.schema_search_path.should_not == database1
+      ActiveRecord::Base.connection.schema_search_path.should_not == %{"#{database1}"}
 
       visit(domain1)
-      ActiveRecord::Base.connection.schema_search_path.should == database1
+      ActiveRecord::Base.connection.schema_search_path.should == %{"#{database1}"}
     end
   end
 

data/spec/examples/schema_adapter_examples.rb

@@ -48,11 +48,11 @@ shared_examples_for "a schema based apartment adapter" do
 
       subject.create(schema2) do
         @count = User.count
-        connection.schema_search_path.should start_with schema2
+        connection.schema_search_path.should start_with %{"#{schema2}"}
         User.create
       end
 
-      connection.schema_search_path.should_not start_with schema2
+      connection.schema_search_path.should_not start_with %{"#{schema2}"}
 
       subject.process(schema2){ User.count.should == @count + 1 }
     end
@@ -96,13 +96,13 @@ shared_examples_for "a schema based apartment adapter" do
   describe "#process" do
     it "should connect" do
       subject.process(schema1) do
-        connection.schema_search_path.should start_with schema1
+        connection.schema_search_path.should start_with %{"#{schema1}"}
       end
     end
 
     it "should reset" do
       subject.process(schema1)
-      connection.schema_search_path.should start_with public_schema
+      connection.schema_search_path.should start_with %{"#{public_schema}"}
     end
   end
 
@@ -110,14 +110,14 @@ shared_examples_for "a schema based apartment adapter" do
     it "should reset connection" do
       subject.switch(schema1)
       subject.reset
-      connection.schema_search_path.should start_with public_schema
+      connection.schema_search_path.should start_with %{"#{public_schema}"}
     end
 
     context "with default_schema", :default_schema => true do
       it "should reset to the default schema" do
         subject.switch(schema1)
         subject.reset
-        connection.schema_search_path.should start_with default_schema
+        connection.schema_search_path.should start_with %{"#{default_schema}"}
       end
     end
 
@@ -128,13 +128,13 @@ shared_examples_for "a schema based apartment adapter" do
       end
 
       it "maintains the persistent schemas in the schema_search_path" do
-        connection.schema_search_path.should end_with persistent_schemas.join(', ')
+        connection.schema_search_path.should end_with persistent_schemas.map { |schema| %{"#{schema}"} }.join(', ')
       end
 
       context "with default_schema", :default_schema => true do
         it "prioritizes the switched schema to front of schema_search_path" do
           subject.reset # need to re-call this as the default_schema wasn't set at the time that the above reset ran
-          connection.schema_search_path.should start_with default_schema
+          connection.schema_search_path.should start_with %{"#{default_schema}"}
         end
       end
     end
@@ -143,12 +143,12 @@ shared_examples_for "a schema based apartment adapter" do
   describe "#switch" do
     it "should connect to new schema" do
       subject.switch(schema1)
-      connection.schema_search_path.should start_with schema1
+      connection.schema_search_path.should start_with %{"#{schema1}"}
     end
 
     it "should reset connection if database is nil" do
       subject.switch
-      connection.schema_search_path.should == public_schema
+      connection.schema_search_path.should == %{"#{public_schema}"}
     end
 
     it "should raise an error if schema is invalid" do
@@ -166,7 +166,7 @@ shared_examples_for "a schema based apartment adapter" do
           subject.switch(db)
         }.to_not raise_error
 
-        connection.schema_search_path.should start_with db.to_s
+        connection.schema_search_path.should start_with %{"#{db.to_s}"}
       end
 
       after{ subject.drop(db) }
@@ -182,7 +182,7 @@ shared_examples_for "a schema based apartment adapter" do
       end
 
       it "should still switch to the switched schema" do
-        connection.schema_search_path.should start_with schema1
+        connection.schema_search_path.should start_with %{"#{schema1}"}
       end
     end
 
@@ -191,11 +191,11 @@ shared_examples_for "a schema based apartment adapter" do
       before{ subject.switch(schema1) }
 
       it "maintains the persistent schemas in the schema_search_path" do
-        connection.schema_search_path.should end_with persistent_schemas.join(', ')
+        connection.schema_search_path.should end_with persistent_schemas.map { |schema| %{"#{schema}"} }.join(', ')
       end
 
       it "prioritizes the switched schema to front of schema_search_path" do
-        connection.schema_search_path.should start_with schema1
+        connection.schema_search_path.should start_with %{"#{schema1}"}
       end
     end
   end
@@ -215,4 +215,4 @@ shared_examples_for "a schema based apartment adapter" do
       end
     end
   end
-end
+end

data/spec/unit/middleware/host_hash_elevator_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+describe Apartment::Elevators::HostHash do
+
+  describe "#parse_database_name" do
+    it "parses the host for a domain name" do
+      request = ActionDispatch::Request.new('HTTP_HOST' => 'example.com')
+      elevator = Apartment::Elevators::HostHash.new(nil, 'example.com' => 'example_database')
+      elevator.parse_database_name(request).should == 'example_database'
+    end
+
+    it "raises DatabaseNotFound exception if there is no host" do
+      request = ActionDispatch::Request.new('HTTP_HOST' => '')
+      elevator = Apartment::Elevators::HostHash.new(nil, 'example.com' => 'example_database')
+      expect { elevator.parse_database_name(request) }.to raise_error(Apartment::DatabaseNotFound)
+    end
+
+    it "raises DatabaseNotFound exception if there is no database associated to current host" do
+      request = ActionDispatch::Request.new('HTTP_HOST' => 'example2.com')
+      elevator = Apartment::Elevators::HostHash.new(nil, 'example.com' => 'example_database')
+      expect { elevator.parse_database_name(request) }.to raise_error(Apartment::DatabaseNotFound)
+    end
+
+  end
+
+end

data/spec/unit/migrator_spec.rb

@@ -34,8 +34,8 @@ describe Apartment::Migrator do
 
       describe "#migrate" do
         it "should connect to new db, then reset when done" do
-          ActiveRecord::Base.connection.should_receive(:schema_search_path=).with(schema_name).once
-          ActiveRecord::Base.connection.should_receive(:schema_search_path=).with(@original_schema).once
+          ActiveRecord::Base.connection.should_receive(:schema_search_path=).with(%{"#{schema_name}"}).once
+          ActiveRecord::Base.connection.should_receive(:schema_search_path=).with(%{"#{@original_schema}"}).once
           Apartment::Migrator.migrate(schema_name)
         end
 
@@ -49,8 +49,8 @@ describe Apartment::Migrator do
         context "up" do
 
           it "should connect to new db, then reset when done" do
-            ActiveRecord::Base.connection.should_receive(:schema_search_path=).with(schema_name).once
-            ActiveRecord::Base.connection.should_receive(:schema_search_path=).with(@original_schema).once
+            ActiveRecord::Base.connection.should_receive(:schema_search_path=).with(%{"#{schema_name}"}).once
+            ActiveRecord::Base.connection.should_receive(:schema_search_path=).with(%{"#{@original_schema}"}).once
             Apartment::Migrator.run(:up, schema_name, version)
           end
 
@@ -63,8 +63,8 @@ describe Apartment::Migrator do
         describe "down" do
 
           it "should connect to new db, then reset when done" do
-            ActiveRecord::Base.connection.should_receive(:schema_search_path=).with(schema_name).once
-            ActiveRecord::Base.connection.should_receive(:schema_search_path=).with(@original_schema).once
+            ActiveRecord::Base.connection.should_receive(:schema_search_path=).with(%{"#{schema_name}"}).once
+            ActiveRecord::Base.connection.should_receive(:schema_search_path=).with(%{"#{@original_schema}"}).once
             Apartment::Migrator.run(:down, schema_name, version)
           end
 
@@ -86,4 +86,4 @@ describe Apartment::Migrator do
     end
   end
 
-end
+end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apartment
 version: !ruby/object:Gem::Version
-  version: 0.21.1
-  prerelease: 
+  version: 0.22.0
 platform: ruby
 authors:
 - Ryan Brunner
@@ -10,38 +9,34 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-31 00:00:00.000000000 Z
+date: 2013-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.1.2
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.3.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.3.6
 description: Apartment allows Rack applications to deal with database multitenancy
@@ -56,7 +51,8 @@ files:
 - .gitignore
 - .pryrc
 - .rspec
-- .rvmrc
+- .ruby-gemset
+- .ruby-version
 - .travis.yml
 - .vagrant
 - Cheffile
@@ -65,6 +61,7 @@ files:
 - HISTORY.md
 - README.md
 - Rakefile
+- TODO.md
 - Vagrantfile
 - apartment.gemspec
 - circle.yml
@@ -87,12 +84,11 @@ files:
 - lib/apartment/elevators/domain.rb
 - lib/apartment/elevators/first_subdomain.rb
 - lib/apartment/elevators/generic.rb
+- lib/apartment/elevators/host_hash.rb
 - lib/apartment/elevators/subdomain.rb
 - lib/apartment/migrator.rb
 - lib/apartment/railtie.rb
 - lib/apartment/reloader.rb
-- lib/apartment/sidekiq/client/database_middleware.rb
-- lib/apartment/sidekiq/server/database_middleware.rb
 - lib/apartment/version.rb
 - lib/generators/apartment/install/USAGE
 - lib/generators/apartment/install/install_generator.rb
@@ -161,39 +157,33 @@ files:
 - spec/tasks/apartment_rake_spec.rb
 - spec/unit/config_spec.rb
 - spec/unit/middleware/domain_elevator_spec.rb
+- spec/unit/middleware/host_hash_elevator_spec.rb
 - spec/unit/middleware/subdomain_elevator_spec.rb
 - spec/unit/migrator_spec.rb
 - spec/unit/reloader_spec.rb
 homepage: https://github.com/influitive/apartment
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2789245529283699970
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2789245529283699970
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A Ruby gem for managing database multitenancy
 test_files:
 - spec/adapters/jdbc_mysql_adapter_spec.rb
@@ -259,6 +249,7 @@ test_files:
 - spec/tasks/apartment_rake_spec.rb
 - spec/unit/config_spec.rb
 - spec/unit/middleware/domain_elevator_spec.rb
+- spec/unit/middleware/host_hash_elevator_spec.rb
 - spec/unit/middleware/subdomain_elevator_spec.rb
 - spec/unit/migrator_spec.rb
 - spec/unit/reloader_spec.rb

data/.rvmrc

@@ -1 +0,0 @@
-rvm --create ruby-1.9.3@apartment

data/lib/apartment/sidekiq/client/database_middleware.rb

@@ -1,12 +0,0 @@
-module Apartment
-  module Sidekiq
-    module Client
-      class DatabaseMiddleware
-        def call(worker_class, item, queue)
-          item["apartment"] = Apartment::Database.current_database
-          yield
-        end
-      end
-    end
-  end
-end

data/lib/apartment/sidekiq/server/database_middleware.rb

@@ -1,13 +0,0 @@
-module Apartment
-  module Sidekiq
-    module Server
-      class DatabaseMiddleware
-        def call(worker_class, item, queue)
-          Apartment::Database.process(item['apartment']) do
-            yield
-          end
-        end
-      end
-    end
-  end
-end