motel-activerecord 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e6d9032d0282402d7614ce54ba275eece042195
-  data.tar.gz: 69029443e84cbcbbfc29807f0d33ff3467412a80
+  metadata.gz: 9fbaa9ba220f8c8e43153d3a33126775ab84dd2d
+  data.tar.gz: 66c6308ddd2a4af6c95017774751f5f0a9da1bed
 SHA512:
-  metadata.gz: 43978db6dc9237717afce5e7352162237227527542efacd971ef4063e91de2e99b4283728776944ee27f0fdff3f69574124b18f5a6a740abec519d5879d94459
-  data.tar.gz: e524af21dd5090ea2921eee78481ae22eee9dc5336406f21df7c580fcee322b7d2a0f24f32eb6a389c69c6b76eeaf0d525e0fb047866146089bb6d73b035379b
+  metadata.gz: 4a3e16176b7af293e9ed37ca96bf9cecab919be0860b3ed8ae8ec4bff643ea8346aeb1a3d34a4c9ea7f3bfe6a3539f7ddc02f4395e23f6804269bd886a93391d
+  data.tar.gz: a5fbe186c1197d2d5cd9ef0be38abaa96cfbe785a2168f4651b733c752022c9ff745164976d2148b5db18c0934b37d690c4c520494215eb589dc449ae800fee0

data/VERSION

@@ -1 +1 @@
-2.0.1
+2.0.2

data/lib/motel/multi_tenant.rb

@@ -11,9 +11,11 @@ module Motel
     module ClassMethods
 
       def establish_connection(config)
-        resolver = ConnectionAdapters::ConnectionSpecification::Resolver.new(Motel::Manager.tenants)
-        spec = resolver.spec(config)
-        connection_handler.establish_connection (ENV['TENANT'] || self.name), spec
+        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

data/spec/lib/motel/connection_adapters/connection_handler_spec.rb

@@ -53,7 +53,7 @@ describe Motel::ConnectionAdapters::ConnectionHandler do
     context 'existing tenant' do
 
       it 'initializes and returns a connection' do
-        expect(@handler.retrieve_connection('foo')).to be_true
+        expect(@handler.retrieve_connection('foo')).to be_truthy
       end
 
       it 'returns a connection' do
@@ -80,7 +80,7 @@ describe Motel::ConnectionAdapters::ConnectionHandler do
     context 'existing tenant' do
 
       it 'initializes and returns a connection pool' do
-        expect(@handler.retrieve_connection_pool('foo')).to be_true
+        expect(@handler.retrieve_connection_pool('foo')).to be_truthy
       end
 
       it 'returns a connection pool' do
@@ -106,11 +106,11 @@ describe Motel::ConnectionAdapters::ConnectionHandler do
 
     it 'returns true' do
       @handler.retrieve_connection('foo')
-      expect(@handler.connected?('foo')).to be_true
+      expect(@handler.connected?('foo')).to be_truthy
     end
 
     it 'returns false' do
-      expect(@handler.connected?('foo')).to be_false
+      expect(@handler.connected?('foo')).to be_falsey
     end
 
   end
@@ -118,12 +118,12 @@ describe Motel::ConnectionAdapters::ConnectionHandler do
   describe '#active_connections?' do
 
     it 'has not active connections' do
-      expect(@handler.active_connections?).to be_false
+      expect(@handler.active_connections?).to be_falsey
     end
 
     it 'has active connections' do
       @handler.retrieve_connection('foo')
-      expect(@handler.active_connections?).to be_true
+      expect(@handler.active_connections?).to be_truthy
     end
 
   end
@@ -132,10 +132,10 @@ describe Motel::ConnectionAdapters::ConnectionHandler do
 
     it 'removes the connection' do
       @handler.retrieve_connection('foo')
-      expect(@handler.active_connections?).to be_true
+      expect(@handler.active_connections?).to be_truthy
 
       @handler.remove_connection('foo')
