motel-activerecord 1.0.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d63d3217db37313c2fdf0ea05beddecf96829775
-  data.tar.gz: 51ec95575f6533064f49b0fd1938682108120e2c
+  metadata.gz: cf8d15a90723e29a1cfd4fb21f02d210036bb734
+  data.tar.gz: 22560e25d8808e51fbe7e3b2d3c043505f2201a5
 SHA512:
-  metadata.gz: 3fdd2eb7bf0b8673feae3601c02081ab91bbc52eed684ec1cee07cda7f1a7c09ec1e50345ce0167e6dba11dea7786936503ffcf17b99d1f588014730f4eb65e5
-  data.tar.gz: bf6799396a47d73b5c0fb00c7b47f70d833c84223c9504ba006874ea31f4a732484f133ad39b6afa14e114e1e61a635836522601cabef6d5d212eb284a0db517
+  metadata.gz: 8256b2e4a4465f010539b44511201a01091ffce29355079ef03e94cfc2088a7701976cf88da044a37d571fa4810340db86c465e45c81b463999548b17dad4a0d
+  data.tar.gz: 69df363fa7a2d08471cc4ea2ff6a4fe59ed74497ecad0ba1527c75c2d477761a8d2bb09f6b6a02073a9abb0bc2daf669c7c24c1f24ca06049789f1ee81cfad9b

data/README.md

@@ -26,8 +26,13 @@ gem 'motel-activerecord'
 and run `bundle install` from your shell.
 
 # Supported Ruby and Rails versions
+
 The gem motel-activerecord supports MRI Ruby 2.0 or greater and Rails 4.0 or greater.
