apartment 0.15.0 → 0.16.0

data/spec/integration/delayed_job_integration_spec.rb

@@ -26,7 +26,7 @@ describe Apartment::Delayed do
   after do
     Apartment::Test.drop_schema database
     Apartment::Test.drop_schema database2
-    Apartment::Test.reset
+    Apartment.reset
   end
 
   describe Apartment::Delayed::Requirements do

data/spec/integration/middleware/domain_elevator_spec.rb

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

data/spec/integration/middleware/generic_elevator_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+
+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}" }
+
+  it_should_behave_like "an apartment elevator"
+end

data/spec/integration/middleware/subdomain_elevator_spec.rb

@@ -1,52 +1,9 @@
 require 'spec_helper'
 
-describe Apartment::Elevators::Subdomain do
-  
-  let(:company){ mock_model(Company, :subdomain => 'foo').as_null_object }
-  let(:domain){ "http://#{company.subdomain}.domain.com" }
-  let(:api){ Apartment::Database }
-  
-  before do
-    Apartment.seed_after_create = false
-    Apartment.use_postgres_schemas = true
-    
-    api.create(company.subdomain)
-  end
-  
-  after{ api.drop(company.subdomain) }
-  
-  context "single request" do
-    it "should switch the db" do
-      ActiveRecord::Base.connection.schema_search_path.should_not == company.subdomain
-      
-      visit(domain)
-      ActiveRecord::Base.connection.schema_search_path.should == company.subdomain
-    end
-  end
-  
-  context "simultaneous requests" do
-    let(:company2){ mock_model(Company, :subdomain => 'bar').as_null_object }
-    let(:domain2){ "http://#{company2.subdomain}.domain.com" }
-    
-    before{ api.create(company2.subdomain) }
-    after{ api.drop(company2.subdomain) }
-    
-    let!(:c1_user_count){ api.process(company.subdomain){ (2 + rand(2)).times{ User.create } } }
-    let!(:c2_user_count){ api.process(company2.subdomain){ (c1_user_count + 2).times{ User.create } } }
-    
-    it "should fetch the correct user count for each session based on subdomain" do
-      visit(domain)
-      
-      in_new_session do |session|
-        session.visit(domain2)
-        User.count.should == c2_user_count
-      end
-      
-      visit(domain)
-      User.count.should == c1_user_count
-    end
-    
-    
-  end
-  
+describe Apartment::Elevators::Subdomain, :elevator => true do
+
+  let(:domain1)   { "http://#{database1}.example.com" }
+  let(:domain2)   { "http://#{database2}.example.com" }
+
+  it_should_behave_like "an apartment elevator"
 end

data/spec/spec_helper.rb

@@ -7,6 +7,9 @@ require File.expand_path("../dummy/config/environment.rb",  __FILE__)
 require "rspec/rails"
 require 'capybara/rspec'
 require 'capybara/rails'
+require 'pry'
+
+silence_warnings{ IRB = Pry }
 
 ActionMailer::Base.delivery_method = :test
 ActionMailer::Base.perform_deliveries = true
@@ -27,9 +30,9 @@ RSpec.configure do |config|
     # Necessary as some tests will leak things like current_schema into the next test
     ActiveRecord::Base.clear_all_connections!
   end
-  
+
   config.after(:each) do
-    Apartment::Test.reset
+    Apartment.reset
   end
 
 end

data/spec/support/apartment_helpers.rb

@@ -1,38 +1,41 @@
 module Apartment
   module Test
-    
+
     extend self
-    
+
     def reset
       Apartment.excluded_models = nil
       Apartment.use_postgres_schemas = nil
       Apartment.seed_after_create = nil
+      Apartment.default_schema = nil
     end
-    
+
     def next_db
       @x ||= 0
-      "db_#{@x += 1}"
+      "db%d" % @x += 1
     end
-    
+
     def drop_schema(schema)
       ActiveRecord::Base.connection.execute("DROP SCHEMA IF EXISTS #{schema} CASCADE") rescue true
     end
-    
+
+    # Use this if you don't want to import schema.rb etc... but need the postgres schema to exist
+    # basically for speed purposes
     def create_schema(schema)
       ActiveRecord::Base.connection.execute("CREATE SCHEMA #{schema}")
     end
-    
+
     def load_schema
       silence_stream(STDOUT){ load(Rails.root.join('db', 'schema.rb')) }
     end
-    
+
     def migrate
       ActiveRecord::Migrator.migrate(Rails.root + ActiveRecord::Migrator.migrations_path)
     end
