apartment 0.22.1 → 0.23.0

data/spec/integration/apartment_rake_integration_spec.rb

@@ -1,34 +1,34 @@
 require 'spec_helper'
 require 'rake'
 
-describe "apartment rake tasks" do
+describe "apartment rake tasks", database: :postgresql do
 
   before do
     @rake = Rake::Application.new
     Rake.application = @rake
     Dummy::Application.load_tasks
 
-    # somehow this misc.rake file gets lost in the shuffle
-    # it defines a `rails_env` task that our db:migrate depends on
-    # No idea why, but during the tests, we somehow lose this tasks, so we get an error when testing migrations
-    # This is STUPID!
-    load "rails/tasks/misc.rake"
-  end
-
-  after do
-    Rake.application = nil
-  end
+    # rails tasks running F up the schema...
+    Rake::Task.define_task('db:migrate')
+    Rake::Task.define_task('db:seed')
+    Rake::Task.define_task('db:rollback')
+    Rake::Task.define_task('db:migrate:up')
+    Rake::Task.define_task('db:migrate:down')
+    Rake::Task.define_task('db:migrate:redo')
 
-  before do
     Apartment.configure do |config|
+      config.use_schemas = true
       config.excluded_models = ["Company"]
-      config.database_names = lambda{ Company.scoped.collect(&:database) }
+      config.database_names = lambda{ Company.pluck(:database) }
     end
+    Apartment::Database.reload!(config)
 
     # fix up table name of shared/excluded models
     Company.table_name = 'public.companies'
   end
 
+  after { Rake.application = nil }
+
   context "with x number of databases" do
 
     let(:x){ 1 + rand(5) }    # random number of dbs to create
@@ -49,7 +49,7 @@ describe "apartment rake tasks" do
 
     describe "#migrate" do
       it "should migrate all databases" do
-        Apartment::Migrator.should_receive(:migrate).exactly(company_count).times
+        ActiveRecord::Migrator.should_receive(:migrate).exactly(company_count+1).times
 
         @rake['apartment:migrate'].invoke
       end
@@ -57,12 +57,9 @@ describe "apartment rake tasks" do
 
     describe "#rollback" do
       it "should rollback all dbs" do
-        db_names.each do |name|
-          Apartment::Migrator.should_receive(:rollback).with(name, anything)
-        end
+        ActiveRecord::Migrator.should_receive(:rollback).exactly(company_count+1).times
 
         @rake['apartment:rollback'].invoke
-        @rake['apartment:migrate'].invoke   # migrate again so that our next test 'seed' can run (requires migrations to be complete)
       end
     end
 
@@ -73,6 +70,5 @@ describe "apartment rake tasks" do
         @rake['apartment:seed'].invoke
       end
     end
-
   end
 end

data/spec/integration/middleware/domain_elevator_spec.rb

@@ -1,9 +1,10 @@
 require 'spec_helper'
+require 'apartment/elevators/domain'
 
-describe Apartment::Elevators::Domain, :elevator => true do
+describe Apartment::Elevators::Domain, elevator: true do
 
-  let(:domain1)   { "http://#{database1}.com" }
-  let(:domain2)   { "http://#{database2}.com" }
+  let(:domain1)   { "http://#{db1}.com" }
+  let(:domain2)   { "http://#{db2}.com" }
 
   it_should_behave_like "an apartment elevator"
 end

data/spec/integration/middleware/generic_elevator_spec.rb

@@ -1,10 +1,11 @@
 require 'spec_helper'
+require 'apartment/elevators/generic'
 
-describe Apartment::Elevators::Generic, :elevator => true do
+describe Apartment::Elevators::Generic, elevator: true do
 
   # NOTE, see spec/dummy/config/application.rb to see the Proc that defines the behaviour here
-  let(:domain1)   { "http://#{database1}.com?db=#{database1}" }
-  let(:domain2)   { "http://#{database2}.com?db=#{database2}" }
+  let(:domain1)   { "http://#{db1}.com?db=#{db1}" }
+  let(:domain2)   { "http://#{db2}.com?db=#{db2}" }
 
   it_should_behave_like "an apartment elevator"
 end

