apartment 0.22.1 → 0.23.0

data/lib/apartment/elevators/domain.rb

@@ -1,3 +1,5 @@
+require 'apartment/elevators/generic'
+
 module Apartment
   module Elevators
     #   Provides a rack based db switching solution based on domain

data/lib/apartment/elevators/first_subdomain.rb

@@ -1,3 +1,5 @@
+require 'apartment/elevators/subdomain'
+
 module Apartment
   module Elevators
     # Provides a rack based db switching solution based on the first subdomain

data/lib/apartment/elevators/generic.rb

@@ -1,3 +1,6 @@
+require 'rack/request'
+require 'apartment/database'
+
 module Apartment
   module Elevators
     #   Provides a rack based db switching solution based on request

data/lib/apartment/elevators/host_hash.rb

@@ -1,3 +1,5 @@
+require 'apartment/elevators/generic'
+
 module Apartment
   module Elevators
     #   Provides a rack based db switching solution based on hosts

data/lib/apartment/elevators/subdomain.rb

@@ -1,12 +1,29 @@
+require 'apartment/elevators/generic'
+
 module Apartment
   module Elevators
     #   Provides a rack based db switching solution based on subdomains
     #   Assumes that database name should match subdomain
     #
     class Subdomain < Generic
+      def self.excluded_subdomains
+        @@excluded_subdomains ||= []
+      end
+
+      def self.excluded_subdomains=(arg)
+        @@excluded_subdomains = arg
+      end
 
       def parse_database_name(request)
-        database = subdomain(request.host)
+        request_subdomain = subdomain(request.host)
+
+        # If the domain acquired is set to be exlcluded, set the database to whatever is currently
+        # next in line in the schema search path.
+        database = if self.class.excluded_subdomains.include?(request_subdomain)
+          nil
+        else
+          request_subdomain
+        end
 
         database.present? && database || nil
       end
@@ -32,4 +49,4 @@ module Apartment
       end
     end
   end
-end
+end

data/lib/apartment/migrator.rb

@@ -1,5 +1,6 @@
-module Apartment
+require 'apartment/database'
 
+module Apartment
   module Migrator
 
     extend self

data/lib/apartment/railtie.rb

@@ -1,4 +1,6 @@
 require 'rails'
+require 'apartment/database'
+require 'apartment/reloader'
 
 module Apartment
   class Railtie < Rails::Railtie
@@ -50,8 +52,6 @@ module Apartment
       console do
         require 'apartment/console'
       end
-
     end
-
   end
 end

data/lib/apartment/reloader.rb

@@ -1,5 +1,4 @@
 module Apartment
-
   class Reloader
 
     #   Middleware used in development to init Apartment for each request
@@ -18,7 +17,5 @@ module Apartment
       Database.init
       @app.call(env)
     end
-
   end
-
 end

data/lib/apartment/version.rb

@@ -1,3 +1,3 @@
 module Apartment
-  VERSION = "0.22.1"
-end
+  VERSION = "0.23.0"
+end

data/lib/tasks/apartment.rake

@@ -1,3 +1,5 @@
+require 'apartment/migrator'
+
 apartment_namespace = namespace :apartment do
 
   desc "Create all multi-tenant databases"

data/spec/adapters/jdbc_mysql_adapter_spec.rb

@@ -3,10 +3,8 @@ if defined?(JRUBY_VERSION)
   require 'spec_helper'
   require 'lib/apartment/adapters/jdbc_mysql_adapter'
 
-  describe Apartment::Adapters::JDBCMysqlAdapter do
+  describe Apartment::Adapters::JDBCMysqlAdapter, database: :mysql do
 
-
-    let(:config) { Apartment::Test.config['connections']['mysql'] }
     subject { Apartment::Database.jdbc_mysql_adapter config.symbolize_keys }
 
     def database_names

data/spec/adapters/jdbc_postgresql_adapter_spec.rb

@@ -3,10 +3,8 @@ if defined?(JRUBY_VERSION)
   require 'spec_helper'
   require 'lib/apartment/adapters/jdbc_postgresql_adapter'
 
-  describe Apartment::Adapters::JDBCPostgresqlAdapter do
+  describe Apartment::Adapters::JDBCPostgresqlAdapter, database: :postgresql do
 
-
-    let(:config) { Apartment::Test.config['connections']['postgresql'] }
     subject { Apartment::Database.jdbc_postgresql_adapter config.symbolize_keys }
 
     context "using schemas" do

data/spec/adapters/mysql2_adapter_spec.rb

@@ -1,10 +1,9 @@
 require 'spec_helper'
 require 'apartment/adapters/mysql2_adapter'
 
-describe Apartment::Adapters::Mysql2Adapter do
+describe Apartment::Adapters::Mysql2Adapter, database: :mysql do
   unless defined?(JRUBY_VERSION)
 
