motel-activerecord 2.1.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8adf465d12d86092aefa4034d84e91a680bebd2
-  data.tar.gz: 224ccbe7475d8faf3ce65b25797bd37a961feb0a
+  metadata.gz: bbdd40d34d7c12ab8b85ebf22ad4c05fb9d68ec7
+  data.tar.gz: 42ff7e4c146a83c443e70fadc69201ddb5c756d8
 SHA512:
-  metadata.gz: eb426c11b7c6cb1c879d0a76154d3f9d2007436042a17ca70a7231b98f76a74873d08271ae159aa19270a3d32411f7ef4ec9a21d296b3e9b8ae909a5b4f7684d
-  data.tar.gz: 94926c8814e71010e05036f1df0aef1d665e425f154dc713e8ed16e47fa82e89f64b12c1dce092b1dd03fd930078043da674db096e025070f977eac624a040b9
+  metadata.gz: cd1193af26b506bc7734695b2716a9bc4f448546dd4ffd49b89d471603687765d5797b102f22f4001cc83ee9e5a82a193e97f90f2cffddad2495305cb240a163
+  data.tar.gz: e35b6efaee61dc09687d5cdb3e3fe29361ea773076f5f97f5b8b5183a89db497c440b8bfc74c76948fc0a59d5d7a9d833d6f429d9ce2ae060e0c885d696796b7

data/README.md

@@ -8,6 +8,7 @@ connections to multiple databases, one for each tenant.
 
 * Adds multi-tenant functionality to ActiveRecord.
 * Multiple databases, one for each tenant.
+* Databases of tenants may be in different locations.
 * Tenant connection details are stored keying them by the name on a database or redis server.
 * Use with or without Rails.
 
@@ -126,29 +127,21 @@ specific tenant.
 $ TENANT=foo rake db:migrate
 ```
 
-### More configurations
-
-You can assign a default tenant if the current tenant is null:
+To create the database of all tenants.
 
 ```ruby
-config.motel.default_tenant = "my_default_tenant"
+rake db:create:all
 ```
 
-Tenants switching is done via the subdomain of the url, you can
-specify a criteria to identify the tenant providing a regex as a
-string. Example, to get the tenant `foo` from the follow url
-`http://www.example.com/foo/index` you should write:
+To drop the database of all tenants.
 
 ```ruby
-config.motel.admission_criteria = "\/(\w*)\/"
+rake db:drop:all
 ```
 
-If you do not want the automatic switching of tenants by url you must
-disable the middleware:
-
-```ruby
-config.motel.disable_middleware = true
-```
+(Note: Is necessary to establish a **default tenant** because the
+middlewares of ActiveRecord require a connection to function
+properly and shared pages between tenants can be viewed.)
 
 ## Use without Rails
 
