apartment 0.23.2 → 0.24.0

data/spec/adapters/jdbc_mysql_adapter_spec.rb

@@ -7,15 +7,13 @@ if defined?(JRUBY_VERSION)
 
     subject { Apartment::Database.jdbc_mysql_adapter config.symbolize_keys }
 
-    def database_names
+    def tenant_names
       ActiveRecord::Base.connection.execute("SELECT schema_name FROM information_schema.schemata").collect { |row| row['schema_name'] }
     end
 
-    let(:default_database) { subject.process { ActiveRecord::Base.connection.current_database } }
+    let(:default_tenant) { subject.process { ActiveRecord::Base.connection.current_database } }
 
     it_should_behave_like "a generic apartment adapter"
     it_should_behave_like "a connection based apartment adapter"
-
   end
-
 end

data/spec/adapters/jdbc_postgresql_adapter_spec.rb

@@ -11,12 +11,12 @@ if defined?(JRUBY_VERSION)
 
       before { Apartment.use_schemas = true }
 
-      # Not sure why, but somehow using let(:database_names) memoizes for the whole example group, not just each test
-      def database_names
+      # Not sure why, but somehow using let(:tenant_names) memoizes for the whole example group, not just each test
+      def tenant_names
         ActiveRecord::Base.connection.execute("SELECT nspname FROM pg_namespace;").collect { |row| row['nspname'] }
       end
 
-      let(:default_database) { subject.process { ActiveRecord::Base.connection.schema_search_path.gsub('"', '') } }
+      let(:default_tenant) { subject.process { ActiveRecord::Base.connection.schema_search_path.gsub('"', '') } }
 
       it_should_behave_like "a generic apartment adapter"
       it_should_behave_like "a schema based apartment adapter"
@@ -26,12 +26,12 @@ if defined?(JRUBY_VERSION)
 
       before { Apartment.use_schemas = false }
 
-      # Not sure why, but somehow using let(:database_names) memoizes for the whole example group, not just each test
-      def database_names
+      # Not sure why, but somehow using let(:tenant_names) memoizes for the whole example group, not just each test
+      def tenant_names
         connection.execute("select datname from pg_database;").collect { |row| row['datname'] }
       end
 
-      let(:default_database) { subject.process { ActiveRecord::Base.connection.current_database } }
+      let(:default_tenant) { subject.process { ActiveRecord::Base.connection.current_database } }
 
       it_should_behave_like "a generic apartment adapter"
       it_should_behave_like "a connection based apartment adapter"

data/spec/adapters/mysql2_adapter_spec.rb

@@ -6,19 +6,19 @@ describe Apartment::Adapters::Mysql2Adapter, database: :mysql do
 
     subject(:adapter){ Apartment::Database.mysql2_adapter config }
 
-    def database_names
+    def tenant_names
       ActiveRecord::Base.connection.execute("SELECT schema_name FROM information_schema.schemata").collect { |row| row[0] }
     end
 
-    let(:default_database) { subject.process { ActiveRecord::Base.connection.current_database } }
+    let(:default_tenant) { subject.process { ActiveRecord::Base.connection.current_database } }
 
     context "using - the equivalent of - schemas" do
       before { Apartment.use_schemas = true }
 
       it_should_behave_like "a generic apartment adapter"
 
-      describe "#default_database" do
-        its(:default_database){ should == config[:database] }
+      describe "#default_tenant" do
+        its(:default_tenant){ should == config[:database] }
       end
 
       describe "#init" do
@@ -33,7 +33,7 @@ describe Apartment::Adapters::Mysql2Adapter, database: :mysql do
         it "should process model exclusions" do
           Apartment::Database.init
 
-          Company.table_name.should == "#{default_database}.companies"
+          Company.table_name.should == "#{default_tenant}.companies"
         end
       end
     end

data/spec/adapters/postgresql_adapter_spec.rb

@@ -10,12 +10,12 @@ describe Apartment::Adapters::PostgresqlAdapter, database: :postgresql do
 
       before{ Apartment.use_schemas = true }
 
-      # Not sure why, but somehow using let(:database_names) memoizes for the whole example group, not just each test
-      def database_names
+      # Not sure why, but somehow using let(:tenant_names) memoizes for the whole example group, not just each test
+      def tenant_names
         ActiveRecord::Base.connection.execute("SELECT nspname FROM pg_namespace;").collect { |row| row['nspname'] }
       end
 
-      let(:default_database) { subject.process { ActiveRecord::Base.connection.schema_search_path.gsub('"', '') } }
+      let(:default_tenant) { subject.process { ActiveRecord::Base.connection.schema_search_path.gsub('"', '') } }
 
       it_should_behave_like "a generic apartment adapter"
       it_should_behave_like "a schema based apartment adapter"