-    let(:config){ Apartment::Test.config['connections']['mysql'].symbolize_keys }
     subject(:adapter){ Apartment::Database.mysql2_adapter config }
 
     def database_names

data/spec/adapters/postgresql_adapter_spec.rb

@@ -1,10 +1,9 @@
 require 'spec_helper'
 require 'apartment/adapters/postgresql_adapter'
 
-describe Apartment::Adapters::PostgresqlAdapter do
+describe Apartment::Adapters::PostgresqlAdapter, database: :postgresql do
   unless defined?(JRUBY_VERSION)
 
-    let(:config){ Apartment::Test.config['connections']['postgresql'].symbolize_keys }
     subject{ Apartment::Database.postgresql_adapter config }
 
     context "using schemas" do

data/spec/adapters/sqlite3_adapter_spec.rb

@@ -1,10 +1,9 @@
 require 'spec_helper'
 require 'apartment/adapters/sqlite3_adapter'
 
-describe Apartment::Adapters::Sqlite3Adapter do
+describe Apartment::Adapters::Sqlite3Adapter, database: :sqlite do
   unless defined?(JRUBY_VERSION)
 
-    let(:config){ Apartment::Test.config['connections']['sqlite'].symbolize_keys }
     subject{ Apartment::Database.sqlite3_adapter config }
 
     context "using connections" do

data/spec/database_spec.rb

@@ -1,14 +1,9 @@
 require 'spec_helper'
 
 describe Apartment::Database do
-  context "using mysql" do
-    # See apartment.yml file in dummy app config
-
-    let(:config){ Apartment::Test.config['connections']['mysql'].symbolize_keys }
+  context "using mysql", database: :mysql do
 
     before do
-      ActiveRecord::Base.establish_connection config
-      Apartment::Test.load_schema   # load the Rails schema in the public db schema
       subject.stub(:config).and_return config   # Use mysql database config for this test
     end
 
@@ -26,25 +21,22 @@ describe Apartment::Database do
     # TODO this doesn't belong here, but there aren't integration tests currently for mysql
     # where to put???
     describe "#exception recovery", :type => :request do
-      let(:database1){ Apartment::Test.next_db }
-
       before do
         subject.reload!
-        subject.create database1
+        subject.create db1
       end
-      after{ subject.drop database1 }
-
-      it "should recover from incorrect database" do
-        session = Capybara::Session.new(:rack_test, Capybara.app)
-        session.visit("http://#{database1}.com")
-        expect {
-          session.visit("http://this-database-should-not-exist.com")
-        }.to raise_error
-        session.visit("http://#{database1}.com")
-      end
-
+      after{ subject.drop db1 }
+
+      # it "should recover from incorrect database" do
+      #   session = Capybara::Session.new(:rack_test, Capybara.app)
+      #   session.visit("http://#{db1}.com")
+      #   expect {
+      #     session.visit("http://this-database-should-not-exist.com")
+      #   }.to raise_error
+      #   session.visit("http://#{db1}.com")
+      # end
     end
-    
+
     context "with prefix and schemas" do
       describe "#create" do
         before do
@@ -52,11 +44,12 @@ describe Apartment::Database do
             config.prepend_environment = true
             config.use_schemas = true
           end
+
           subject.reload!(config) # switch to Mysql2SchemaAdapter
         end
-        
+
         after { subject.drop "db_with_prefix" rescue nil }
-        
+
         it "should create a new database" do
           subject.create "db_with_prefix"
         end
@@ -64,18 +57,9 @@ describe Apartment::Database do
     end
   end
 
-  context "using postgresql" do
-
-    # See apartment.yml file in dummy app config
-
-    let(:config){ Apartment::Test.config['connections']['postgresql'].symbolize_keys }
-    let(:database){ Apartment::Test.next_db }
-    let(:database2){ Apartment::Test.next_db }
-
+  context "using postgresql", database: :postgresql do
     before do
       Apartment.use_schemas = true
-      ActiveRecord::Base.establish_connection config
-      Apartment::Test.load_schema   # load the Rails schema in the public db schema
       subject.stub(:config).and_return config   # Use postgresql database config for this test
     end
 
@@ -90,7 +74,7 @@ describe Apartment::Database do
       end
 
       it "should raise exception with invalid adapter specified" do
