apartment 1.0.2 → 1.1.0

data/spec/tenant_spec.rb

@@ -60,7 +60,7 @@ describe Apartment::Tenant do
     describe "#adapter" do
       it "should load postgresql adapter" do
         subject.adapter
-        Apartment::Adapters::PostgresqlAdapter.should be_a(Class)
+        expect(Apartment::Adapters::PostgresqlAdapter).to be_a(Class)
       end
 
       it "raises exception with invalid adapter specified" do
@@ -77,9 +77,9 @@ describe Apartment::Tenant do
 
         it 'has a threadsafe adapter' do
           subject.switch!(db1)
-          thread = Thread.new { subject.current.should == Apartment.default_tenant }
+          thread = Thread.new { expect(subject.current).to eq(Apartment.default_tenant) }
           thread.join
-          subject.current.should == db1
+          expect(subject.current).to eq(db1)
         end
       end
     end
@@ -100,7 +100,7 @@ describe Apartment::Tenant do
       describe "#create" do
         it "should seed data" do
           subject.switch! db1
-          User.count.should be > 0
+          expect(User.count).to be > 0
         end
       end
 
@@ -121,10 +121,10 @@ describe Apartment::Tenant do
             db_count = User.count + x.times{ User.create }
 
             subject.switch! db2
-            User.count.should == db2_count
+            expect(User.count).to eq(db2_count)
 
             subject.switch! db1
-            User.count.should == db_count
+            expect(User.count).to eq(db_count)
           end
         end
 
@@ -143,9 +143,9 @@ describe Apartment::Tenant do
 
             subject.switch! db1
             x.times{ Company.create }
-            Company.count.should == count + x
+            expect(Company.count).to eq(count + x)
             subject.reset
-            Company.count.should == count + x
+            expect(Company.count).to eq(count + x)
           end
         end
       end
@@ -165,8 +165,8 @@ describe Apartment::Tenant do
       it 'should seed from default path' do
         subject.create db1
         subject.switch! db1
-        User.count.should eq(3)
-        User.first.name.should eq('Some User 0')
+        expect(User.count).to eq(3)
+        expect(User.first.name).to eq('Some User 0')
       end
 
       it 'should seed from custom path' do
@@ -175,8 +175,8 @@ describe Apartment::Tenant do
         end
         subject.create db1
         subject.switch! db1
-        User.count.should eq(6)
-        User.first.name.should eq('Different User 0')
+        expect(User.count).to eq(6)
+        expect(User.first.name).to eq('Different User 0')
       end
     end
   end

data/spec/unit/config_spec.rb

@@ -7,10 +7,16 @@ describe Apartment do
     let(:excluded_models){ ["Company"] }
     let(:seed_data_file_path){ "#{Rails.root}/db/seeds/import.rb" }
 
+    def tenant_names_from_array(names)
+      names.each_with_object({}) do |tenant, hash|
+        hash[tenant] = Apartment.connection_config
+      end.with_indifferent_access
+    end
+
     it "should yield the Apartment object" do
       Apartment.configure do |config|
         config.excluded_models = []
-        config.should == Apartment
+        expect(config).to eq(Apartment)
       end
     end
 
@@ -18,7 +24,7 @@ describe Apartment do
       Apartment.configure do |config|
         config.excluded_models = excluded_models
       end
-      Apartment.excluded_models.should == excluded_models
+      expect(Apartment.excluded_models).to eq(excluded_models)
     end
 
     it "should set use_schemas" do
@@ -26,14 +32,14 @@ describe Apartment do
         config.excluded_models = []
         config.use_schemas = false
       end
-      Apartment.use_schemas.should be false
+      expect(Apartment.use_schemas).to be false
     end
 
     it "should set seed_data_file" do
       Apartment.configure do |config|
         config.seed_data_file = seed_data_file_path
       end