-    
+
     def rollback
       ActiveRecord::Migrator.rollback(Rails.root + ActiveRecord::Migrator.migrations_path)
     end
-    
+
   end
 end

data/spec/support/contexts.rb

@@ -0,0 +1,54 @@
+#   Some shared contexts for specs
+
+shared_context "with default schema", :default_schema => true do
+  let(:default_schema){ Apartment::Test.next_db }
+
+  before do
+    Apartment::Test.create_schema(default_schema)
+    Apartment.default_schema = default_schema
+  end
+
+  after do
+    # resetting default_schema so we can drop and any further resets won't try to access droppped schema
+    Apartment.default_schema = nil
+    Apartment::Test.drop_schema(default_schema)
+  end
+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 }
+
+   let(:database1) { company1.database }
+   let(:database2) { company2.database }
+
+   let(:api)       { Apartment::Database }
+
+   before do
+     Apartment.seed_after_create = false
+     Apartment.use_postgres_schemas = true
+
+     api.create(database1)
+     api.create(database2)
+   end
+
+   after do
+     api.drop(database1)
+     api.drop(database2)
+  end
+end
+
+shared_context "persistent_schemas", :persistent_schemas => true do
+  let(:persistent_schemas){ ['hstore', 'postgis'] }
+
+  before do
+    persistent_schemas.map{|schema| subject.create(schema) }
+    Apartment.persistent_schemas = persistent_schemas
+  end
+
+  after do
+    Apartment.persistent_schemas = []
+    persistent_schemas.map{|schema| subject.drop(schema) }
+  end
+end

data/spec/support/requirements.rb

@@ -7,9 +7,9 @@ module Apartment
     #
     #
     module AdapterRequirements
-      
+
       extend ActiveSupport::Concern
-      
+
       included do
         let(:db1){ Apartment::Test.next_db }
         let(:db2){ Apartment::Test.next_db }
@@ -28,7 +28,7 @@ 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
-          
+
           ActiveRecord::Base.clear_all_connections!
           Apartment::Database.reload!
         end
@@ -39,7 +39,7 @@ module Apartment
           raise "You must define a `#{method}` method in your host group"
         end unless defined?(method)
       end
-      
+
     end
   end
 end

data/spec/unit/config_spec.rb

@@ -6,10 +6,6 @@ describe Apartment do
 
     let(:excluded_models){ [Company] }
 
-    after do
-      Apartment::Test.reset
-    end
-
     it "should yield the Apartment object" do
       Apartment.configure do |config|
         config.excluded_models = []

data/spec/unit/middleware/domain_elevator_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+describe Apartment::Elevators::Domain do
+
+  describe "#parse_database_name" do
+    it "parses the host for a domain name" do
+      request = ActionDispatch::Request.new('HTTP_HOST' => 'example.com')
+      elevator = Apartment::Elevators::Domain.new(nil)
+      elevator.parse_database_name(request).should == 'example'
+    end
+
+    it "ignores a www prefix and domain suffix" do
+      request = ActionDispatch::Request.new('HTTP_HOST' => 'www.example.bc.ca')
+      elevator = Apartment::Elevators::Domain.new(nil)
+      elevator.parse_database_name(request).should == 'example'
+    end
+
+    it "returns nil if there is no host" do
+      request = ActionDispatch::Request.new('HTTP_HOST' => '')
+      elevator = Apartment::Elevators::Domain.new(nil)
+      elevator.parse_database_name(request).should be_nil
+    end
+
+  end
+
+end

data/spec/unit/middleware/subdomain_elevator_spec.rb

@@ -1,20 +1,20 @@
 require 'spec_helper'
 
 describe Apartment::Elevators::Subdomain do
-  
-  describe "#subdomain" do
+
+  describe "#parse_database_name" do
     it "should parse subdomain" do
       request = ActionDispatch::Request.new('HTTP_HOST' => 'foo.bar.com')
       elevator = Apartment::Elevators::Subdomain.new(nil)
-      elevator.subdomain(request).should == 'foo'
+      elevator.parse_database_name(request).should == 'foo'
     end
-    
+
     it "should return nil when no subdomain" do
       request = ActionDispatch::Request.new('HTTP_HOST' => 'bar.com')
       elevator = Apartment::Elevators::Subdomain.new(nil)
-      elevator.subdomain(request).should be_nil
+      elevator.parse_database_name(request).should be_nil
     end
-    
+
   end
-  
+
 end

metadata

@@ -1,165 +1,173 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: apartment
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.16.0
   prerelease: 