data/spec/integration/middleware/subdomain_elevator_spec.rb

@@ -1,9 +1,35 @@
 require 'spec_helper'
+require 'apartment/elevators/generic'
 
-describe Apartment::Elevators::Subdomain, :elevator => true do
+describe Apartment::Elevators::Subdomain, elevator: true do
 
-  let(:domain1)   { "http://#{database1}.example.com" }
-  let(:domain2)   { "http://#{database2}.example.com" }
+  let(:domain1)   { "http://#{db1}.example.com" }
+  let(:domain2)   { "http://#{db2}.example.com" }
 
   it_should_behave_like "an apartment elevator"
+
+  context "With Subdomain Excluded" do
+    let(:domain_with_excluded_subdomain) { "http://www.example.com" }
+
+    before do
+      Apartment::Elevators::Subdomain.excluded_subdomains = %w(www)
+      # FIXME:
+      # This is used because the dummy app includes all three middlewares. The domain middleware specifically
+      # tries to lookup the example schema and tries to switch to it. I don't know how to go around this.
+      Apartment::Database.create("example")
+    end
+
+    it_should_behave_like "an apartment elevator"
+
+    it "shouldnt switch the schema if the subdomain is excluded" do
+      ActiveRecord::Base.connection.schema_search_path.scan(/\w+/).should_not include("www")
+      visit(domain_with_excluded_subdomain)
+      ActiveRecord::Base.connection.schema_search_path.scan(/\w+/).should_not include("www")
+    end
+
+    after do
+      Apartment::Elevators::Subdomain.excluded_subdomains = []
+      Apartment::Database.drop("example")
+    end
+  end
 end

data/spec/integration/query_caching_spec.rb

@@ -1,25 +1,29 @@
 require 'spec_helper'
 
 describe 'query caching' do
+  let(:db_names) { [db1, db2] }
+
   before do
     Apartment.configure do |config|
       config.excluded_models = ["Company"]
-      config.database_names = lambda{ Company.scoped.collect(&:database) }
+      config.database_names = lambda{ Company.pluck(:database) }
+      config.use_schemas = true
     end
 
+    Apartment::Database.reload!(config)
+
     db_names.each do |db_name|
       Apartment::Database.create(db_name)
-      Company.create :database => db_name
+      Company.create database: db_name
     end
   end
 
   after do
     db_names.each{ |db| Apartment::Database.drop(db) }
+    Apartment::Database.reset
     Company.delete_all
   end
 
-  let(:db_names) { 2.times.map{ Apartment::Test.next_db } }
-
   it 'clears the ActiveRecord::QueryCache after switching databases' do
     db_names.each do |db_name|
       Apartment::Database.switch db_name

data/spec/schemas/v1.rb

@@ -0,0 +1,16 @@
+# encoding: UTF-8
+# This file is auto-generated from the current state of the database. Instead
+# of editing this file, please use the migrations feature of Active Record to
+# incrementally modify your database, and then regenerate this schema definition.
+#
+# Note that this schema.rb definition is the authoritative source for your
+# database schema. If you need to create the application database on another
+# system, you should be using db:schema:load, not running all the migrations
+# from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# you'll amass, the slower it'll run and the greater likelihood for issues).
+#
+# It's strongly recommended to check this file into your version control system.
+
+ActiveRecord::Schema.define(:version => 0) do
+
+end

data/spec/schemas/v2.rb