-      Apartment.seed_data_file.should eq(seed_data_file_path)
+      expect(Apartment.seed_data_file).to eq(seed_data_file_path)
     end
 
     it "should set seed_after_create" do
@@ -41,47 +47,71 @@ describe Apartment do
         config.excluded_models = []
         config.seed_after_create = true
       end
-      Apartment.seed_after_create.should be true
+      expect(Apartment.seed_after_create).to be true
     end
 
     it "should set tld_length" do
       Apartment.configure do |config|
         config.tld_length = 2
       end
-      Apartment.tld_length.should == 2
+      expect(Apartment.tld_length).to eq(2)
     end
 
     context "databases" do
-      it "should return object if it doesnt respond_to call" do
-        tenant_names = ['users', 'companies']
+      let(:users_conf_hash) { { port: 5444 } }
 
+      before do
         Apartment.configure do |config|
-          config.excluded_models = []
           config.tenant_names = tenant_names
         end
-        Apartment.tenant_names.should == tenant_names
       end
 
-      it "should invoke the proc if appropriate" do
-        tenant_names = lambda{ ['users', 'users'] }
-        tenant_names.should_receive(:call)
+      context "tenant_names as string array" do
+        let(:tenant_names) { ['users', 'companies'] }
 
-        Apartment.configure do |config|
-          config.excluded_models = []
-          config.tenant_names = tenant_names
+        it "should return object if it doesnt respond_to call" do
+          expect(Apartment.tenant_names).to eq(tenant_names_from_array(tenant_names).keys)
+        end
+
+        it "should set tenants_with_config" do
+          expect(Apartment.tenants_with_config).to eq(tenant_names_from_array(tenant_names))
         end
-        Apartment.tenant_names
       end
 
-      it "should return the invoked proc if appropriate" do
-        dbs = lambda{ Company.all }
+      context "tenant_names as proc returning an array" do
+        let(:tenant_names) { lambda { ['users', 'companies'] } }
 
-        Apartment.configure do |config|
-          config.excluded_models = []
-          config.tenant_names = dbs
+        it "should return object if it doesnt respond_to call" do
+          expect(Apartment.tenant_names).to eq(tenant_names_from_array(tenant_names.call).keys)
+        end
+
+        it "should set tenants_with_config" do
+          expect(Apartment.tenants_with_config).to eq(tenant_names_from_array(tenant_names.call))
+        end
+      end
+
+      context "tenant_names as Hash" do
+        let(:tenant_names) { { users: users_conf_hash }.with_indifferent_access }
+
+        it "should return object if it doesnt respond_to call" do
+          expect(Apartment.tenant_names).to eq(tenant_names.keys)
+        end
+
+        it "should set tenants_with_config" do
+          expect(Apartment.tenants_with_config).to eq(tenant_names)
         end
+      end
+
+      context "tenant_names as proc returning a Hash" do
+        let(:tenant_names) { lambda { { users: users_conf_hash }.with_indifferent_access } }
 
-        Apartment.tenant_names.should == Company.all
+        it "should return object if it doesnt respond_to call" do
+          expect(Apartment.tenant_names).to eq(tenant_names.call.keys)
+        end
+
+        it "should set tenants_with_config" do
+          expect(Apartment.tenants_with_config).to eq(tenant_names.call)
+        end
       end
     end
 

data/spec/unit/elevators/domain_spec.rb

@@ -8,23 +8,23 @@ describe Apartment::Elevators::Domain do
   describe "#parse_tenant_name" do
     it "parses the host for a domain name" do
       request = ActionDispatch::Request.new('HTTP_HOST' => 'example.com')
-      elevator.parse_tenant_name(request).should == 'example'
+      expect(elevator.parse_tenant_name(request)).to eq('example')
     end
 
     it "ignores a www prefix and domain suffix" do
       request = ActionDispatch::Request.new('HTTP_HOST' => 'www.example.bc.ca')