-      expect(@handler.active_connections?).to be_false
+      expect(@handler.active_connections?).to be_falsey
     end
 
   end

data/spec/lib/motel/manager_spec.rb

@@ -96,11 +96,11 @@ describe Motel::Manager do
   describe '#tenants' do
 
     it 'returns tenant foo' do
-      expect(@manager.tenants.key?('foo')).to be_true
+      expect(@manager.tenants.key?('foo')).to be_truthy
     end
 
     it 'returns tenant bar' do
-      expect(@manager.tenants.key?('bar')).to be_true
+      expect(@manager.tenants.key?('bar')).to be_truthy
     end
 
   end
@@ -117,7 +117,7 @@ describe Motel::Manager do
   describe '#tenant?' do
 
     it 'returns true if tenant foo does exist' do
-      expect(@manager.tenant?('foo')).to be_true
+      expect(@manager.tenant?('foo')).to be_truthy
     end
 
     it 'returns true if tenant baz does exist' do
@@ -125,11 +125,11 @@ describe Motel::Manager do
       spec = resolver.spec(BAZ_SPEC)
       handler = ActiveRecord::Base.connection_handler
       handler.establish_connection('baz', spec)
-      expect(@manager.tenant?('baz')).to be_true
+      expect(@manager.tenant?('baz')).to be_truthy
     end
 
     it 'returns false if tenant does not exist' do
-      expect(@manager.tenant?('foobar')).to be_false
+      expect(@manager.tenant?('foobar')).to be_falsey
     end
 
   end
@@ -139,7 +139,7 @@ describe Motel::Manager do
     it 'adds new tenant' do
       @manager.add_tenant('baz', BAZ_SPEC)
 
-      expect(@tenants_source.tenant?('baz')).to be_true
+      expect(@tenants_source.tenant?('baz')).to be_truthy
     end
 
   end
@@ -166,12 +166,12 @@ describe Motel::Manager do
   describe '#delete_tenant' do
 
     it 'returns true' do
-      expect(@manager.delete_tenant('foo')).to be_true
+      expect(@manager.delete_tenant('foo')).to be_truthy
     end
 
     it 'deletes tenant' do
       @manager.delete_tenant('foo')
-      expect(@tenants_source.tenant?('foo')).to be_false
+      expect(@tenants_source.tenant?('foo')).to be_falsey
     end
 
     it 'removes connection of tenant' do

data/spec/lib/motel/multi_tenant_spec.rb

@@ -22,10 +22,28 @@ describe ActiveRecord::Base do
 
   describe '.establish_connection' do
 
-    it 'establishes a connection keyed  by the class name' do
-      ActiveRecord::Base.establish_connection(BAZ_SPEC)
+    context 'setting the current tenant name' do
+
+      before(:each) do
+        Motel::Manager.current_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
+
+    end
+
+    context 'without setting the current tenant name' do
+
+      it 'establishes a connection keyed by class name' do
+        ActiveRecord::Base.establish_connection(BAZ_SPEC)
+
+        expect(ActiveRecord::Base.connection_handler.active_tenants).to include('ActiveRecord::Base')
+      end
 
-      expect(ActiveRecord::Base.connection_handler.active_tenants).to include('ActiveRecord::Base')
     end
 
   end
@@ -88,12 +106,12 @@ describe ActiveRecord::Base do
 
       it 'returns true' do
         Motel::Manager.current_tenant = 'foo'
-        expect(ActiveRecord::Base.connected?).to be_true
+        expect(ActiveRecord::Base.connected?).to be_truthy
       end
 
       it 'returns false' do
         Motel::Manager.current_tenant = 'bar'
-        expect(ActiveRecord::Base.connected?).to be_false
+        expect(ActiveRecord::Base.connected?).to be_falsey
       end
 
     end

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

@@ -72,7 +72,7 @@ describe Motel::Sources::Database do
     end
 
     it 'exist foo key' do