@@ -169,37 +162,32 @@ Motel::Manager.tenants_source_configurations({
 
 ## Switching tenants
 
-If you're using Rails the tenant switching occurs automatically
-through the Lobby middleware, otherwise you must set the current
-tenant:
+To switch between tenants:
 
 ```ruby
-Motel::Manager.current_tenant = "foo"
+Motel::Manager.switch_tenant("foo")
 ```
 
-The switching of the tenant is not only based setting the variable
-of the current tenant also by the environment variable or default
-tenant. The hierarchy for tenant selection occurs in the following
-order.
-
-```ruby
-ENV["TENANT"] || Motel::Manager.current_tenant || Motel::Manager.default_tenant
-```
+To determine the tenant of the connection to retrieve a fallback is
+performed through the variables that are used to set the tenant in
+the following order: environment variable `ENV['TENANT']`,
+tenant switched `Motel::Manager.switch_tenant()` and default tenant
+`Motel::Manager.default_tenant`.
 
 Usage example:
 
 ```ruby
-  Motel::Manager.current_tenant = "foo"
+  Motel::Manager.switch_tenant("foo")
 
   FooBar.create(name: "Foo")
   # => #<FooBar id: 1, name: "Foo">
 
-  Motel::Manager.current_tenant = "bar"
+  Motel::Manager.switch_tenant("bar")
 
   FooBar.all
   # => #<ActiveRecord::Relation []>
 
-  Motel::Manager.current_tenant = "foo"
+  Motel::Manager.switch_tenant("foo")
 
   FooBar.all
   # => #<ActiveRecord::Relation [#<FooBar id: 1, name: "Foo">]>
@@ -207,74 +195,69 @@ Usage example:
 
 # Available methods
 
-Set a tenats source configurations
+Sets a tenats source configurations
 
 ```ruby
 Motel::Manager.tenants_source_configurations(config)
 ```
 
-Set the admission criteria for the middleware
+Switches the tenant
 
 ```ruby
-Motel::Manager.admission_criteria
+Motel::Manager.switch_tenant(name)
 ```
 
-Set a default tenant
+Sets a default tenant
 
 ```ruby
 Motel::Manager.default_tenant
 ```
 
-Set a current tenant
+Retrieves a current tenant
 
 ```ruby
 Motel::Manager.current_tenant
 ```
 
-Retrieve the connection details of all tenants
+Retrieves the connection details of all tenants
 
 ```ruby
 Motel::Manager.tenants
 ```
 
-Retrieve a tenant
+Retrieves a tenant
 
 ```ruby
 Motel::Manager.tenant(name)
 ```
 
-Determine if a tenant exists
+Determines if a tenant exists
 
 ```ruby
 Motel::Manager.tenant?(name)
 ```
 
-Add tenant
+Adds tenant
 
 ```ruby
 Motel::Manager.add_tenant(name, spec)
 ```
 
-Update tenant
+Updates tenant
 
 ```ruby
 Motel::Manager.update_tenant(name, spec)
 ```
 
-Delete tenant
+Deletes tenant
 
 ```ruby
 Motel::Manager.delete_tenant(name)
 ```
 
-Retrieve the names of the tenants of active connections
+Retrieves the names of the tenants of active connections
 
 ```ruby
 Motel::Manager.active_tenants
 ```
 
-Determine the tenant to use for the connection
-
-```ruby
-Motel::Manager.determines_tenant
-```

data/VERSION

@@ -1 +1 @@
-2.1.0
+3.0.0

data/lib/motel-activerecord.rb

@@ -1,4 +1,3 @@
-require 'motel/lobby'
 require 'motel/manager'
 require 'motel/sources'
 require 'motel/errors'

data/lib/motel/active_record.rb

@@ -1,4 +1,2 @@
 require 'motel/active_record/connection_handler'
-require 'motel/active_record/migration'
-require 'motel/active_record/query_cache'
 

data/lib/motel/active_record/connection_handler.rb

@@ -16,9 +16,15 @@ module Motel
       module ClassMethods
 
         def establish_connection(config)
-          tenant_name = Motel::Manager.determines_tenant || self.name
-          resolver    = Motel::ConnectionAdapters::ConnectionSpecification::Resolver.new
-          spec        = resolver.spec(config)
+          case config
+          when String, Symbol
+            tenant_name = config.to_s
+            spec = nil
+          else
+            tenant_name = current_tenant
+            resolver = Motel::ConnectionAdapters::ConnectionSpecification::Resolver.new
+            spec = resolver.spec(config)
+          end
 
           connection_handler.establish_connection tenant_name, spec
         end
@@ -44,7 +50,7 @@ module Motel
         end
 
         def current_tenant
-          Motel::Manager.determines_tenant or raise Motel::NoCurrentTenantError
+          Motel::Manager.current_tenant or raise Motel::NoCurrentTenantError
         end
 
       end

data/lib/motel/active_record/railties/databases.rake

@@ -0,0 +1,38 @@
+require 'active_record'
+
+db_namespace = namespace :db do
+
+  Rake::Task['db:create:all'].clear
+  namespace :create do
+    task :all => :load_config do
+      Motel::Manager.tenants.each do |tenant_name, config|
+        Motel::Manager.switch_tenant(tenant_name)
+        ActiveRecord::Tasks::DatabaseTasks.create config
+      end
+    end
+  end
+
+  Rake::Task['db:drop:all'].clear
+  namespace :drop do
+    task :all => :load_config do
+      Motel::Manager.tenants.each do |tenant_name, config|
+        Motel::Manager.switch_tenant(tenant_name)
+        ActiveRecord::Tasks::DatabaseTasks.drop config
+      end
+    end
+  end
+
+  if Rake::Task.task_defined?('db:purge:all')
+    Rake::Task['db:purge:all'].clear
+    namespace :purge do
+      task :all => :load_config do
+        Motel::Manager.tenants.each do |tenant_name, config|
+          Motel::Manager.switch_tenant(tenant_name)
+          ActiveRecord::Tasks::DatabaseTasks.purge config
+        end
+      end
+    end
+  end
+
+end
+

data/lib/motel/manager.rb

@@ -5,7 +5,6 @@ require 'active_record'
 module Motel
   module Manager
 
-    mattr_accessor :admission_criteria
     mattr_accessor :default_tenant
 
     class << self
@@ -28,7 +27,7 @@ module Motel
       end
 
       def tenant?(name)
-        active_tenants.include?(name) || tenants_source.tenant?(name)
+        tenants_source.tenant?(name)
       end
 
       def add_tenant(name, spec)
@@ -48,36 +47,24 @@ module Motel
         !tenant?(name)
       end
 
+      def switch_tenant(name)
+        Thread.current.thread_variable_set(:@current_tenant, name)
+      end
+
       def active_tenants
         ::ActiveRecord::Base.connection_handler.active_tenants
       end
 
-      def determines_tenant
-        ENV['TENANT'] || current_tenant || default_tenant
+      def current_tenant
+        ENV['TENANT'] ||
+        Thread.current.thread_variable_get(:@current_tenant) ||
+        default_tenant
       end
 
       def tenants_source
         ::ActiveRecord::Base.connection_handler.tenants_source
       end
 
-      def current_tenant=(tenant)
-        Thread.current.thread_variable_set(:@current_tenant, tenant)
-      end
-
-      def current_tenant
-        Thread.current.thread_variable_get(:@current_tenant)
-      end
-
-      def nonexistent_tenant_page=(path_page)
-        warn "[DEPRECATION] `nonexistent_tenant_page` is deprecated. The page is manage for ActionDispatch::DebugExceptions middleware."
-        @nonexistent_tenant_page = path_page
-      end
-
-      def nonexistent_tenant_page
-        warn "[DEPRECATION] `nonexistent_tenant_page` is deprecated. The page is manage for ActionDispatch::DebugExceptions middleware."
-        @nonexistent_tenant_page
-      end
-
     end
 
   end

data/lib/motel/railtie.rb

@@ -1,6 +1,8 @@
 require 'active_support/ordered_options'
 require 'motel/manager'
+require 'active_record'
 require 'rails'
+require 'active_model/railtie'
 
 module Motel
 
@@ -15,21 +17,21 @@ module Motel
     )
 
     rake_tasks do
+      require "active_record/base"
+
       namespace :db do
         task :load_config do
           Motel::Manager.tenants_source_configurations(
             Rails.application.config.motel.tenants_source_configurations
           )
 
-          # Set a current tenant allow to db:create:all task establish and
-          # retrieve the connection
-          Motel::Manager.current_tenant ||= self.class
-
           ::ActiveRecord::Tasks::DatabaseTasks.database_configuration = Motel::Manager.tenants
           ::ActiveRecord::Base.configurations = ::ActiveRecord::Tasks::DatabaseTasks.database_configuration
-          ::ActiveRecord::Tasks::DatabaseTasks.env = Motel::Manager.determines_tenant
+          ::ActiveRecord::Tasks::DatabaseTasks.env = Motel::Manager.current_tenant
         end
       end
+
+      load "motel/active_record/railties/databases.rake"
     end
 
     ::ActiveRecord::Railtie.initializers.delete_if do |i|
@@ -39,19 +41,10 @@ module Motel
     initializer "motel.general_configuration" do
       motel_config = Rails.application.config.motel
 
-      Motel::Manager.nonexistent_tenant_page = motel_config.nonexistent_tenant_page || 'public/404.html' # Deprecated
-      Motel::Manager.admission_criteria = motel_config.admission_criteria
       Motel::Manager.default_tenant = motel_config.default_tenant
       Motel::Manager.tenants_source_configurations(motel_config.tenants_source_configurations)
     end
 
-    # Set lobby middleware before all ActiveRecord's middlewares
-    initializer "motel.configure_middleware" do |app|
-      if !Rails.application.config.motel.disable_middleware && (Rails.env != 'test')
-        app.config.middleware.insert_after ActionDispatch::Callbacks, Lobby
-      end
-    end
-
     initializer "active_record.set_reloader_hooks" do |app|
       hook = app.config.reload_classes_only_on_change ? :to_prepare : :to_cleanup
 
@@ -59,7 +52,7 @@ module Motel
         ActionDispatch::Reloader.send(hook) do
           ::ActiveRecord::Base.clear_reloadable_connections!
           # Clear cache of the current tenant with an active connection
-          if Motel::Manager.active_tenants.include?(Motel::Manager.determines_tenant)
+          if Motel::Manager.active_tenants.include?(Motel::Manager.current_tenant)
             ::ActiveRecord::Base.clear_cache!
           end
         end

data/spec/lib/motel/active_record/connection_handler.rb

@@ -17,31 +17,60 @@ describe ::ActiveRecord::Base do
     ::ActiveRecord::Base.connection_handler.active_tenants do |tenant|
       ::ActiveRecord::Base.connection_handler.remove_connection(tenant)
     end
-    Motel::Manager.current_tenant = nil
+    Motel::Manager.switch_tenant(nil)
+    ENV['TENANT'] = nil
   end
 
   describe '.establish_connection' do
 
-    context 'setting the current tenant name' do
+    context 'with a connection specification' do
+
+      context 'and the environment variable of the current is established' do
+
+        before(:each) do
+          ENV['TENANT'] = 'foo'
+        end
+
+        it 'establishes a connection keyed by tenant name' do
+          ::ActiveRecord::Base.establish_connection(FOO_SPEC)
+
+          expect(::ActiveRecord::Base.connection_handler.active_tenants).to include('foo')
+        end
 
-      before(:each) do
-        Motel::Manager.current_tenant = 'foo'
       end
 
-      it 'establishes a connection keyed by tenant name' do
-        ::ActiveRecord::Base.establish_connection(FOO_SPEC)
+      context 'and the environment variable of the current is not established' do
+
+        it 'establishes a connection keyed by name of the class' do
+          ::ActiveRecord::Base.establish_connection(FOO_SPEC)
+
+          expect(::ActiveRecord::Base.connection_handler.active_tenants).to include('ActiveRecord::Base')
+        end
 
-        expect(::ActiveRecord::Base.connection_handler.active_tenants).to include('foo')
       end
 
     end
 
-    context 'without setting the current tenant name' do
+    context 'with a tenant name' do
+
+      context 'existent' do
+
+        it 'establishes a connection keyed by tenant name' do
+          ::ActiveRecord::Base.establish_connection('foo')
+
+          expect(::ActiveRecord::Base.connection_handler.active_tenants).to include('foo')
+        end
+
+      end
+
+      context 'nonexistent' do
 
-      it 'establishes a connection keyed by class name' do
-        ::ActiveRecord::Base.establish_connection(BAZ_SPEC)
+        it 'raises an error' do
+          expect{
+            ::ActiveRecord::Base.establish_connection('baz')
+          }.to raise_error Motel::NonexistentTenantError
+        end
 
-        expect(::ActiveRecord::Base.connection_handler.active_tenants).to include('ActiveRecord::Base')
       end
 
     end
@@ -53,7 +82,7 @@ describe ::ActiveRecord::Base do
     context 'current tenant established' do
 
       it 'returns a connection pool of current tenant' do
-        Motel::Manager.current_tenant = 'foo'
+        Motel::Manager.switch_tenant('foo')
         pool = ::ActiveRecord::Base.connection_handler.establish_connection('foo')
 
         expect(::ActiveRecord::Base.connection_pool).to eq pool
@@ -64,7 +93,7 @@ describe ::ActiveRecord::Base do
     context 'current tenant not established' do
 
       it 'rises an error' do
-        Motel::Manager.current_tenant = nil
+        Motel::Manager.switch_tenant(nil)
         expect{::ActiveRecord::Base.connection_pool}.to raise_error Motel::NoCurrentTenantError
       end
 
@@ -77,7 +106,7 @@ describe ::ActiveRecord::Base do
     context 'current tenant established' do
 
       it 'returns a connection of current tenant' do
-        Motel::Manager.current_tenant = 'foo'
+        Motel::Manager.switch_tenant('foo')
         pool = ::ActiveRecord::Base.connection_handler.establish_connection('foo')
 
         expect(::ActiveRecord::Base.retrieve_connection).to eq pool.connection
@@ -88,7 +117,7 @@ describe ::ActiveRecord::Base do
     context 'current tenant not established' do
 
       it 'rises an error' do
-        Motel::Manager.current_tenant = nil
+        Motel::Manager.switch_tenant(nil)
         expect{::ActiveRecord::Base.retrieve_connection}.to raise_error Motel::NoCurrentTenantError
       end
 
@@ -105,12 +134,12 @@ describe ::ActiveRecord::Base do
     context 'current tenant established' do
 
       it 'returns true' do
-        Motel::Manager.current_tenant = 'foo'
+        Motel::Manager.switch_tenant('foo')
         expect(::ActiveRecord::Base.connected?).to be_truthy
       end
 
       it 'returns false' do
-        Motel::Manager.current_tenant = 'bar'
+        Motel::Manager.switch_tenant('bar')
         expect(::ActiveRecord::Base.connected?).to be_falsey
       end
 
@@ -119,7 +148,7 @@ describe ::ActiveRecord::Base do
     context 'current tenant not established' do
 
       it 'rises an error' do
-        Motel::Manager.current_tenant = nil
+        Motel::Manager.switch_tenant(nil)
         expect{::ActiveRecord::Base.connected?}.to raise_error Motel::NoCurrentTenantError
       end
 
@@ -133,7 +162,7 @@ describe ::ActiveRecord::Base do
 
       it 'removes connection' do
         ::ActiveRecord::Base.connection_handler.establish_connection('foo')
-        Motel::Manager.current_tenant = 'foo'
+        Motel::Manager.switch_tenant('foo')
         ::ActiveRecord::Base.remove_connection
         expect(::ActiveRecord::Base.connection_handler.active_tenants).not_to include('foo')
       end
@@ -143,7 +172,7 @@ describe ::ActiveRecord::Base do
     context 'current tenant not established' do
 
       it 'rises an error' do
-        Motel::Manager.current_tenant = nil
+        Motel::Manager.switch_tenant(nil)
         expect{::ActiveRecord::Base.remove_connection}.to raise_error Motel::NoCurrentTenantError
       end
 
@@ -164,7 +193,7 @@ describe ::ActiveRecord::Base do
     context 'tenant enviroment variable or current tenant or default tenant are set' do
 
       it 'returns the current tenant' do
-        Motel::Manager.current_tenant = 'foo'
+        Motel::Manager.switch_tenant('foo')
 
         expect(::ActiveRecord::Base.current_tenant).to eq 'foo'
       end
@@ -174,7 +203,7 @@ describe ::ActiveRecord::Base do
     context 'no tenant has been established' do
 
       it 'rises an error' do
-        Motel::Manager.current_tenant = nil
+        Motel::Manager.switch_tenant(nil)
 
         expect{::ActiveRecord::Base.current_tenant}.to raise_error Motel::NoCurrentTenantError
       end

data/spec/lib/motel/manager_spec.rb

@@ -20,7 +20,7 @@ describe Motel::Manager do
 
   after(:each) do
     ENV['TENANT'] = nil
-    @manager.current_tenant = nil
+    @manager.switch_tenant(nil)
     @manager.default_tenant = nil
 
     # Remove all connections tenant
@@ -120,14 +120,6 @@ describe Motel::Manager do
       expect(@manager.tenant?('foo')).to be_truthy
     end
 
-    it 'returns true if tenant baz does exist' do
-      resolver = Motel::ConnectionAdapters::ConnectionSpecification::Resolver.new
-      spec = resolver.spec(BAZ_SPEC)
-      handler = ::ActiveRecord::Base.connection_handler
-      handler.establish_connection('baz', spec)
-      expect(@manager.tenant?('baz')).to be_truthy
-    end
-
     it 'returns false if tenant does not exist' do
       expect(@manager.tenant?('foobar')).to be_falsey
     end
@@ -193,16 +185,17 @@ describe Motel::Manager do
 
   end
 
-  describe '#determines_tenant' do
+  describe '#current_tenant' do
 
     context 'tenant environment variable, current tenant and default tenant are set' do
 
       it 'returns tenant enviroment variable' do
         ENV['TENANT'] = 'foo'
-        @manager.current_tenant = 'bar'
         @manager.default_tenant = 'baz'
 
-        expect(@manager.determines_tenant).to eq ENV['TENANT']
+        @manager.switch_tenant('bar')
+
+        expect(@manager.current_tenant).to eq ENV['TENANT']
       end
 
     end
@@ -211,10 +204,11 @@ describe Motel::Manager do
 
       it 'returns tenant enviroment variable' do
         ENV['TENANT'] = nil
-        @manager.current_tenant = 'bar'
         @manager.default_tenant = 'baz'
 
-        expect(@manager.determines_tenant).to eq @manager.current_tenant
+        @manager.switch_tenant('bar')
+
+        expect(@manager.current_tenant).to eq 'bar'
       end
 
     end
@@ -223,10 +217,11 @@ describe Motel::Manager do
 
       it 'returns tenant enviroment variable' do
         ENV['TENANT'] = nil
-        @manager.current_tenant = nil
         @manager.default_tenant = 'baz'
 
-        expect(@manager.determines_tenant).to eq @manager.default_tenant
+        @manager.switch_tenant(nil)
+
+        expect(@manager.current_tenant).to eq 'baz'
       end
 
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motel-activerecord
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Diego Martínez Valdelamar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-10 00:00:00.000000000 Z
+date: 2014-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -128,10 +128,8 @@ files:
 - lib/motel/connection_adapters/connection_specification/resolver.rb
 - lib/motel/connection_adapters/connection_specification.rb
 - lib/motel/connection_adapters/connection_handler.rb
-- lib/motel/lobby.rb
-- lib/motel/active_record/query_cache.rb
-- lib/motel/active_record/migration.rb
 - lib/motel/active_record/connection_handler.rb
+- lib/motel/active_record/railties/databases.rake
 - VERSION
 - README.md
 - spec/tmp/foo.sqlite3
@@ -142,7 +140,6 @@ files:
 - spec/lib/motel/sources/redis_spec.rb
 - spec/lib/motel/connection_adapters/connection_specification/resolver_spec.rb
 - spec/lib/motel/connection_adapters/connection_handler_spec.rb
-- spec/lib/motel/lobby_spec.rb
 - spec/lib/motel/manager_spec.rb
 - spec/lib/motel/active_record/connection_handler.rb
 homepage: https://github.com/dimarval/motel-activerecord
@@ -178,7 +175,6 @@ test_files:
 - spec/lib/motel/sources/redis_spec.rb
 - spec/lib/motel/connection_adapters/connection_specification/resolver_spec.rb
 - spec/lib/motel/connection_adapters/connection_handler_spec.rb
-- spec/lib/motel/lobby_spec.rb
 - spec/lib/motel/manager_spec.rb
 - spec/lib/motel/active_record/connection_handler.rb
 has_rdoc: 

data/lib/motel/active_record/migration.rb

@@ -1,36 +0,0 @@
-require 'active_record'
-
-module Motel
-  module ActiveRecord
-    module Migration
-      module CheckPending
-
-        def call(env)
-          return @app.call(env) unless Motel::Manager.determines_tenant
-
-          if connection.supports_migrations?
-            mtime = ::ActiveRecord::Migrator.last_migration.mtime.to_i
-            if @last_check < mtime
-              ::ActiveRecord::Migration.check_pending!(connection)
-              @last_check = mtime
-            end
-          end
-
-          @app.call(env)
-        end
-
-        private
-
-          def connection
-            ::ActiveRecord::Base.connection
-          end
-
-      end
-    end
-  end
-end
-
-class ActiveRecord::Migration::CheckPending
-  prepend Motel::ActiveRecord::Migration::CheckPending
-end
-

data/lib/motel/active_record/query_cache.rb

@@ -1,73 +0,0 @@
-require 'active_record'
-
-module Motel
-  module ActiveRecord
-    module QueryCache
-
-      module ClassMethods
-
-        # Enable the query cache within the block if Active Record is configured.
-        # If it's not, it will execute the given block.
-        def cache(&block)
-          if Motel::Manager.determines_tenant &&
-              ::ActiveRecord::Base.connected?
-            connection.cache(&block)
-          else
-            yield
-          end
-        end
-
-        # Disable the query cache within the block if Active Record is configured.
-        # If it's not, it will execute the given block.
-        def uncached(&block)
-          if Motel::Manager.determines_tenant &&
-              ::ActiveRecord::Base.connected?
-            connection.uncached(&block)
-          else
-            yield
-          end
-        end
-
-      end
-
-      def call(env)
-        if Motel::Manager.determines_tenant
-          connection    = ::ActiveRecord::Base.connection
-          enabled       = connection.query_cache_enabled
-          connection_id = ::ActiveRecord::Base.connection_id
-          connection.enable_query_cache!
-
-          response = @app.call(env)
-          response[2] = Rack::BodyProxy.new(response[2]) do
-            restore_query_cache_settings(connection_id, enabled)
-          end
-
-          response
-        else
-          @app.call(env)
-        end
-      rescue Exception => e
-        if Motel::Manager.determines_tenant
-          restore_query_cache_settings(connection_id, enabled)
-        end
-
-        raise e
-      end
-
-    end
-
-  end
-end
-
-class ::ActiveRecord::Base
-  extend Motel::ActiveRecord::QueryCache::ClassMethods
-end
-
-class ::ActiveRecord::QueryCache
-  prepend Motel::ActiveRecord::QueryCache
-end
-
-class ::ActiveRecord::ConnectionAdapters::AbstractAdapter
-  prepend Motel::ActiveRecord::QueryCache::ClassMethods
-end
-

data/lib/motel/lobby.rb

@@ -1,39 +0,0 @@
-require 'rack'
-
-module Motel
-
-  class Lobby
-
-    def initialize(app)
-      @app = app
-    end
-
-    def call(env)
-      request = Rack::Request.new(env)
-      name = tenant_name(request)
-
-      if name && Motel::Manager.tenant?(name)
-        Motel::Manager.current_tenant = name
-      else
-        Motel::Manager.current_tenant = nil
-      end
-
-      @app.call(env)
-    end
-
-    private
-
-      def tenant_name(request)
-        if Motel::Manager.admission_criteria
-          regex = Regexp.new(Motel::Manager.admission_criteria)
-          name = request.path.match(regex)
-          name[1] if name
-        else
-         request.host.split('.').first
-        end
-      end
-
-  end
-
-end
-

data/spec/lib/motel/lobby_spec.rb

@@ -1,133 +0,0 @@
-ENV['RACK_ENV'] = 'test'
-
-require 'spec_helper'
-require 'rack/test'
-require 'tempfile'
-
-describe Motel::Lobby do
-  include Rack::Test::Methods
-
-  def app
-    app = lambda{ |env| [200, {"Content-Type" => "text/html"}, "Test"] }
-    Motel::Lobby.new(app)
-  end
-
-  before(:all) do
-    Motel::Manager.add_tenant('foo', FOO_SPEC)
-  end
-
-  after(:all) do
-    Motel::Manager.delete_tenant('foo')
-    Motel::Manager.admission_criteria = nil #sets default
-  end
-
-  describe '#call' do
-
-    context 'default admission criteria' do
-
-      before(:all) do
-        Motel::Manager.admission_criteria = nil
-      end
-
-      context 'url match' do
-
-        context 'existing tenant' do
-
-          before(:each) do
-            @url = 'http://foo.test.com'
-          end
-
-          it 'sets the current tenant' do
-            request @url
-
-            expect(Motel::Manager.current_tenant).to eq 'foo'
-          end
-
-          it 'response is ok' do
-            request  @url
-
-            expect(last_response).to be_ok
-          end
-
-        end
-
-        context 'nonexistent tenant' do
-
-          before(:each) do
-            @url = 'http://bar.test.com'
-          end
-
-          it 'sets the current tenant on nil' do
-            request @url
-
-            expect(Motel::Manager.current_tenant).to be_nil
-          end
-
-          it 'response is ok' do
-            request @url
-
-            expect(last_response).to be_ok
-          end
-
-        end
-
-      end
-
-    end
-
-  end
-
-  context 'specifying admission criteria' do
-
-    before(:all) do
-      Motel::Manager.admission_criteria = 'tenants\/(\w*)'
-    end
-
-    context 'url match' do
-
-      context 'existing tenant' do
-
-        before(:each) do
-          @url = 'http://www.example.com/tenants/foo'
-        end
-
-        it 'sets the current tenant' do
-          request @url
-
-          expect(Motel::Manager.current_tenant).to eq 'foo'
-        end
-
-        it 'response is ok' do
-          request  @url
-
-          expect(last_response).to be_ok
-        end
-
-      end
-
-    end
-
-    context 'url does not match' do
-
-      before(:each) do
-        @url = 'http://example.com'
-      end
-
-      it 'sets null the current tenant' do
-        request @url
-
-        expect(Motel::Manager.current_tenant).to be_nil
-     end
-
-      it 'response is ok' do
-        request  @url
-
-        expect(last_response).to be_ok
-      end
-
-    end
-
-  end
-
-end
-