-      elevator.parse_tenant_name(request).should == 'example'
+      expect(elevator.parse_tenant_name(request)).to eq('example')
     end
 
     it "returns nil if there is no host" do
       request = ActionDispatch::Request.new('HTTP_HOST' => '')
-      elevator.parse_tenant_name(request).should be_nil
+      expect(elevator.parse_tenant_name(request)).to be_nil
     end
   end
 
   describe "#call" do
     it "switches to the proper tenant" do
-      Apartment::Tenant.should_receive(:switch!).with('example')
+      expect(Apartment::Tenant).to receive(:switch).with('example')
 
       elevator.call('HTTP_HOST' => 'www.example.com')
     end

data/spec/unit/elevators/first_subdomain_spec.rb

@@ -8,12 +8,17 @@ describe Apartment::Elevators::FirstSubdomain do
 
     context "one subdomain" do
       let(:subdomain) { "test" }
-      it { should == "test" }
+      it { is_expected.to eq("test") }
     end
 
     context "nested subdomains" do
       let(:subdomain) { "test1.test2" }
-      it { should == "test1" }
+      it { is_expected.to eq("test1") }
+    end
+    
+    context "no subdomain" do
+      let(:subdomain) { nil }
+      it { is_expected.to eq(nil) }
     end
   end
 end

data/spec/unit/elevators/generic_spec.rb

@@ -15,7 +15,7 @@ describe Apartment::Elevators::Generic do
     it "calls the processor if given" do
       elevator = described_class.new(Proc.new{}, Proc.new{'tenant1'})
 
-      Apartment::Tenant.should_receive(:switch!).with('tenant1')
+      expect(Apartment::Tenant).to receive(:switch).with('tenant1')
 
       elevator.call('HTTP_HOST' => 'foo.bar.com')
     end
@@ -29,7 +29,24 @@ describe Apartment::Elevators::Generic do
     it "switches to the parsed db_name" do
       elevator = MyElevator.new(Proc.new{})
 
-      Apartment::Tenant.should_receive(:switch!).with('tenant2')
+      expect(Apartment::Tenant).to receive(:switch).with('tenant2')
+
+      elevator.call('HTTP_HOST' => 'foo.bar.com')
+    end
+
+    it "calls the block implementation of `switch`" do
+      elevator = MyElevator.new(Proc.new{}, Proc.new{'tenant2'})
+
+      expect(Apartment::Tenant).to receive(:switch).with('tenant2').and_yield
+      elevator.call('HTTP_HOST' => 'foo.bar.com')
+    end
+
+    it "does not call `switch` if no database given" do
+      app = Proc.new{}
+      elevator = MyElevator.new(app, Proc.new{})
+
+      expect(Apartment::Tenant).not_to receive(:switch)
+      expect(app).to receive :call
 
       elevator.call('HTTP_HOST' => 'foo.bar.com')
     end

data/spec/unit/elevators/host_hash_spec.rb

@@ -8,7 +8,7 @@ describe Apartment::Elevators::HostHash do
   describe "#parse_tenant_name" do
     it "parses the host for a domain name" do
       request = ActionDispatch::Request.new('HTTP_HOST' => 'example.com')
-      elevator.parse_tenant_name(request).should == 'example_tenant'
+      expect(elevator.parse_tenant_name(request)).to eq('example_tenant')
     end
 
     it "raises TenantNotFound exception if there is no host" do
@@ -24,7 +24,7 @@ describe Apartment::Elevators::HostHash do
 
   describe "#call" do
     it "switches to the proper tenant" do
-      Apartment::Tenant.should_receive(:switch!).with('example_tenant')
+      expect(Apartment::Tenant).to receive(:switch).with('example_tenant')
 
       elevator.call('HTTP_HOST' => 'example.com')
     end

data/spec/unit/elevators/subdomain_spec.rb

@@ -9,12 +9,12 @@ describe Apartment::Elevators::Subdomain do
     context "assuming tld_length of 1" do
       it "should parse subdomain" do
         request = ActionDispatch::Request.new('HTTP_HOST' => 'foo.bar.com')