-      expect(@tenants_source.tenants.key?('foo')).to be_true
+      expect(@tenants_source.tenants.key?('foo')).to be_truthy
     end
 
     it 'tenant foo has a correct spec' do
@@ -81,7 +81,7 @@ describe Motel::Sources::Database do
     end
 
     it 'exist bar key' do
-      expect(@tenants_source.tenants.key?('bar')).to be_true
+      expect(@tenants_source.tenants.key?('bar')).to be_truthy
     end
 
     it 'tenant bar has a correct spec' do
@@ -115,11 +115,11 @@ describe Motel::Sources::Database do
   describe '#tenant?' do
 
     it 'returns true if tenant does exist' do
-      expect(@tenants_source.tenant?('foo')).to be_true
+      expect(@tenants_source.tenant?('foo')).to be_truthy
     end
 
     it 'returns false if tenant does not exist' do
-      expect(@tenants_source.tenant?('baz')).to be_false
+      expect(@tenants_source.tenant?('baz')).to be_falsey
     end
 
   end

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

@@ -11,7 +11,7 @@ describe Motel::Sources::Default do
   describe '#tenants' do
 
     it 'exist foo key' do
-      expect(@tenants_source.tenants.key?('foo')).to be_true
+      expect(@tenants_source.tenants.key?('foo')).to be_truthy
     end
 
     it 'tenant foo has a correct spec' do
@@ -20,7 +20,7 @@ describe Motel::Sources::Default do
     end
 
     it 'exist bar key' do
-      expect(@tenants_source.tenants.key?('bar')).to be_true
+      expect(@tenants_source.tenants.key?('bar')).to be_truthy
     end
 
     it 'tenant bar has a correct spec' do
@@ -54,11 +54,11 @@ describe Motel::Sources::Default do
   describe '#tenant?' do
 
     it 'returns true if tenant does exist' do
-      expect(@tenants_source.tenant?('foo')).to be_true
+      expect(@tenants_source.tenant?('foo')).to be_truthy
     end
 
     it 'returns false if tenant does not exist' do
-      expect(@tenants_source.tenant?('baz')).to be_false
+      expect(@tenants_source.tenant?('baz')).to be_falsey
     end
 
   end
@@ -84,7 +84,7 @@ describe Motel::Sources::Default do
             'baz', {'adapter' => BAZ_SPEC['adapter'], 'database' => BAZ_SPEC['database']}
           )
 
-          expect(@tenants_source.tenants.key?('baz')).to be_true
+          expect(@tenants_source.tenants.key?('baz')).to be_truthy
           expect(@tenants_source.tenants['baz']['adapter']).to eq BAZ_SPEC['adapter']
           expect(@tenants_source.tenants['baz']['database']).to eq BAZ_SPEC['database']
         end
@@ -98,7 +98,7 @@ describe Motel::Sources::Default do
             'baz', {adapter: BAZ_SPEC['adapter'], database: BAZ_SPEC['database']}
           )
 
-          expect(@tenants_source.tenants.key?('baz')).to be_true
+          expect(@tenants_source.tenants.key?('baz')).to be_truthy
           expect(@tenants_source.tenants['baz']['adapter']).to eq BAZ_SPEC['adapter']
           expect(@tenants_source.tenants['baz']['database']).to eq BAZ_SPEC['database']
         end
@@ -158,7 +158,7 @@ describe Motel::Sources::Default do
     it 'remove tenant from ActiveRecord::Base.configurations' do
       @tenants_source.delete_tenant('foo')
 
-      expect(@tenants_source.tenants.key?('foo')).to be_false
+      expect(@tenants_source.tenants.key?('foo')).to be_falsey
     end
 
   end

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

@@ -33,7 +33,7 @@ describe Motel::Sources::Redis do
     end
 
     it 'exist foo key' do