-  version: 0.15.0
 platform: ruby
-authors: 
+authors:
 - Ryan Brunner
 - Brad Robertson
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-03-18 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-06-01 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2152850820 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2152850820
+- !ruby/object:Gem::Dependency
   name: rack
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &2152849500 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 1.4.0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.6
   type: :runtime
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2152849500
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: &2152722880 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.9
+  type: :development
+  prerelease: false
+  version_requirements: *2152722880
+- !ruby/object:Gem::Dependency
   name: rails
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &2152722120 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.1.2
   type: :development
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2152722120
+- !ruby/object:Gem::Dependency
   name: rake
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &2152721240 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2152721240
+- !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &2152719600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2152719600
+- !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &2152717500 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 2.8.0
+      - !ruby/object:Gem::Version
+        version: 2.10.0
   type: :development
   prerelease: false
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2152717500
+- !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &2152733100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 2.8.1
+      - !ruby/object:Gem::Version
+        version: 2.10.0
   type: :development
   prerelease: false
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2152733100
+- !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &2152732580 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2152732580
+- !ruby/object:Gem::Dependency
   name: pg
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &2152732000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.11.0
   type: :development
   prerelease: false
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2152732000
+- !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &2152731420 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.3.10
   type: :development
   prerelease: false
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2152731420
+- !ruby/object:Gem::Dependency
   name: delayed_job
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &2152730820 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "3.0"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2152730820
+- !ruby/object:Gem::Dependency
   name: delayed_job_active_record
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &2152730320 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id012
+  version_requirements: *2152730320
 description: Apartment allows Rails applications to deal with database multitenancy
-email: 
+email:
 - ryan@ryanbrunner.com
 - bradleyrobertson@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
+- .pryrc
 - .rspec
 - .rvmrc
+- .travis.yml
 - Gemfile
 - HISTORY.md
 - README.md
@@ -167,7 +175,7 @@ files:
 - apartment.gemspec
 - lib/apartment.rb
 - lib/apartment/adapters/abstract_adapter.rb
-- lib/apartment/adapters/mysql_adapter.rb
+- lib/apartment/adapters/mysql2_adapter.rb
 - lib/apartment/adapters/postgresql_adapter.rb
 - lib/apartment/console.rb
 - lib/apartment/database.rb
@@ -175,13 +183,15 @@ files:
 - lib/apartment/delayed_job/enqueue.rb
 - lib/apartment/delayed_job/hooks.rb
 - lib/apartment/delayed_job/requirements.rb
+- lib/apartment/elevators/domain.rb
+- lib/apartment/elevators/generic.rb
 - lib/apartment/elevators/subdomain.rb
 - lib/apartment/migrator.rb
 - lib/apartment/railtie.rb
 - lib/apartment/reloader.rb
 - lib/apartment/version.rb
 - lib/tasks/apartment.rake
-- spec/adapters/mysql_adapter_spec.rb
+- spec/adapters/mysql2_adapter_spec.rb
 - spec/adapters/postgresql_adapter_spec.rb
 - spec/apartment_spec.rb
 - spec/config/database.yml
@@ -222,54 +232,55 @@ files:
 - spec/dummy/public/stylesheets/.gitkeep
 - spec/dummy/script/rails
 - spec/examples/db_adapter_examples.rb
+- spec/examples/elevator_examples.rb
 - spec/examples/generic_adapter_examples.rb
 - spec/examples/schema_adapter_examples.rb
 - spec/integration/apartment_rake_integration_spec.rb
 - spec/integration/delayed_job_integration_spec.rb
+- spec/integration/middleware/domain_elevator_spec.rb
+- spec/integration/middleware/generic_elevator_spec.rb
 - spec/integration/middleware/subdomain_elevator_spec.rb
 - spec/spec_helper.rb
 - spec/support/apartment_helpers.rb
 - spec/support/capybara_sessions.rb
 - spec/support/config.rb
+- spec/support/contexts.rb
 - spec/support/requirements.rb
 - spec/tasks/apartment_rake_spec.rb
 - spec/unit/config_spec.rb
+- spec/unit/middleware/domain_elevator_spec.rb
 - spec/unit/middleware/subdomain_elevator_spec.rb
 - spec/unit/migrator_spec.rb
 - spec/unit/reloader_spec.rb
-has_rdoc: true
 homepage: http://github.com/bradrobertson/apartment
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: -617584559
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -2664931283611215158
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: -617584559
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: -2664931283611215158
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A Ruby gem for managing database multitenancy in Rails applications
 test_files: []
-