- 
+
+# SemVer
+
+This gem is based on the [Semantic Versioning](http://semver.org/).
+
 # Configuration
 
 ## Use with Rails
@@ -69,10 +74,10 @@ are showed below:
 | sockect   | String    |
 | port      | Integer   |
 | pool      | Integer   |
-| host      | Integer   |
-| username  | Integer   |
-| password  | Integer   |
-| database  | Integer   |
+| host      | String    |
+| username  | String    |
+| password  | String    |
+| database  | String    |
 | url       | String    |
 
 
@@ -113,6 +118,7 @@ Note: The methods like `add_tenant`, `update_tenant` and
 `delete_tenant` dosen't store permanently tenants.
 
 ### Use rake task
+
 Set the `TENANT` environment variable to run the rake task on a
 specific tenant.
 
@@ -156,10 +162,10 @@ config.motel.nonexistent_tenant_page = 'new_path'
 ### Specifying the source of tenants
 
 You can set the source of the tenants in the same way as with Rails,
-use the method `tenants_source_configurations` of `ActiveRecord::Base.motel`:
+use the method `tenants_source_configurations` of `Motel::Manager`:
 
 ```ruby
-ActiveRecord::Base.motel.tenants_source_configurations({
+Motel::Manager.tenants_source_configurations({
   source:      :database,
   source_spec: { adapter: 'sqlite3', database: 'db/tenants.sqlite3' },
   table_name:  'tenant'
@@ -169,66 +175,79 @@ ActiveRecord::Base.motel.tenants_source_configurations({
 # Available methods
 
 Set a tenats source configurations
+
 ```ruby
-ActiveRecord::Base.motel.tenants_source_configurations(config)
+Motel::Manager.tenants_source_configurations(config)
 ```
 
 Set the admission criteria for the middleware
+
 ```ruby
-ActiveRecord::Base.motel.admission_criteria
+Motel::Manager.admission_criteria
 ```
 
 Set a default tenant
+
 ```ruby
-ActiveRecord::Base.motel.default_tenant
+Motel::Manager.default_tenant
 ```
 
 Set the html page to show if tenant doesn't exist
+
 ```ruby
-ActiveRecord::Base.motel.nonexistent_tenant_page
+Motel::Manager.nonexistent_tenant_page
 ```
 
 Set a current tenant
+
 ```ruby
-ActiveRecord::Base.motel.current_tenant
+Motel::Manager.current_tenant
 ```
 
 Retrieve the connection details of all tenants
+
 ```ruby
-ActiveRecord::Base.motel.tenants
+Motel::Manager.tenants
 ```
 
 Retrieve a tenant
+
 ```ruby
-ActiveRecord::Base.motel.tenant(name)
+Motel::Manager.tenant(name)
 ```
 
 Determine if a tenant exists
+
 ```ruby
-ActiveRecord::Base.motel.tenant?(name)
+Motel::Manager.tenant?(name)
 ```
 
 Add tenant
+
 ```ruby
-ActiveRecord::Base.motel.add_tenant(name, spec)
+Motel::Manager.add_tenant(name, spec)
 ```
 
 Update tenant
+
 ```ruby
-ActiveRecord::Base.motel.update_tenant(name, spec)
+Motel::Manager.update_tenant(name, spec)
 ```
 
 Delete tenant
+
 ```ruby
-ActiveRecord::Base.motel.delete_tenant(name)
+Motel::Manager.delete_tenant(name)
 ```
 
 Retrieve the names of the tenants of active connections
+
 ```ruby
-ActiveRecord::Base.motel.active_tenants
+Motel::Manager.active_tenants
 ```
 
 Determine the tenant to use for the connection
+
 ```ruby
-ActiveRecord::Base.motel.determines_tenant
+Motel::Manager.determines_tenant
 ```

data/VERSION

@@ -1 +1 @@
-1.0.1
+2.0.0

data/lib/motel/lobby.rb

@@ -14,17 +14,17 @@ module Motel
       name = tenant_name(request)
 
       if name
-        if ActiveRecord::Base.motel.tenant?(name)
-          ActiveRecord::Base.motel.current_tenant = name
+        if Motel::Manager.tenant?(name)
+          Motel::Manager.current_tenant = name
           @app.call(env)
         else
-          path = ActiveRecord::Base.motel.nonexistent_tenant_page
+          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
       else
-        ActiveRecord::Base.motel.current_tenant = nil
+        Motel::Manager.current_tenant = nil
         @app.call(env)
       end
     end
@@ -32,8 +32,8 @@ module Motel
     private
 
       def tenant_name(request)
-        if ActiveRecord::Base.motel.admission_criteria
-          regex = Regexp.new(ActiveRecord::Base.motel.admission_criteria)
+        if Motel::Manager.admission_criteria
+          regex = Regexp.new(Motel::Manager.admission_criteria)
           name = request.path.match(regex)
           name[1] if name
         else

data/lib/motel/multi_tenant.rb

@@ -4,16 +4,14 @@ module Motel
 
     included do
 
-      mattr_accessor :motel, instance_writer: false
       self.default_connection_handler = ConnectionAdapters::ConnectionHandler.new
-      self.motel = Manager
 
     end
 
     module ClassMethods
 
       def establish_connection(config)
-        resolver = ConnectionAdapters::ConnectionSpecification::Resolver.new(motel.tenants)
+        resolver = ConnectionAdapters::ConnectionSpecification::Resolver.new(Motel::Manager.tenants)
         spec = resolver.spec(config)
         connection_handler.establish_connection (ENV['TENANT'] || self.name), spec
       end
@@ -39,7 +37,7 @@ module Motel
       end
 
       def current_tenant
-        motel.determines_tenant or raise Motel::NoCurrentTenantError
+        Motel::Manager.determines_tenant or raise Motel::NoCurrentTenantError
       end
 
     end

data/lib/motel/railtie.rb

@@ -39,7 +39,7 @@ module Motel
     end
 
     initializer "motel.configure_middleware" do |app|
-      unless Rails.application.config.motel.disable_middleware
+      if !Rails.application.config.motel.disable_middleware && (Rails.env != 'test')
         app.config.middleware.insert_before ActiveRecord::Migration::CheckPending, Lobby
       end
     end
@@ -49,7 +49,7 @@ module Motel
 
       ActiveSupport.on_load(:active_record) do
         ActionDispatch::Reloader.send(hook) do
-          if ActiveRecord::Base.motel.active_tenants.any?
+          if Motel::Manager.active_tenants.any?
             ActiveRecord::Base.clear_reloadable_connections!
             ActiveRecord::Base.clear_cache!
           end

data/spec/lib/motel/connection_adapters/connection_specification/resolver_spec.rb

@@ -77,7 +77,7 @@ describe Motel::ConnectionAdapters::ConnectionSpecification::Resolver do
       context 'string as a url' do
 
         before(:all) do
-          @url = 'mysql2://foo:foobar_password@localhost:3306/foobar'
+          @url = 'sqlite3://foo:foobar_password@localhost:3306/foobar'
         end
 
         it 'returns an instance of ConnectionSpecification' do
@@ -87,7 +87,7 @@ describe Motel::ConnectionAdapters::ConnectionSpecification::Resolver do
         end
 
         it 'spec of connection specifications contains a correct adapter' do
-          expect(@resolver.spec(@url).config[:adapter]).to eq 'mysql2'
+          expect(@resolver.spec(@url).config[:adapter]).to eq 'sqlite3'
         end
 
         it 'spec of connection specifications contains a correct username' do

data/spec/lib/motel/lobby_spec.rb

@@ -13,13 +13,13 @@ describe Motel::Lobby do
   end
 
   before(:all) do
-    ActiveRecord::Base.motel.add_tenant('foo', FOO_SPEC)
+    Motel::Manager.add_tenant('foo', FOO_SPEC)
   end
 
   after(:all) do
-    ActiveRecord::Base.motel.delete_tenant('foo')
-    ActiveRecord::Base.motel.admission_criteria = nil #sets default
-    ActiveRecord::Base.motel.nonexistent_tenant_page = nil #sets default
+    Motel::Manager.delete_tenant('foo')
+    Motel::Manager.admission_criteria = nil #sets default
+    Motel::Manager.nonexistent_tenant_page = nil #sets default
   end
 
   describe '#call' do
@@ -27,7 +27,7 @@ describe Motel::Lobby do
     context 'default admission criteria' do
 
       before(:all) do
-        ActiveRecord::Base.motel.admission_criteria = nil
+        Motel::Manager.admission_criteria = nil
       end
 
       context 'url match' do
@@ -41,7 +41,7 @@ describe Motel::Lobby do
           it 'sets the current tenant' do
             request @url
 
-            expect(ActiveRecord::Base.motel.current_tenant).to eq 'foo'
+            expect(Motel::Manager.current_tenant).to eq 'foo'
           end
 
           it 'response is ok' do
@@ -67,7 +67,7 @@ describe Motel::Lobby do
           context 'with default nonexistent tenant message' do
 
             it 'returns default message on body' do
-              ActiveRecord::Base.motel.nonexistent_tenant_page = nil
+              Motel::Manager.nonexistent_tenant_page = nil
               request @url
 
               expect(last_response.body).to eq "Nonexistent bar tenant"
@@ -83,7 +83,7 @@ describe Motel::Lobby do
               file.write(message)
               file.close
 
-              ActiveRecord::Base.motel.nonexistent_tenant_page = file.path
+              Motel::Manager.nonexistent_tenant_page = file.path
               request @url
 
               expect(last_response.body).to eq message
@@ -102,7 +102,7 @@ describe Motel::Lobby do
   context 'specifying admission criteria' do
 
     before(:all) do
-      ActiveRecord::Base.motel.admission_criteria = 'tenants\/(\w*)'
+      Motel::Manager.admission_criteria = 'tenants\/(\w*)'
     end
 
     context 'url match' do
@@ -116,7 +116,7 @@ describe Motel::Lobby do
         it 'sets the current tenant' do
           request @url
 
-          expect(ActiveRecord::Base.motel.current_tenant).to eq 'foo'
+          expect(Motel::Manager.current_tenant).to eq 'foo'
         end
 
         it 'response is ok' do
@@ -138,7 +138,7 @@ describe Motel::Lobby do
       it 'sets null the current tenant' do
         request @url
 
-        expect(ActiveRecord::Base.motel.current_tenant).to be_nil
+        expect(Motel::Manager.current_tenant).to be_nil
      end
 
       it 'response is ok' do

data/spec/lib/motel/multi_tenant_spec.rb

@@ -3,21 +3,21 @@ require 'spec_helper'
 describe ActiveRecord::Base do
 
   before(:all) do
-    ActiveRecord::Base.motel.tenants_source_configurations({source: :default})
-    ActiveRecord::Base.motel.add_tenant('foo', FOO_SPEC)
-    ActiveRecord::Base.motel.add_tenant('bar', BAR_SPEC)
+    Motel::Manager.tenants_source_configurations({source: :default})
+    Motel::Manager.add_tenant('foo', FOO_SPEC)
+    Motel::Manager.add_tenant('bar', BAR_SPEC)
   end
 
   after(:all) do
-    ActiveRecord::Base.motel.delete_tenant('foo')
-    ActiveRecord::Base.motel.delete_tenant('bar')
+    Motel::Manager.delete_tenant('foo')
+    Motel::Manager.delete_tenant('bar')
   end
 
   after(:each) do
     ActiveRecord::Base.connection_handler.active_tenants do |tenant|
       ActiveRecord::Base.connection_handler.remove_connection(tenant)
     end
-    ActiveRecord::Base.motel.current_tenant = nil
+    Motel::Manager.current_tenant = nil
   end
 
   describe '.establish_connection' do
@@ -35,7 +35,7 @@ describe ActiveRecord::Base do
     context 'current tenant established' do
 
       it 'returns a connection pool of current tenant' do
-        ActiveRecord::Base.motel.current_tenant = 'foo'
+        Motel::Manager.current_tenant = 'foo'
         pool = ActiveRecord::Base.connection_handler.establish_connection('foo')
 
         expect(ActiveRecord::Base.connection_pool).to eq pool
@@ -46,7 +46,7 @@ describe ActiveRecord::Base do
     context 'current tenant not established' do
 
       it 'rises an error' do
-        ActiveRecord::Base.motel.current_tenant = nil
+        Motel::Manager.current_tenant = nil
         expect{ActiveRecord::Base.connection_pool}.to raise_error Motel::NoCurrentTenantError
       end
 
@@ -59,7 +59,7 @@ describe ActiveRecord::Base do
     context 'current tenant established' do
 
       it 'returns a connection of current tenant' do
-        ActiveRecord::Base.motel.current_tenant = 'foo'
+        Motel::Manager.current_tenant = 'foo'
         pool = ActiveRecord::Base.connection_handler.establish_connection('foo')
 
         expect(ActiveRecord::Base.retrieve_connection).to eq pool.connection
@@ -70,7 +70,7 @@ describe ActiveRecord::Base do
     context 'current tenant not established' do
 
       it 'rises an error' do
-        ActiveRecord::Base.motel.current_tenant = nil
+        Motel::Manager.current_tenant = nil
         expect{ActiveRecord::Base.retrieve_connection}.to raise_error Motel::NoCurrentTenantError
       end
 
@@ -87,12 +87,12 @@ describe ActiveRecord::Base do
     context 'current tenant established' do
 
       it 'returns true' do
-        ActiveRecord::Base.motel.current_tenant = 'foo'
+        Motel::Manager.current_tenant = 'foo'
         expect(ActiveRecord::Base.connected?).to be_true
       end
 
       it 'returns false' do
-        ActiveRecord::Base.motel.current_tenant = 'bar'
+        Motel::Manager.current_tenant = 'bar'
         expect(ActiveRecord::Base.connected?).to be_false
       end
 
@@ -101,7 +101,7 @@ describe ActiveRecord::Base do
     context 'current tenant not established' do
 
       it 'rises an error' do
-        ActiveRecord::Base.motel.current_tenant = nil
+        Motel::Manager.current_tenant = nil
         expect{ActiveRecord::Base.connected?}.to raise_error Motel::NoCurrentTenantError
       end
 
@@ -115,7 +115,7 @@ describe ActiveRecord::Base do
 
       it 'removes connection' do
         ActiveRecord::Base.connection_handler.establish_connection('foo')
-        ActiveRecord::Base.motel.current_tenant = 'foo'
+        Motel::Manager.current_tenant = 'foo'
         ActiveRecord::Base.remove_connection
         expect(ActiveRecord::Base.connection_handler.active_tenants).not_to include('foo')
       end
@@ -125,7 +125,7 @@ describe ActiveRecord::Base do
     context 'current tenant not established' do
 
       it 'rises an error' do
-        ActiveRecord::Base.motel.current_tenant = nil
+        Motel::Manager.current_tenant = nil
         expect{ActiveRecord::Base.remove_connection}.to raise_error Motel::NoCurrentTenantError
       end
 
@@ -146,7 +146,7 @@ describe ActiveRecord::Base do
     context 'tenant enviroment variable or current tenant or default tenant are set' do
 
       it 'returns the current tenant' do
-        ActiveRecord::Base.motel.current_tenant = 'foo'
+        Motel::Manager.current_tenant = 'foo'
 
         expect(ActiveRecord::Base.current_tenant).to eq 'foo'
       end
@@ -156,7 +156,7 @@ describe ActiveRecord::Base do
     context 'no tenant has been established' do
 
       it 'rises an error' do
-        ActiveRecord::Base.motel.current_tenant = nil
+        Motel::Manager.current_tenant = nil
 
         expect{ActiveRecord::Base.current_tenant}.to raise_error Motel::NoCurrentTenantError
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motel-activerecord
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Diego Martínez Valdelamar
@@ -14,64 +14,72 @@ dependencies:
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.0'
-    - - <=
-      - !ruby/object:Gem::Version
-        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.0'
-    - - <=
-      - !ruby/object:Gem::Version
-        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: ActiveRecord extension to use connections to multiple databases
 email: dimarva.90@gmail.com
 executables: []
@@ -79,31 +87,33 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/motel-activerecord.rb
-- lib/motel/version.rb
-- lib/motel/lobby.rb
+- lib/motel/manager.rb
+- lib/motel/sources.rb
+- lib/motel/railtie.rb
+- lib/motel/sources/database.rb
+- lib/motel/sources/default.rb
+- lib/motel/sources/redis.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/connection_adapters/connection_specification/resolver.rb
-- lib/motel/multi_tenant.rb
-- lib/motel/connection_adapters.rb
-- lib/motel/sources.rb
-- lib/motel/sources/redis.rb
-- lib/motel/sources/default.rb
-- lib/motel/sources/database.rb
-- lib/motel/railtie.rb
-- lib/motel/manager.rb
+- lib/motel/lobby.rb
 - VERSION
 - README.md
-- spec/lib/motel/multi_tenant_spec.rb
-- spec/lib/motel/connection_adapters/connection_specification/resolver_spec.rb
-- spec/lib/motel/connection_adapters/connection_handler_spec.rb
-- spec/lib/motel/sources/database_spec.rb
+- spec/tmp/foo.sqlite3
+- spec/tmp/tenants.sqlite3
+- spec/spec_helper.rb
 - spec/lib/motel/sources/default_spec.rb
+- spec/lib/motel/sources/database_spec.rb
 - 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/spec_helper.rb
 homepage: https://github.com/dimarval/motel-activerecord
 licenses:
 - MIT
@@ -114,9 +124,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ~>
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
@@ -129,12 +139,14 @@ signing_key:
 specification_version: 4
 summary: Multi-tenant gem
 test_files:
-- spec/lib/motel/multi_tenant_spec.rb
-- spec/lib/motel/connection_adapters/connection_specification/resolver_spec.rb
-- spec/lib/motel/connection_adapters/connection_handler_spec.rb
-- spec/lib/motel/sources/database_spec.rb
+- spec/tmp/foo.sqlite3
+- spec/tmp/tenants.sqlite3
+- spec/spec_helper.rb
 - spec/lib/motel/sources/default_spec.rb
+- spec/lib/motel/sources/database_spec.rb
 - 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/spec_helper.rb