motel-activerecord 2.0.3 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1275f8eb347d61ff0aefb090f550154cfc2a3dc2
-  data.tar.gz: 928c7506b87ec1057b9fbda06392729d1cbaab32
+  metadata.gz: a8adf465d12d86092aefa4034d84e91a680bebd2
+  data.tar.gz: 224ccbe7475d8faf3ce65b25797bd37a961feb0a
 SHA512:
-  metadata.gz: fcb3abb6c7785374b284b03d96f33d0c13238fa1f8945c6134a1880291f3155735d42082e3de7e73c04f4b0aa9be5c460d6db8591336ab65e22d4b90a8bad629
-  data.tar.gz: b1036fd084f60a19341df61f52fe6a2b86bb4adbb29c608a9c5fcae87a46b396d5fa79ef49723164d56f54fe1804ee005352808f8585336ab0083948e6a2cfb5
+  metadata.gz: eb426c11b7c6cb1c879d0a76154d3f9d2007436042a17ca70a7231b98f76a74873d08271ae159aa19270a3d32411f7ef4ec9a21d296b3e9b8ae909a5b4f7684d
+  data.tar.gz: 94926c8814e71010e05036f1df0aef1d665e425f154dc713e8ed16e47fa82e89f64b12c1dce092b1dd03fd930078043da674db096e025070f977eac624a040b9

data/README.md

@@ -44,8 +44,8 @@ In your app/application.rb file write this:
 ```ruby
 config.motel.tenants_source_configurations = {
   source:      :database,
-  source_spec: { adapter: 'sqlite3', database: 'db/tenants.sqlite3' },
-  table_name:  'tenant'
+  source_spec: { adapter: "sqlite3", database: "db/tenants.sqlite3" },
+  table_name:  "tenant"
 }
 ```
 
@@ -53,13 +53,13 @@ You can specify the source by providing a hash of the
 connection specification. Example:
 
 ```ruby
-source_spec: {adapter: 'sqlite3', database: 'db/tenants.sqlite3'}
+source_spec: { adapter: "sqlite3", database: "db/tenants.sqlite3" }
 ```
 
 Table name where are stored the connection details of tenants:
 
 ```ruby
-table_name: 'tenant'
+table_name: "tenant"
 ```
 
 Note: The columns of the table must contain connection details and
@@ -88,7 +88,7 @@ config.motel.tenants_source_configurations = {
   source:   :redis,
   host:     127.0.0.1,
   port:     6380,
-  password: 'redis_password'
+  password: "redis_password"
 }
 ```
 To connect to Redis listening on a Unix socket, try use 'path'
@@ -102,7 +102,7 @@ If you want to assing dirently the tenants specificactions you can do it:
 
 ```ruby
 config.motel.tenants_source_configurations = {
-  configurations: { 'foo' => { adapter: 'sqlite3', database: 'db/foo.sqlite3' }}
+  configurations: { "foo" => { adapter: "sqlite3", database: "db/foo.sqlite3" } }
 }
 ```
 
@@ -123,7 +123,7 @@ Set the `TENANT` environment variable to run the rake task on a
 specific tenant.
 
 ```ruby
-$ TENANT='foo' rake db:migrate
+$ TENANT=foo rake db:migrate
 ```
 
 ### More configurations
@@ -131,7 +131,7 @@ $ TENANT='foo' rake db:migrate
 You can assign a default tenant if the current tenant is null:
 
 ```ruby
-config.motel.default_tenant = 'my_default_tenant'
+config.motel.default_tenant = "my_default_tenant"
 ```
 
 Tenants switching is done via the subdomain of the url, you can
@@ -140,7 +140,7 @@ string. Example, to get the tenant `foo` from the follow url
 `http://www.example.com/foo/index` you should write:
 
 ```ruby
-config.motel.admission_criteria = '\/(\w*)\/'
+config.motel.admission_criteria = "\/(\w*)\/"
 ```
 
 If you do not want the automatic switching of tenants by url you must