@@ -0,0 +1,43 @@
+# encoding: UTF-8
+# This file is auto-generated from the current state of the database. Instead
+# of editing this file, please use the migrations feature of Active Record to
+# incrementally modify your database, and then regenerate this schema definition.
+#
+# Note that this schema.rb definition is the authoritative source for your
+# database schema. If you need to create the application database on another
+# system, you should be using db:schema:load, not running all the migrations
+# from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# you'll amass, the slower it'll run and the greater likelihood for issues).
+#
+# It's strongly recommended to check this file into your version control system.
+
+ActiveRecord::Schema.define(:version => 20110613152810) do
+
+  create_table "companies", :force => true do |t|
+    t.boolean "dummy"
+    t.string  "database"
+  end
+
+  create_table "delayed_jobs", :force => true do |t|
+    t.integer  "priority",   :default => 0
+    t.integer  "attempts",   :default => 0
+    t.text     "handler"
+    t.text     "last_error"
+    t.datetime "run_at"
+    t.datetime "locked_at"
+    t.datetime "failed_at"
+    t.string   "locked_by"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.string   "queue"
+  end
+
+  add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority"
+
+  create_table "users", :force => true do |t|
+    t.string   "name"
+    t.datetime "birthdate"
+    t.string   "sex"
+  end
+
+end

data/spec/schemas/v3.rb

@@ -0,0 +1,49 @@
+# encoding: UTF-8
+# This file is auto-generated from the current state of the database. Instead
+# of editing this file, please use the migrations feature of Active Record to
+# incrementally modify your database, and then regenerate this schema definition.
+#
+# Note that this schema.rb definition is the authoritative source for your
+# database schema. If you need to create the application database on another
+# system, you should be using db:schema:load, not running all the migrations
+# from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# you'll amass, the slower it'll run and the greater likelihood for issues).
+#
+# It's strongly recommended to check this file into your version control system.
+
+ActiveRecord::Schema.define(:version => 20111202022214) do
+
+  create_table "books", :force => true do |t|
+    t.string   "name"
+    t.integer  "pages"
+    t.datetime "published"
+  end
+
+  create_table "companies", :force => true do |t|
+    t.boolean "dummy"
+    t.string  "database"
+  end
+
+  create_table "delayed_jobs", :force => true do |t|
+    t.integer  "priority",   :default => 0
+    t.integer  "attempts",   :default => 0
+    t.text     "handler"
+    t.text     "last_error"
+    t.datetime "run_at"
+    t.datetime "locked_at"
+    t.datetime "failed_at"
+    t.string   "locked_by"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.string   "queue"
+  end
+
+  add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority"
+
+  create_table "users", :force => true do |t|
+    t.string   "name"
+    t.datetime "birthdate"
+    t.string   "sex"
+  end
+
+end

data/spec/spec_helper.rb

@@ -23,21 +23,15 @@ Rails.backtrace_cleaner.remove_silencers!
 # Load support files
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
-
 RSpec.configure do |config|
 
-  config.include RSpec::Integration::CapybaraSessions, :type => :request
-
-  config.before(:all) do
-    # Ensure that each test starts with a clean connection
-    # Necessary as some tests will leak things like current_schema into the next test
-    ActiveRecord::Base.clear_all_connections!
-  end
+  config.include RSpec::Integration::CapybaraSessions, type: :request
+  config.include Apartment::Spec::Setup
 
-  config.after(:each) do
-    Apartment.reset
+  # Somewhat brutal hack so that rails 4 postgres extensions don't modify this file
+  config.after(:suite) do
+    `git checkout -- spec/dummy/db/schema.rb`
   end
-
 end
 
 # Load shared examples, must happen after configure for RSpec 3

data/spec/support/apartment_helpers.rb

@@ -25,8 +25,10 @@ module Apartment
       ActiveRecord::Base.connection.execute("CREATE SCHEMA #{schema}")
     end
 
-    def load_schema
-      silence_stream(STDOUT){ load(Rails.root.join('db', 'schema.rb')) }
+    def load_schema(version = 3)
+      file = File.expand_path("../../schemas/v#{version}.rb", __FILE__)
+
+      silence_stream(STDOUT){ load(file) }
     end
 
     def migrate

data/spec/support/contexts.rb

@@ -16,28 +16,24 @@ shared_context "with default schema", :default_schema => true do
 end
 
 # Some default setup for elevator specs