-        subject.stub(:config).and_return config.merge(:adapter => 'unkown')
+        subject.stub(:config).and_return config.merge(:adapter => 'unknown')
 
         expect {
           Apartment::Database.adapter
@@ -98,13 +82,14 @@ describe Apartment::Database do
       end
 
       context "threadsafety" do
-        before { subject.create database }
+        before { subject.create db1 }
+        after { subject.drop db1 }
 
         it 'has a threadsafe adapter' do
-          subject.switch(database)
+          subject.switch(db1)
           thread = Thread.new { subject.current_database.should == Apartment.default_schema }
           thread.join
-          subject.current_database.should == database
+          subject.current_database.should == db1
         end
       end
     end
@@ -117,14 +102,14 @@ describe Apartment::Database do
           config.use_schemas = true
           config.seed_after_create = true
         end
-        subject.create database
+        subject.create db1
       end
 
-      after{ subject.drop database }
+      after{ subject.drop db1 }
 
       describe "#create" do
         it "should seed data" do
-          subject.switch database
+          subject.switch db1
           User.count.should be > 0
         end
       end
@@ -135,20 +120,20 @@ describe Apartment::Database do
 
         context "creating models" do
 
-          before{ subject.create database2 }
-          after{ subject.drop database2 }
+          before{ subject.create db2 }
+          after{ subject.drop db2 }
 
           it "should create a model instance in the current schema" do
-            subject.switch database2
+            subject.switch db2
             db2_count = User.count + x.times{ User.create }
 
-            subject.switch database
+            subject.switch db1
             db_count = User.count + x.times{ User.create }
 
-            subject.switch database2
+            subject.switch db2
             User.count.should == db2_count
 
-            subject.switch database
+            subject.switch db1
             User.count.should == db_count
           end
         end
@@ -166,17 +151,14 @@ describe Apartment::Database do
             subject.reset # ensure we're on public schema
             count = Company.count + x.times{ Company.create }
 
-            subject.switch database
+            subject.switch db1
             x.times{ Company.create }
             Company.count.should == count + x
             subject.reset
             Company.count.should == count + x
           end
         end
-
       end
-
     end
-
   end
 end

data/spec/dummy/app/models/user.rb

@@ -1,5 +1,3 @@
 class User < ActiveRecord::Base
-  include Apartment::Delayed::Job::Hooks
-  def perform; end
   # Dummy models
 end

data/spec/dummy/config/application.rb

@@ -14,6 +14,8 @@ module Dummy
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.
+    require 'apartment/elevators/subdomain'
+    require 'apartment/elevators/domain'
 
     config.middleware.use 'Apartment::Elevators::Subdomain'
     config.middleware.use 'Apartment::Elevators::Domain'

data/spec/dummy/config/environments/development.rb

@@ -6,6 +6,8 @@ Dummy::Application.configure do
   # since you don't have to restart the webserver when you make code changes.
   config.cache_classes = false
 
+  config.eager_load = false
+
   # Log error messages when you accidentally call methods on nil.
   config.whiny_nils = true
 

data/spec/dummy/config/environments/production.rb

@@ -5,6 +5,8 @@ Dummy::Application.configure do
   # Code is not reloaded between requests
   config.cache_classes = true
 
+  config.eager_load = true
+
   # Full error reports are disabled and caching is turned on
   config.consider_all_requests_local       = false
   config.action_controller.perform_caching = true

data/spec/dummy/config/environments/test.rb

@@ -7,8 +7,7 @@ Dummy::Application.configure do
   # and recreated between test runs.  Don't rely on the data there!
   config.cache_classes = true
 
-  # Log error messages when you accidentally call methods on nil.
-  config.whiny_nils = true
+  config.eager_load = false
 
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true

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

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

data/spec/dummy/db/seeds.rb

@@ -1,8 +1,5 @@
 def create_users
-  3.times do |x| 
-    user = User.find_or_initialize_by_name "Some User #{x}"
-    user.save
-  end
+  3.times {|x| User.where(name: "Some User #{x}").first_or_create! }
 end
 
 create_users

data/spec/examples/elevator_examples.rb

@@ -4,17 +4,17 @@ shared_examples_for "an apartment elevator" do
 
   context "single request" do
     it "should switch the db" do
-      ActiveRecord::Base.connection.schema_search_path.should_not == %{"#{database1}"}
+      ActiveRecord::Base.connection.schema_search_path.should_not == %{"#{db1}"}
 
       visit(domain1)
-      ActiveRecord::Base.connection.schema_search_path.should == %{"#{database1}"}
+      ActiveRecord::Base.connection.schema_search_path.should == %{"#{db1}"}
     end
   end
 
   context "simultaneous requests" do
 
-    let!(:c1_user_count) { api.process(database1){ (2 + rand(2)).times{ User.create } } }
-    let!(:c2_user_count) { api.process(database2){ (c1_user_count + 2).times{ User.create } } }
+    let!(:c1_user_count) { api.process(db1){ (2 + rand(2)).times{ User.create } } }
+    let!(:c2_user_count) { api.process(db2){ (c1_user_count + 2).times{ User.create } } }
 
     it "should fetch the correct user count for each session based on the elevator processor" do
       visit(domain1)