@@ -150,13 +150,6 @@ disable the middleware:
 config.motel.disable_middleware = true
 ```
 
-Path of the html page to show if tenant doesn't exist. Default is
-`public/404.html`.
-
-```ruby
-config.motel.nonexistent_tenant_page = 'new_path'
-```
-
 ## Use without Rails
 
 ### Specifying the source of tenants
@@ -167,11 +160,51 @@ use the method `tenants_source_configurations` of `Motel::Manager`:
 ```ruby
 Motel::Manager.tenants_source_configurations({
   source:      :database,
-  source_spec: { adapter: 'sqlite3', database: 'db/tenants.sqlite3' },
+  source_spec: { adapter: "sqlite3", database: "db/tenants.sqlite3" },
   table_name:  'tenant'
 })
 ```
 
+# Usage
+
+## Switching tenants
+
+If you're using Rails the tenant switching occurs automatically
+through the Lobby middleware, otherwise you must set the current
+tenant:
+
+```ruby
+Motel::Manager.current_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
+```
+
+Usage example:
+
+```ruby
+  Motel::Manager.current_tenant = "foo"
+
+  FooBar.create(name: "Foo")
+  # => #<FooBar id: 1, name: "Foo">
+
+  Motel::Manager.current_tenant = "bar"
+
+  FooBar.all
+  # => #<ActiveRecord::Relation []>
+
+  Motel::Manager.current_tenant = "foo"
+
+  FooBar.all
+  # => #<ActiveRecord::Relation [#<FooBar id: 1, name: "Foo">]>
+```
+
 # Available methods
 
 Set a tenats source configurations
@@ -192,12 +225,6 @@ Set a default tenant
 Motel::Manager.default_tenant
 ```
 