-shared_context "elevators", :elevator => true do
-   let(:company1)  { mock_model(Company, :database => Apartment::Test.next_db).as_null_object }
-   let(:company2)  { mock_model(Company, :database => Apartment::Test.next_db).as_null_object }
+shared_context "elevators", elevator: true do
+  let(:company1)  { mock_model(Company, database: db1).as_null_object }
+  let(:company2)  { mock_model(Company, database: db2).as_null_object }
 
-   let(:database1) { company1.database }
-   let(:database2) { company2.database }
+  let(:api)       { Apartment::Database }
 
-   let(:api)       { Apartment::Database }
-
-   before do
-     Apartment.reset # reset all config
-     Apartment.seed_after_create = false
-     Apartment.use_schemas = true
-     api.reload! # reload adapter
-
-     api.create(database1)
-     api.create(database2)
-   end
+  before do
+    Apartment.reset # reset all config
+    Apartment.seed_after_create = false
+    Apartment.use_schemas = true
+    api.reload!(config)
+    api.create(db1)
+    api.create(db2)
+  end
 
-   after do
-     api.drop(database1)
-     api.drop(database2)
+  after do
+    api.drop(db1)
+    api.drop(db2)
   end
 end
 

data/spec/support/requirements.rb

@@ -11,14 +11,8 @@ module Apartment
       extend ActiveSupport::Concern
 
       included do
-        let(:db1){ Apartment::Test.next_db }
-        let(:db2){ Apartment::Test.next_db }
-        let(:connection){ ActiveRecord::Base.connection }
 
         before do
-          Apartment::Database.reload!(config.symbolize_keys)
-          ActiveRecord::Base.establish_connection config
-
           subject.create(db1)
           subject.create(db2)
         end
@@ -30,20 +24,10 @@ module Apartment
           # sometimes we manually drop these schemas in testing, don't care if we can't drop, hence rescue
           subject.drop(db1) rescue true
           subject.drop(db2) rescue true
-
-          # This is annoying, but for each sublcass that establishes its own connection (ie Company for excluded models for connection based adapters)
-          # a separate connection is maintained (clear_all_connections! doesn't appear to deal with these)
-          # This causes problems because previous tests that established this connection could F up the next test, so we'll just remove them all for each test :(
-          Apartment.excluded_models.each do |m|
-            klass = m.constantize
-            Apartment.connection_class.remove_connection(klass)
-            klass.reset_table_name
-          end
-          ActiveRecord::Base.clear_all_connections!
         end
       end
 
-      %w{subject config database_names default_database}.each do |method|
+      %w{subject database_names default_database}.each do |method|
         define_method method do
           raise "You must define a `#{method}` method in your host group"
         end unless defined?(method)

data/spec/support/setup.rb

@@ -0,0 +1,47 @@
+module Apartment
+  module Spec
+    module Setup
+
+      def self.included(base)
+        base.instance_eval do
+          let(:config){ database_config }
+
+          let(:db1){ Apartment::Test.next_db }
+          let(:db2){ Apartment::Test.next_db }
+          let(:connection){ ActiveRecord::Base.connection }
+
+          # This around ensures that we run these hooks before and after
+          # any before/after hooks defined in individual tests
+          # Otherwise these actually get run after test defined hooks
+          around(:each) do |example|
+            # before
+            Apartment::Database.reload!(config)
+            ActiveRecord::Base.establish_connection config
+
+            example.run
+
+            # after
+            Rails.configuration.database_configuration = {}
+            ActiveRecord::Base.clear_all_connections!
+
+            Apartment.excluded_models.each do |model|
+              klass = model.constantize
+              
+              Apartment.connection_class.remove_connection(klass)
+              klass.clear_all_connections!
+              klass.reset_table_name
+            end
+
+            Apartment.reset
+            Apartment::Database.reload!
+          end
+        end
+      end
+
+      def database_config
+        db = example.metadata.fetch(:database, :postgresql)
+        Apartment::Test.config['connections'][db.to_s].symbolize_keys
+      end
+    end
+  end
+end