@@ -25,12 +25,12 @@ describe Apartment::Adapters::PostgresqlAdapter, database: :postgresql do
 
       before{ Apartment.use_schemas = false }
 
-      # Not sure why, but somehow using let(:database_names) memoizes for the whole example group, not just each test
-      def database_names
+      # Not sure why, but somehow using let(:tenant_names) memoizes for the whole example group, not just each test
+      def tenant_names
         connection.execute("select datname from pg_database;").collect { |row| row['datname'] }
       end
 
-      let(:default_database) { subject.process { ActiveRecord::Base.connection.current_database } }
+      let(:default_tenant) { subject.process { ActiveRecord::Base.connection.current_database } }
 
       it_should_behave_like "a generic apartment adapter"
       it_should_behave_like "a connection based apartment adapter"

data/spec/adapters/sqlite3_adapter_spec.rb

@@ -7,12 +7,12 @@ describe Apartment::Adapters::Sqlite3Adapter, database: :sqlite do
     subject{ Apartment::Database.sqlite3_adapter config }
 
     context "using connections" do
-      def database_names
+      def tenant_names
         db_dir = File.expand_path("../../dummy/db", __FILE__)
         Dir.glob("#{db_dir}/*.sqlite3").map { |file| File.basename(file, '.sqlite3') }
       end
 
-      let(:default_database) do
+      let(:default_tenant) do
         subject.process { File.basename(Apartment::Test.config['connections']['sqlite']['database'], '.sqlite3') }
       end
 

data/spec/database_spec.rb

@@ -87,9 +87,9 @@ describe Apartment::Database do
 
         it 'has a threadsafe adapter' do
           subject.switch(db1)
-          thread = Thread.new { subject.current_database.should == Apartment.default_schema }
+          thread = Thread.new { subject.current_tenant.should == Apartment.default_schema }
           thread.join
-          subject.current_database.should == db1
+          subject.current_tenant.should == db1
         end
       end
     end

data/spec/dummy/config/initializers/apartment.rb

@@ -1,4 +1,4 @@
 Apartment.configure do |config|
   config.excluded_models = ["Company"]
-  config.database_names = lambda{ Company.pluck(:database) }
-end
+  config.tenant_names = lambda{ Company.pluck(:database) }
+end

data/spec/examples/connection_adapter_examples.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 shared_examples_for "a connection based apartment adapter" do
   include Apartment::Spec::AdapterRequirements
 
-  let(:default_database){ subject.process{ ActiveRecord::Base.connection.current_database } }
+  let(:default_tenant){ subject.process{ ActiveRecord::Base.connection.current_database } }
 
   describe "#init" do
     it "should process model exclusions" do
@@ -31,4 +31,4 @@ shared_examples_for "a connection based apartment adapter" do
       }.to raise_error(Apartment::DatabaseNotFound)
     end
   end
-end
+end

data/spec/examples/generic_adapter_examples.rb

@@ -14,8 +14,8 @@ shared_examples_for "a generic apartment adapter" do
   describe "#create" do
 
     it "should create the new databases" do
-      database_names.should include(db1)
-      database_names.should include(db2)
+      tenant_names.should include(db1)
+      tenant_names.should include(db2)
     end
 
     it "should load schema.rb to new schema" do
@@ -31,11 +31,11 @@ shared_examples_for "a generic apartment adapter" do
 
       subject.create(db2) do
         @count = User.count
-        subject.current_database.should == db2
+        subject.current_tenant.should == db2
         User.create
       end
 
-      subject.current_database.should_not == db2
+      subject.current_tenant.should_not == db2
 
       subject.process(db2){ User.count.should == @count + 1 }
     end
@@ -44,25 +44,25 @@ shared_examples_for "a generic apartment adapter" do
   describe "#drop" do
     it "should remove the db" do
       subject.drop db1
-      database_names.should_not include(db1)
+      tenant_names.should_not include(db1)
     end
   end
 
   describe "#process" do
     it "should connect" do
       subject.process(db1) do
-        subject.current_database.should == db1
+        subject.current_tenant.should == db1
       end
     end
 
     it "should reset" do
       subject.process(db1)
-      subject.current_database.should == default_database
+      subject.current_tenant.should == default_tenant
     end
 
-    # We're often finding when using Apartment in tests, the `current_database` (ie the previously connect to db)
+    # We're often finding when using Apartment in tests, the `current_tenant` (ie the previously connect to db)
     # gets dropped, but process will try to return to that db in a test.  We should just reset if it doesn't exist