-      expect(@tenants_source.tenants.key?('foo')).to be_true
+      expect(@tenants_source.tenants.key?('foo')).to be_truthy
     end
 
     it 'tenant foo has a correct spec' do
@@ -42,7 +42,7 @@ describe Motel::Sources::Redis do
     end
 
     it 'exist bar key' do
-      expect(@tenants_source.tenants.key?('bar')).to be_true
+      expect(@tenants_source.tenants.key?('bar')).to be_truthy
     end
 
     it 'tenant bar has a correct spec' do
@@ -76,11 +76,11 @@ describe Motel::Sources::Redis do
   describe '#tenant?' do
 
     it 'returns true if tenant does exist' do
-      expect(@tenants_source.tenant?('foo')).to be_true
+      expect(@tenants_source.tenant?('foo')).to be_truthy
     end
 
     it 'returns false if tenant does not exist' do
-      expect(@tenants_source.tenant?('baz')).to be_false
+      expect(@tenants_source.tenant?('baz')).to be_falsey
     end
 
   end
@@ -178,8 +178,8 @@ describe Motel::Sources::Redis do
     it 'remove tenant from redis server' do
       @tenants_source.delete_tenant('foo')
 
-      expect(@redis_server.hexists("#{@prefix_tenant_alias}foo", 'adapter')).to be_false
-      expect(@redis_server.hexists("#{@prefix_tenant_alias}foo", 'database')).to be_false
+      expect(@redis_server.hexists("#{@prefix_tenant_alias}foo", 'adapter')).to be_falsey
+      expect(@redis_server.hexists("#{@prefix_tenant_alias}foo", 'database')).to be_falsey
     end
 
   end

data/spec/spec_helper.rb

@@ -9,6 +9,6 @@ BAR_SPEC = {'adapter' => 'sqlite3', 'database' => "#{TEMP_DIR}/bar.sqlite3"}
 BAZ_SPEC = {'adapter' => 'sqlite3', 'database' => "#{TEMP_DIR}/baz.sqlite3"}
 
 RSpec.configure do |config|
-  config.color_enabled = true
+  config.color = true
 end
 

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: motel-activerecord
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Diego Martínez Valdelamar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-21 00:00:00.000000000 Z
+date: 2014-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         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
@@ -86,34 +86,34 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- README.md
+- VERSION
 - lib/motel-activerecord.rb
+- lib/motel/connection_adapters.rb
+- lib/motel/connection_adapters/connection_handler.rb
+- lib/motel/connection_adapters/connection_specification.rb
+- lib/motel/connection_adapters/connection_specification/resolver.rb
+- lib/motel/errors.rb
+- lib/motel/lobby.rb
 - lib/motel/manager.rb
-- lib/motel/sources.rb
+- lib/motel/multi_tenant.rb
 - lib/motel/railtie.rb
+- lib/motel/sources.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/lobby.rb
-- VERSION
-- README.md
-- 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/connection_adapters/connection_specification/resolver_spec.rb
 - spec/lib/motel/lobby_spec.rb
 - spec/lib/motel/manager_spec.rb
+- spec/lib/motel/multi_tenant_spec.rb
+- spec/lib/motel/sources/database_spec.rb
+- spec/lib/motel/sources/default_spec.rb
+- spec/lib/motel/sources/redis_spec.rb
+- spec/spec_helper.rb
+- spec/tmp/foo.sqlite3
+- spec/tmp/tenants.sqlite3
 homepage: https://github.com/dimarval/motel-activerecord
 licenses:
 - MIT
@@ -124,17 +124,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ~>
+  - - "~>"
     - !ruby/object:Gem::Version
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Multi-tenant gem
@@ -142,12 +142,11 @@ test_files:
 - spec/tmp/foo.sqlite3
 - spec/tmp/tenants.sqlite3
 - spec/spec_helper.rb
+- spec/lib/motel/manager_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/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
-has_rdoc: 
+- spec/lib/motel/multi_tenant_spec.rb