-        elevator.parse_tenant_name(request).should == 'foo'
+        expect(elevator.parse_tenant_name(request)).to eq('foo')
       end
 
       it "should return nil when no subdomain" do
         request = ActionDispatch::Request.new('HTTP_HOST' => 'bar.com')
-        elevator.parse_tenant_name(request).should be_nil
+        expect(elevator.parse_tenant_name(request)).to be_nil
       end
     end
 
@@ -27,26 +27,26 @@ describe Apartment::Elevators::Subdomain do
 
       it "should parse subdomain in the third level domain" do
         request = ActionDispatch::Request.new('HTTP_HOST' => 'foo.bar.co.uk')
-        elevator.parse_tenant_name(request).should == "foo"
+        expect(elevator.parse_tenant_name(request)).to eq("foo")
       end
 
       it "should return nil when no subdomain in the third level domain" do
         request = ActionDispatch::Request.new('HTTP_HOST' => 'bar.co.uk')
-        elevator.parse_tenant_name(request).should be_nil
+        expect(elevator.parse_tenant_name(request)).to be_nil
       end
     end
   end
 
   describe "#call" do
     it "switches to the proper tenant" do
-      Apartment::Tenant.should_receive(:switch!).with('tenant1')
+      expect(Apartment::Tenant).to receive(:switch).with('tenant1')
       elevator.call('HTTP_HOST' => 'tenant1.example.com')
     end
 
     it "ignores excluded subdomains" do
       described_class.excluded_subdomains = %w{foo}
 
-      Apartment::Tenant.should_not_receive(:switch!)
+      expect(Apartment::Tenant).not_to receive(:switch)
 
       elevator.call('HTTP_HOST' => 'foo.bar.com')
 

data/spec/unit/migrator_spec.rb

@@ -6,7 +6,7 @@ describe Apartment::Migrator do
   let(:tenant){ Apartment::Test.next_db }
 
   # Don't need a real switch here, just testing behaviour
-  before { Apartment::Tenant.adapter.stub(:connect_to_new) }
+  before { allow(Apartment::Tenant.adapter).to receive(:connect_to_new) }
 
   describe "::migrate" do
     it "switches and migrates" do

data/spec/unit/reloader_spec.rb

@@ -16,9 +16,9 @@ describe Apartment::Reloader do
     subject{ Apartment::Reloader.new(double("Rack::Application", :call => nil)) }
 
     it "should initialize apartment when called" do
-      Company.table_name.should_not include('public.')
+      expect(Company.table_name).not_to include('public.')
       subject.call(double('env'))
-      Company.table_name.should include('public.')
+      expect(Company.table_name).to include('public.')
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apartment
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Ryan Brunner
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-02 00:00:00.000000000 Z
+date: 2016-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -74,33 +74,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
-  name: guard-rspec
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -282,6 +282,7 @@ files:
 - spec/dummy_engine/test/dummy/config/routes.rb
 - spec/dummy_engine/test/dummy/config/secrets.yml
 - spec/examples/connection_adapter_examples.rb
+- spec/examples/generic_adapter_custom_configuration_example.rb
 - spec/examples/generic_adapter_examples.rb
 - spec/examples/schema_adapter_examples.rb
 - spec/integration/apartment_rake_integration_spec.rb
@@ -340,7 +341,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A Ruby gem for managing database multitenancy
@@ -417,6 +418,7 @@ test_files:
 - spec/dummy_engine/test/dummy/config/routes.rb
 - spec/dummy_engine/test/dummy/config/secrets.yml
 - spec/examples/connection_adapter_examples.rb
+- spec/examples/generic_adapter_custom_configuration_example.rb
 - spec/examples/generic_adapter_examples.rb
 - spec/examples/schema_adapter_examples.rb
 - spec/integration/apartment_rake_integration_spec.rb