-    it "should not throw exception if current_database is no longer accessible" do
+    it "should not throw exception if current_tenant is no longer accessible" do
       subject.switch(db2)
 
       expect {
@@ -75,19 +75,19 @@ shared_examples_for "a generic apartment adapter" do
     it "should reset connection" do
       subject.switch(db1)
       subject.reset
-      subject.current_database.should == default_database
+      subject.current_tenant.should == default_tenant
     end
   end
 
   describe "#switch" do
     it "should connect to new db" do
       subject.switch(db1)
-      subject.current_database.should == db1
+      subject.current_tenant.should == db1
     end
 
     it "should reset connection if database is nil" do
       subject.switch
-      subject.current_database.should == default_database
+      subject.current_tenant.should == default_tenant
     end
 
     it "should raise an error if database is invalid" do
@@ -97,11 +97,11 @@ shared_examples_for "a generic apartment adapter" do
     end
   end
 
-  describe "#current_database" do
+  describe "#current_tenant" do
     it "should return the current db name" do
       subject.switch(db1)
-      subject.current_database.should == db1
+      subject.current_tenant.should == db1
       subject.current.should == db1
     end
   end
-end
+end

data/spec/examples/schema_adapter_examples.rb

@@ -5,7 +5,7 @@ shared_examples_for "a schema based apartment adapter" do
 
   let(:schema1){ db1 }
   let(:schema2){ db2 }
-  let(:public_schema){ default_database }
+  let(:public_schema){ default_tenant }
 
   describe "#init" do
 
@@ -76,7 +76,7 @@ shared_examples_for "a schema based apartment adapter" do
         expect {
           subject.create(db)
         }.to_not raise_error
-        database_names.should include(db.to_s)
+        tenant_names.should include(db.to_s)
       end
 
       after{ subject.drop(db) }
@@ -99,7 +99,7 @@ shared_examples_for "a schema based apartment adapter" do
         expect {
           subject.drop(db)
         }.to_not raise_error
-        database_names.should_not include(db.to_s)
+        tenant_names.should_not include(db.to_s)
       end
 
       after { subject.drop(db) rescue nil }
@@ -213,17 +213,17 @@ shared_examples_for "a schema based apartment adapter" do
     end
   end
 
-  describe "#current_database" do
+  describe "#current_tenant" do
     it "should return the current schema name" do
       subject.switch(schema1)
-      subject.current_database.should == schema1
+      subject.current_tenant.should == schema1
       subject.current.should == schema1
     end
 
     context "persistent_schemas", :persistent_schemas => true do
       it "should exlude persistent_schemas" do
         subject.switch(schema1)
-        subject.current_database.should == schema1
+        subject.current_tenant.should == schema1
         subject.current.should == schema1
       end
     end

data/spec/integration/apartment_rake_integration_spec.rb

@@ -19,7 +19,7 @@ describe "apartment rake tasks", database: :postgresql do
     Apartment.configure do |config|
       config.use_schemas = true
       config.excluded_models = ["Company"]
-      config.database_names = lambda{ Company.pluck(:database) }
+      config.tenant_names = lambda{ Company.pluck(:database) }
     end
     Apartment::Database.reload!(config)
 
@@ -49,7 +49,7 @@ describe "apartment rake tasks", database: :postgresql do
 
     describe "#migrate" do
       it "should migrate all databases" do
-        ActiveRecord::Migrator.should_receive(:migrate).exactly(company_count+1).times
+        ActiveRecord::Migrator.should_receive(:migrate).exactly(company_count).times
 
         @rake['apartment:migrate'].invoke
       end
@@ -57,7 +57,7 @@ describe "apartment rake tasks", database: :postgresql do
 
     describe "#rollback" do
       it "should rollback all dbs" do
-        ActiveRecord::Migrator.should_receive(:rollback).exactly(company_count+1).times
+        ActiveRecord::Migrator.should_receive(:rollback).exactly(company_count).times
 
         @rake['apartment:rollback'].invoke
       end
@@ -71,4 +71,4 @@ describe "apartment rake tasks", database: :postgresql do
       end
     end
   end
-end
+end

data/spec/integration/query_caching_spec.rb

@@ -6,7 +6,7 @@ describe 'query caching' do
   before do
     Apartment.configure do |config|
       config.excluded_models = ["Company"]
-      config.database_names = lambda{ Company.pluck(:database) }
+      config.tenant_names = lambda{ Company.pluck(:database) }
       config.use_schemas = true
     end
 
@@ -38,4 +38,4 @@ describe 'query caching' do
     Apartment::Database.switch db_names.last
     User.find_by_name(db_names.first).should be_nil
   end
-end
+end

data/spec/support/requirements.rb

@@ -7,11 +7,9 @@ module Apartment
     #
     #
     module AdapterRequirements
-
       extend ActiveSupport::Concern
 
       included do
-
         before do
           subject.create(db1)
           subject.create(db2)
@@ -27,12 +25,11 @@ module Apartment
         end
       end
 
-      %w{subject database_names default_database}.each do |method|
+      %w{subject tenant_names default_tenant}.each do |method|
         define_method method do
           raise "You must define a `#{method}` method in your host group"
         end unless defined?(method)
       end
-
     end
   end
-end
+end

data/spec/tasks/apartment_rake_spec.rb

@@ -30,11 +30,11 @@ describe "apartment rake tasks" do
 
   context 'database migration' do
 
-    let(:database_names){ 3.times.map{ Apartment::Test.next_db } }
-    let(:db_count){ database_names.length }
+    let(:tenant_names){ 3.times.map{ Apartment::Test.next_db } }
+    let(:tenant_count){ tenant_names.length }
 
     before do
-      Apartment.stub(:database_names).and_return database_names
+      Apartment.stub(:tenant_names).and_return tenant_names
     end
 
     describe "apartment:migrate" do
@@ -43,7 +43,7 @@ describe "apartment rake tasks" do
       end
 
       it "should migrate public and all multi-tenant dbs" do
-        Apartment::Migrator.should_receive(:migrate).exactly(db_count).times
+        Apartment::Migrator.should_receive(:migrate).exactly(tenant_count).times
         @rake['apartment:migrate'].invoke
       end
     end
@@ -69,7 +69,7 @@ describe "apartment rake tasks" do
         end
 
         it "migrates up to a specific version" do
-          Apartment::Migrator.should_receive(:run).with(:up, anything, version.to_i).exactly(db_count).times
+          Apartment::Migrator.should_receive(:run).with(:up, anything, version.to_i).exactly(tenant_count).times
           @rake['apartment:migrate:up'].invoke
         end
       end
@@ -96,23 +96,22 @@ describe "apartment rake tasks" do
         end
 
         it "migrates up to a specific version" do
-          Apartment::Migrator.should_receive(:run).with(:down, anything, version.to_i).exactly(db_count).times
+          Apartment::Migrator.should_receive(:run).with(:down, anything, version.to_i).exactly(tenant_count).times
           @rake['apartment:migrate:down'].invoke
         end
       end
     end
 
     describe "apartment:rollback" do
-
       let(:step){ '3' }
 
       it "should rollback dbs" do
-        Apartment::Migrator.should_receive(:rollback).exactly(db_count).times
+        Apartment::Migrator.should_receive(:rollback).exactly(tenant_count).times
         @rake['apartment:rollback'].invoke
       end
 
       it "should rollback dbs STEP amt" do
-        Apartment::Migrator.should_receive(:rollback).with(anything, step.to_i).exactly(db_count).times
+        Apartment::Migrator.should_receive(:rollback).with(anything, step.to_i).exactly(tenant_count).times
         ENV['STEP'] = step
         @rake['apartment:rollback'].invoke
       end

data/spec/unit/config_spec.rb

@@ -36,26 +36,33 @@ describe Apartment do
       Apartment.seed_after_create.should be_true
     end
 
+    it "should set tld_length" do
+      Apartment.configure do |config|
+        config.tld_length = 2
+      end
+      Apartment.tld_length.should == 2
+    end
+
     context "databases" do
       it "should return object if it doesnt respond_to call" do
-        database_names = ['users', 'companies']
+        tenant_names = ['users', 'companies']
 
         Apartment.configure do |config|
           config.excluded_models = []
-          config.database_names = database_names
+          config.tenant_names = tenant_names
         end
-        Apartment.database_names.should == database_names
+        Apartment.tenant_names.should == tenant_names
       end
 
       it "should invoke the proc if appropriate" do
-        database_names = lambda{ ['users', 'users'] }
-        database_names.should_receive(:call)
+        tenant_names = lambda{ ['users', 'users'] }
+        tenant_names.should_receive(:call)
 
         Apartment.configure do |config|
           config.excluded_models = []
-          config.database_names = database_names
+          config.tenant_names = tenant_names
         end
-        Apartment.database_names
+        Apartment.tenant_names
       end
 
       it "should return the invoked proc if appropriate" do
@@ -63,12 +70,12 @@ describe Apartment do
 
         Apartment.configure do |config|
           config.excluded_models = []
-          config.database_names = dbs
+          config.tenant_names = dbs
         end
 
-        Apartment.database_names.should == Company.all
+        Apartment.tenant_names.should == Company.all
       end
     end
 
   end
-end
+end