-Set the html page to show if tenant doesn't exist
-
-```ruby
-Motel::Manager.nonexistent_tenant_page
-```
-
 Set a current tenant
 
 ```ruby

data/VERSION

@@ -1 +1 @@
-2.0.3
+2.1.0

data/lib/motel-activerecord.rb

@@ -1,10 +1,10 @@
-require 'motel/connection_adapters'
 require 'motel/lobby'
 require 'motel/manager'
 require 'motel/sources'
-require 'motel/multi_tenant'
 require 'motel/errors'
 require 'motel/version'
+require 'motel/active_record'
+require 'motel/connection_adapters'
 
 require 'motel/railtie' if defined? Rails
 

data/lib/motel/active_record.rb

@@ -0,0 +1,4 @@
+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

@@ -0,0 +1,58 @@
+require 'active_record'
+require 'active_support/concern'
+require 'motel/connection_adapters'
+
+module Motel
+  module ActiveRecord
+    module ConnectionHandler
+      extend ActiveSupport::Concern
+
+      included do
+
+        self.default_connection_handler = Motel::ConnectionAdapters::ConnectionHandler.new
+
+      end
+
+      module ClassMethods
+
+        def establish_connection(config)
+          tenant_name = Motel::Manager.determines_tenant || self.name
+          resolver    = Motel::ConnectionAdapters::ConnectionSpecification::Resolver.new
+          spec        = resolver.spec(config)
+
+          connection_handler.establish_connection tenant_name, spec
+        end
+
+        def connection_pool
+          connection_handler.retrieve_connection_pool(current_tenant)
+        end
+
+        def retrieve_connection
+          connection_handler.retrieve_connection(current_tenant)
+        end
+
+        def connected?
+          connection_handler.connected?(current_tenant)
+        end
+
+        def remove_connection(tenant_name = current_tenant)
+          connection_handler.remove_connection(tenant_name)
+        end
+
+        def arel_engine
+          ::ActiveRecord::Base
+        end
+
+        def current_tenant
+          Motel::Manager.determines_tenant or raise Motel::NoCurrentTenantError
+        end
+
+      end
+    end
+  end
+end
+
+ActiveSupport.on_load(:active_record) do
+  include Motel::ActiveRecord::ConnectionHandler
+end
+

data/lib/motel/active_record/migration.rb

@@ -0,0 +1,36 @@
+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

@@ -0,0 +1,73 @@
+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/connection_adapters/connection_handler.rb

@@ -3,7 +3,7 @@ require 'active_record'
 module Motel
   module ConnectionAdapters
 
-    class ConnectionHandler < ActiveRecord::ConnectionAdapters::ConnectionHandler
+    class ConnectionHandler < ::ActiveRecord::ConnectionAdapters::ConnectionHandler
 
       attr_accessor :tenants_source
 
@@ -21,7 +21,7 @@ module Motel
       def establish_connection(tenant_name, spec = nil)
         spec ||= connection_especification(tenant_name)
         @class_to_pool.clear
-        owner_to_pool[tenant_name] = ActiveRecord::ConnectionAdapters::ConnectionPool.new(spec)
+        owner_to_pool[tenant_name] = ::ActiveRecord::ConnectionAdapters::ConnectionPool.new(spec)
       end
 
       def retrieve_connection(tenant_name)
@@ -82,8 +82,8 @@ module Motel
           resolver = ConnectionSpecification::Resolver.new
           spec = resolver.spec(tenants_source.tenant(tenant_name))
 
-          unless ActiveRecord::Base.respond_to?(spec.adapter_method)
-            raise ActiveRecord::AdapterNotFound, "database configuration specifies nonexistent #{spec.config[:adapter]} adapter"
+          unless ::ActiveRecord::Base.respond_to?(spec.adapter_method)
+            raise ::ActiveRecord::AdapterNotFound, "database configuration specifies nonexistent #{spec.config[:adapter]} adapter"
           end
 
           spec

data/lib/motel/connection_adapters/connection_specification/resolver.rb

@@ -16,7 +16,7 @@ module Motel
         def spec(config)
           spec = resolve(config).symbolize_keys
 
-          raise(ActiveRecord::AdapterNotSpecified, "database configuration does not specify adapter") unless spec.key?(:adapter)
+          raise(::ActiveRecord::AdapterNotSpecified, "database configuration does not specify adapter") unless spec.key?(:adapter)
 
           path_to_adapter = "active_record/connection_adapters/#{spec[:adapter]}_adapter"
           begin
@@ -28,7 +28,7 @@ module Motel
           end
 
           adapter_method = "#{spec[:adapter]}_connection"
-          ActiveRecord::ConnectionAdapters::ConnectionSpecification.new(spec, adapter_method)
+          ::ActiveRecord::ConnectionAdapters::ConnectionSpecification.new(spec, adapter_method)
         end
 
         private
@@ -36,7 +36,7 @@ module Motel
           def resolve(config)
             case config
             when nil
-              raise ActiveRecord::AdapterNotSpecified
+              raise ::ActiveRecord::AdapterNotSpecified
             when String, Symbol
               resolve_string_connection config.to_s
             when Hash

data/lib/motel/lobby.rb

@@ -10,23 +10,15 @@ module Motel
 
     def call(env)
       request = Rack::Request.new(env)
-
       name = tenant_name(request)
 
-      if name
-        if Motel::Manager.tenant?(name)
-          Motel::Manager.current_tenant = name
-          @app.call(env)
-        else
-          path = Motel::Manager.nonexistent_tenant_page
-          file = File.expand_path(path) if path
-          body = (File.exists?(file.to_s)) ? File.read(file) : "Nonexistent #{name} tenant"
-          [404, {"Content-Type" => "text/html", "Content-Length" => body.size.to_s}, [body]]
-        end
+      if name && Motel::Manager.tenant?(name)
+        Motel::Manager.current_tenant = name
       else
         Motel::Manager.current_tenant = nil
-        @app.call(env)
       end
+
+      @app.call(env)
     end
 
     private

data/lib/motel/manager.rb

@@ -5,10 +5,8 @@ require 'active_record'
 module Motel
   module Manager
 
-    mattr_accessor :nonexistent_tenant_page
     mattr_accessor :admission_criteria
     mattr_accessor :default_tenant
-    mattr_accessor :current_tenant
 
     class << self
 
@@ -18,7 +16,7 @@ module Motel
 
         source_instance = source_class.new(config)
 
-        ActiveRecord::Base.connection_handler.tenants_source = source_instance
+        ::ActiveRecord::Base.connection_handler.tenants_source = source_instance
       end
 
       def tenants
@@ -39,19 +37,19 @@ module Motel
       end
 
       def update_tenant(name, spec)
-        ActiveRecord::Base.remove_connection(name)
+        ::ActiveRecord::Base.remove_connection(name)
         tenants_source.update_tenant(name, spec)
         tenant(name)
       end
 
       def delete_tenant(name)
-        ActiveRecord::Base.remove_connection(name)
+        ::ActiveRecord::Base.remove_connection(name)
         tenants_source.delete_tenant(name)
         !tenant?(name)
       end
 
       def active_tenants
-        ActiveRecord::Base.connection_handler.active_tenants
+        ::ActiveRecord::Base.connection_handler.active_tenants
       end
 
       def determines_tenant
@@ -59,7 +57,25 @@ module Motel
       end
 
       def tenants_source
-        ActiveRecord::Base.connection_handler.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

data/lib/motel/railtie.rb

@@ -9,6 +9,11 @@ module Motel
 
     config.motel = ActiveSupport::OrderedOptions.new
 
+    config.action_dispatch.rescue_responses.merge!(
+      'Motel::NoCurrentTenantError' => :not_found,
+      'Motel::NonexistentTenantError' => :not_found
+    )
+
     rake_tasks do
       namespace :db do
         task :load_config do
@@ -20,30 +25,30 @@ module Motel
           # 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.database_configuration = Motel::Manager.tenants
+          ::ActiveRecord::Base.configurations = ::ActiveRecord::Tasks::DatabaseTasks.database_configuration
+          ::ActiveRecord::Tasks::DatabaseTasks.env = Motel::Manager.determines_tenant
         end
       end
     end
 
-    ActiveRecord::Railtie.initializers.delete_if do |i|
+    ::ActiveRecord::Railtie.initializers.delete_if do |i|
       INIT_TO_DELETE.include?(i.name)
     end
 
     initializer "motel.general_configuration" do
       motel_config = Rails.application.config.motel
 
-      Motel::Manager.nonexistent_tenant_page = motel_config.nonexistent_tenant_page || 'public/404.html'
+      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.current_tenant = motel_config.current_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_before ActiveRecord::Migration::CheckPending, Lobby
+        app.config.middleware.insert_after ActionDispatch::Callbacks, Lobby
       end
     end
 
@@ -52,10 +57,10 @@ module Motel
 
       ActiveSupport.on_load(:active_record) do
         ActionDispatch::Reloader.send(hook) do
-          ActiveRecord::Base.clear_reloadable_connections!
+          ::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)
-            ActiveRecord::Base.clear_cache!
+            ::ActiveRecord::Base.clear_cache!
           end
         end
       end

data/spec/lib/motel/{multi_tenant_spec.rb → active_record/connection_handler.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe ActiveRecord::Base do
+describe ::ActiveRecord::Base do
 
   before(:all) do
     Motel::Manager.tenants_source_configurations({source: :default})
@@ -14,8 +14,8 @@ describe ActiveRecord::Base do
   end
 
   after(:each) do
-    ActiveRecord::Base.connection_handler.active_tenants do |tenant|
-      ActiveRecord::Base.connection_handler.remove_connection(tenant)
+    ::ActiveRecord::Base.connection_handler.active_tenants do |tenant|
+      ::ActiveRecord::Base.connection_handler.remove_connection(tenant)
     end
     Motel::Manager.current_tenant = nil
   end
@@ -29,9 +29,9 @@ describe ActiveRecord::Base do
       end
 
       it 'establishes a connection keyed by tenant name' do
-        ActiveRecord::Base.establish_connection(FOO_SPEC)
+        ::ActiveRecord::Base.establish_connection(FOO_SPEC)
 
-        expect(ActiveRecord::Base.connection_handler.active_tenants).to include('foo')
+        expect(::ActiveRecord::Base.connection_handler.active_tenants).to include('foo')
       end
 
     end
@@ -39,9 +39,9 @@ describe ActiveRecord::Base do
     context 'without setting the current tenant name' do
 
       it 'establishes a connection keyed by class name' do
-        ActiveRecord::Base.establish_connection(BAZ_SPEC)
+        ::ActiveRecord::Base.establish_connection(BAZ_SPEC)
 
-        expect(ActiveRecord::Base.connection_handler.active_tenants).to include('ActiveRecord::Base')
+        expect(::ActiveRecord::Base.connection_handler.active_tenants).to include('ActiveRecord::Base')
       end
 
     end
@@ -54,9 +54,9 @@ describe ActiveRecord::Base do
 
       it 'returns a connection pool of current tenant' do
         Motel::Manager.current_tenant = 'foo'
-        pool = ActiveRecord::Base.connection_handler.establish_connection('foo')
+        pool = ::ActiveRecord::Base.connection_handler.establish_connection('foo')
 
-        expect(ActiveRecord::Base.connection_pool).to eq pool
+        expect(::ActiveRecord::Base.connection_pool).to eq pool
       end
 
     end
@@ -65,7 +65,7 @@ describe ActiveRecord::Base do
 
       it 'rises an error' do
         Motel::Manager.current_tenant = nil
-        expect{ActiveRecord::Base.connection_pool}.to raise_error Motel::NoCurrentTenantError
+        expect{::ActiveRecord::Base.connection_pool}.to raise_error Motel::NoCurrentTenantError
       end
 
     end
@@ -78,9 +78,9 @@ describe ActiveRecord::Base do
 
       it 'returns a connection of current tenant' do
         Motel::Manager.current_tenant = 'foo'
-        pool = ActiveRecord::Base.connection_handler.establish_connection('foo')
+        pool = ::ActiveRecord::Base.connection_handler.establish_connection('foo')
 
-        expect(ActiveRecord::Base.retrieve_connection).to eq pool.connection
+        expect(::ActiveRecord::Base.retrieve_connection).to eq pool.connection
       end
 
     end
@@ -89,7 +89,7 @@ describe ActiveRecord::Base do
 
       it 'rises an error' do
         Motel::Manager.current_tenant = nil
-        expect{ActiveRecord::Base.retrieve_connection}.to raise_error Motel::NoCurrentTenantError
+        expect{::ActiveRecord::Base.retrieve_connection}.to raise_error Motel::NoCurrentTenantError
       end
 
     end
@@ -99,19 +99,19 @@ describe ActiveRecord::Base do
   describe '.connected?' do
 
     before(:each) do
-      ActiveRecord::Base.connection_handler.retrieve_connection('foo')
+      ::ActiveRecord::Base.connection_handler.retrieve_connection('foo')
     end
 
     context 'current tenant established' do
 
       it 'returns true' do
         Motel::Manager.current_tenant = 'foo'
-        expect(ActiveRecord::Base.connected?).to be_truthy
+        expect(::ActiveRecord::Base.connected?).to be_truthy
       end
 
       it 'returns false' do
         Motel::Manager.current_tenant = 'bar'
-        expect(ActiveRecord::Base.connected?).to be_falsey
+        expect(::ActiveRecord::Base.connected?).to be_falsey
       end
 
     end
@@ -120,7 +120,7 @@ describe ActiveRecord::Base do
 
       it 'rises an error' do
         Motel::Manager.current_tenant = nil
-        expect{ActiveRecord::Base.connected?}.to raise_error Motel::NoCurrentTenantError
+        expect{::ActiveRecord::Base.connected?}.to raise_error Motel::NoCurrentTenantError
       end
 
     end
@@ -132,10 +132,10 @@ describe ActiveRecord::Base do
     context 'current tenant established' do
 
       it 'removes connection' do
-        ActiveRecord::Base.connection_handler.establish_connection('foo')
+        ::ActiveRecord::Base.connection_handler.establish_connection('foo')
         Motel::Manager.current_tenant = 'foo'
-        ActiveRecord::Base.remove_connection
-        expect(ActiveRecord::Base.connection_handler.active_tenants).not_to include('foo')
+        ::ActiveRecord::Base.remove_connection
+        expect(::ActiveRecord::Base.connection_handler.active_tenants).not_to include('foo')
       end
 
     end
@@ -144,7 +144,7 @@ describe ActiveRecord::Base do
 
       it 'rises an error' do
         Motel::Manager.current_tenant = nil
-        expect{ActiveRecord::Base.remove_connection}.to raise_error Motel::NoCurrentTenantError
+        expect{::ActiveRecord::Base.remove_connection}.to raise_error Motel::NoCurrentTenantError
       end
 
     end
@@ -154,7 +154,7 @@ describe ActiveRecord::Base do
   describe '.arel_engine' do
 
     it 'returns a ActiveRecord::Base class' do
-      expect(ActiveRecord::Base.arel_engine).to eq ActiveRecord::Base
+      expect(::ActiveRecord::Base.arel_engine).to eq ::ActiveRecord::Base
     end
 
   end
@@ -166,7 +166,7 @@ describe ActiveRecord::Base do
       it 'returns the current tenant' do
         Motel::Manager.current_tenant = 'foo'
 
-        expect(ActiveRecord::Base.current_tenant).to eq 'foo'
+        expect(::ActiveRecord::Base.current_tenant).to eq 'foo'
       end
 
     end
@@ -176,7 +176,7 @@ describe ActiveRecord::Base do
       it 'rises an error' do
         Motel::Manager.current_tenant = nil
 
-        expect{ActiveRecord::Base.current_tenant}.to raise_error Motel::NoCurrentTenantError
+        expect{::ActiveRecord::Base.current_tenant}.to raise_error Motel::NoCurrentTenantError
       end
 
     end

data/spec/lib/motel/lobby_spec.rb

@@ -19,7 +19,6 @@ describe Motel::Lobby do
   after(:all) do
     Motel::Manager.delete_tenant('foo')
     Motel::Manager.admission_criteria = nil #sets default
-    Motel::Manager.nonexistent_tenant_page = nil #sets default
   end
 
   describe '#call' do
@@ -58,37 +57,16 @@ describe Motel::Lobby do
             @url = 'http://bar.test.com'
           end
 
-          it 'returns 404 code' do
+          it 'sets the current tenant on nil' do
             request @url
 
-            expect(last_response.status).to eq 404
+            expect(Motel::Manager.current_tenant).to be_nil
           end
 
-          context 'with default nonexistent tenant message' do
-
-            it 'returns default message on body' do
-              Motel::Manager.nonexistent_tenant_page = nil
-              request @url
-
-              expect(last_response.body).to eq "Nonexistent bar tenant"
-            end
-
-          end
-
-          context 'specifying the path of the page with the nonexistent tenant message' do
-
-            it 'returns default message on body' do
-              message = '<h1>Noexistent tenant<h1>'
-              file = Tempfile.new(['status_404', '.html'], TEMP_DIR)
-              file.write(message)
-              file.close
-
-              Motel::Manager.nonexistent_tenant_page = file.path
-              request @url
-
-              expect(last_response.body).to eq message
-            end
+          it 'response is ok' do
+            request @url
 
+            expect(last_response).to be_ok
           end
 
         end

data/spec/lib/motel/manager_spec.rb

@@ -3,17 +3,17 @@ require 'spec_helper'
 describe Motel::Manager do
 
   before(:all) do
-    ActiveRecord::Base.connection_handler = begin
+    ::ActiveRecord::Base.connection_handler = begin
       Motel::ConnectionAdapters::ConnectionHandler.new
     end
     @manager = Motel::Manager
   end
 
   before(:each) do
-    ActiveRecord::Base.connection_handler.tenants_source = begin
+    ::ActiveRecord::Base.connection_handler.tenants_source = begin
       Motel::Sources::Default.new
     end
-    @tenants_source = ActiveRecord::Base.connection_handler.tenants_source
+    @tenants_source = ::ActiveRecord::Base.connection_handler.tenants_source
     @tenants_source.add_tenant('foo', FOO_SPEC)
     @tenants_source.add_tenant('bar', BAR_SPEC)
   end
@@ -24,8 +24,8 @@ describe Motel::Manager do
     @manager.default_tenant = nil
 
     # Remove all connections tenant
-    ActiveRecord::Base.connection_handler.active_tenants do |tenant|
-      ActiveRecord::Base.connection_handler.remove_connection(tenant)
+    ::ActiveRecord::Base.connection_handler.active_tenants do |tenant|
+      ::ActiveRecord::Base.connection_handler.remove_connection(tenant)
     end
   end
 
@@ -123,7 +123,7 @@ describe Motel::Manager do
     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 = ::ActiveRecord::Base.connection_handler
       handler.establish_connection('baz', spec)
       expect(@manager.tenant?('baz')).to be_truthy
     end
@@ -176,10 +176,10 @@ describe Motel::Manager do
 
     it 'removes connection of tenant' do
 
-      ActiveRecord::Base.connection_handler.establish_connection('foo')
+      ::ActiveRecord::Base.connection_handler.establish_connection('foo')
       @manager.delete_tenant('foo')
 
-      expect(ActiveRecord::Base.connection_handler.active_tenants).not_to include('foo')
+      expect(::ActiveRecord::Base.connection_handler.active_tenants).not_to include('foo')
     end
 
   end
@@ -187,7 +187,7 @@ describe Motel::Manager do
   describe '#active_tenants' do
 
     it 'returns active tenans' do
-      ActiveRecord::Base.connection_handler.establish_connection('foo')
+      ::ActiveRecord::Base.connection_handler.establish_connection('foo')
       expect(@manager.active_tenants).to include('foo')
     end
 

data/spec/lib/motel/sources/database_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Motel::Sources::Database do
 
   before(:all) do
-    @klass = Class.new(ActiveRecord::Base) { def self.name; 'klass'; end }
+    @klass = Class.new(::ActiveRecord::Base) { def self.name; 'klass'; end }
 
     resolver = Motel::ConnectionAdapters::ConnectionSpecification::Resolver.new
     @handler = Motel::ConnectionAdapters::ConnectionHandler.new

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motel-activerecord
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.1.0
 platform: ruby
 authors:
 - Diego Martínez Valdelamar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-17 00:00:00.000000000 Z
+date: 2014-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -52,6 +52,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +94,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ActiveRecord extension to use connections to multiple databases
 email: dimarva.90@gmail.com
 executables: []
@@ -93,14 +121,17 @@ files:
 - lib/motel/sources/database.rb
 - lib/motel/sources/default.rb
 - lib/motel/sources/redis.rb
+- lib/motel/active_record.rb
 - lib/motel/errors.rb
 - lib/motel/version.rb
 - lib/motel/connection_adapters.rb
-- lib/motel/multi_tenant.rb
 - 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
 - VERSION
 - README.md
 - spec/tmp/foo.sqlite3
@@ -111,9 +142,9 @@ 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/multi_tenant_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
 licenses:
 - MIT
@@ -147,7 +178,7 @@ 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/multi_tenant_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/multi_tenant.rb

@@ -1,53 +0,0 @@
-module Motel
-  module MultiTenant
-    extend ActiveSupport::Concern
-
-    included do
-
-      self.default_connection_handler = ConnectionAdapters::ConnectionHandler.new
-
-    end
-
-    module ClassMethods
-
-      def establish_connection(config)
-        tenant_name = Motel::Manager.determines_tenant || self.name
-        resolver    = ConnectionAdapters::ConnectionSpecification::Resolver.new
-        spec        = resolver.spec(config)
-
-        connection_handler.establish_connection tenant_name, spec
-      end
-
-      def connection_pool
-        connection_handler.retrieve_connection_pool(current_tenant)
-      end
-
-      def retrieve_connection
-        connection_handler.retrieve_connection(current_tenant)
-      end
-
-      def connected?
-        connection_handler.connected?(current_tenant)
-      end
-
-      def remove_connection(tenant_name = current_tenant)
-        connection_handler.remove_connection(tenant_name)
-      end
-
-      def arel_engine
-        ActiveRecord::Base
-      end
-
-      def current_tenant
-        Motel::Manager.determines_tenant or raise Motel::NoCurrentTenantError
-      end
-
-    end
-  end
-
-end
-
-ActiveSupport.on_load(:active_record) do
-  include Motel::MultiTenant
-end
-