apartment 0.14.4 → 0.15.0

data/spec/integration/middleware/subdomain_elevator_spec.rb

@@ -4,21 +4,20 @@ 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
     
-    Apartment::Database.create(company.subdomain)
+    api.create(company.subdomain)
   end
   
-  after do
-    Apartment::Test.drop_schema(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 == 'foo'
+      ActiveRecord::Base.connection.schema_search_path.should_not == company.subdomain
       
       visit(domain)
       ActiveRecord::Base.connection.schema_search_path.should == company.subdomain
@@ -29,32 +28,22 @@ describe Apartment::Elevators::Subdomain do
     let(:company2){ mock_model(Company, :subdomain => 'bar').as_null_object }
     let(:domain2){ "http://#{company2.subdomain}.domain.com" }
     
-    before do
-      Apartment::Database.create(company2.subdomain)
-      # Create some users for each db
-      Apartment::Database.process(company.subdomain) do
-        @c1_user_count = (2 + rand(2)).times{ User.create }
-      end
-      
-      Apartment::Database.process(company2.subdomain) do
-        @c2_user_count = (@c1_user_count + 2).times{ User.create }
-      end
-    end
-
-    after do
-      Apartment::Test.drop_schema(company2.subdomain)
-    end
+    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
+        User.count.should == c2_user_count
       end
       
       visit(domain)
-      User.count.should == @c1_user_count
+      User.count.should == c1_user_count
     end
     
     

data/spec/spec_helper.rb

@@ -27,5 +27,12 @@ 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
+  end
+
+end
 
-end
+# Load shared examples, must happen after configure for RSpec 3
+Dir["#{File.dirname(__FILE__)}/examples/**/*.rb"].each { |f| require f }

data/spec/support/apartment_helpers.rb

@@ -6,6 +6,12 @@ module Apartment
     def reset
       Apartment.excluded_models = nil
       Apartment.use_postgres_schemas = nil
+      Apartment.seed_after_create = nil
+    end
+    
+    def next_db
+      @x ||= 0
+      "db_#{@x += 1}"
     end
     
     def drop_schema(schema)
@@ -17,7 +23,7 @@ module Apartment
     end
     
     def load_schema
-      silence_stream(STDOUT){ load("#{Rails.root}/db/schema.rb") }
+      silence_stream(STDOUT){ load(Rails.root.join('db', 'schema.rb')) }
     end
     
     def migrate

data/spec/support/config.rb

@@ -1,11 +1,11 @@
 module Apartment
-  
+
   module Test
-    
+
     def self.config
       @config ||= YAML.load_file('spec/config/database.yml')
     end
-    
+
   end
-  
+
 end

data/spec/support/requirements.rb

@@ -0,0 +1,45 @@
+module Apartment
+  module Spec
+
+    #
+    #   Define the interface methods required to
+    #   use an adapter shared example
+    #
+    #
+    module AdapterRequirements
+      
+      extend ActiveSupport::Concern
+      
+      included do
+        let(:db1){ Apartment::Test.next_db }
+        let(:db2){ Apartment::Test.next_db }
+        let(:connection){ ActiveRecord::Base.connection }
+
+        before do
+          ActiveRecord::Base.establish_connection config
+          subject.create(db1)
+          subject.create(db2)
+        end
+
+        after do
+          # Reset before dropping (can't drop a db you're connected to)
+          subject.reset
+
+          # 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
+      end
+
+      %w{subject config 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)
+      end
+      
+    end
+  end
+end

data/spec/tasks/apartment_rake_spec.rb

@@ -25,7 +25,7 @@ describe "apartment rake tasks" do
 
   context 'database migration' do
 
-    let(:database_names){ ['company1', 'company2', 'company3'] }
+    let(:database_names){ 3.times.map{ Apartment::Test.next_db } }
     let(:db_count){ database_names.length }
 
     before do

data/spec/unit/migrator_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Apartment::Migrator do
 
   let(:config){ Apartment::Test.config['connections']['postgresql'].symbolize_keys }
-  let(:schema_name){ 'some_db_schema' }
+  let(:schema_name){ Apartment::Test.next_db }
   let(:version){ 20110613152810 }     # note this is brittle!  I've literally just taken the version of the one migration I made...  don't change this version
 
   before do

metadata

@@ -1,146 +1,162 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: apartment
-version: !ruby/object:Gem::Version
-  version: 0.14.4
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 0.15.0
 platform: ruby
-authors:
+authors: 
 - Ryan Brunner
 - Brad Robertson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-08 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: &2156199960 !ruby/object:Gem::Requirement
+
+date: 2012-03-18 00:00:00 -04:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: activerecord
+  requirement: &id001 !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: *2156199960
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rack
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rails
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 3.1.2
+  type: :development
+  prerelease: false
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: &2156198740 !ruby/object:Gem::Requirement
+  requirement: &id004 !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: *2156198740
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: sqlite3
-  requirement: &2156197960 !ruby/object:Gem::Requirement
+  requirement: &id005 !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: *2156197960
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &2156197060 !ruby/object:Gem::Requirement
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *2156197060
-- !ruby/object:Gem::Dependency
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   name: rspec-rails
-  requirement: &2156196160 !ruby/object:Gem::Requirement
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.8.0
+      - !ruby/object:Gem::Version 
+        version: 2.8.1
   type: :development
   prerelease: false
-  version_requirements: *2156196160
-- !ruby/object:Gem::Dependency
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
   name: capybara
-  requirement: &2156195360 !ruby/object:Gem::Requirement
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - =
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2156195360
-- !ruby/object:Gem::Dependency
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
   name: pg
-  requirement: &2156194560 !ruby/object:Gem::Requirement
+  requirement: &id009 !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: *2156194560
-- !ruby/object:Gem::Dependency
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
   name: mysql2
-  requirement: &2156176740 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.3.7
-  type: :development
-  prerelease: false
-  version_requirements: *2156176740
-- !ruby/object:Gem::Dependency
-  name: silent-postgres
-  requirement: &2156175840 !ruby/object:Gem::Requirement
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.1.1
+      - !ruby/object:Gem::Version 
+        version: 0.3.10
   type: :development
   prerelease: false
-  version_requirements: *2156175840
-- !ruby/object:Gem::Dependency
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
   name: delayed_job
-  requirement: &2156174740 !ruby/object:Gem::Requirement
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.0.1
+      - !ruby/object:Gem::Version 
+        version: "3.0"
   type: :development
   prerelease: false
-  version_requirements: *2156174740
-- !ruby/object:Gem::Dependency
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
   name: delayed_job_active_record
-  requirement: &2156173700 !ruby/object:Gem::Requirement
+  requirement: &id012 !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: *2156173700
+  version_requirements: *id012
 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
 - .rspec
 - .rvmrc
@@ -169,6 +185,7 @@ files:
 - spec/adapters/postgresql_adapter_spec.rb
 - spec/apartment_spec.rb
 - spec/config/database.yml
+- spec/database_spec.rb
 - spec/dummy/Rakefile
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
@@ -204,48 +221,55 @@ files:
 - spec/dummy/public/favicon.ico
 - spec/dummy/public/stylesheets/.gitkeep
 - spec/dummy/script/rails
+- spec/examples/db_adapter_examples.rb
+- spec/examples/generic_adapter_examples.rb
+- spec/examples/schema_adapter_examples.rb
 - spec/integration/apartment_rake_integration_spec.rb
-- spec/integration/database_integration_spec.rb
 - spec/integration/delayed_job_integration_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/requirements.rb
 - spec/tasks/apartment_rake_spec.rb
 - spec/unit/config_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
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: -617584559
+      segments: 
       - 0
-      hash: -3479851057211563611
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: -617584559
+      segments: 
       - 0
-      hash: -3479851057211563611
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A Ruby gem for managing database multitenancy in Rails applications
 test_files: []
+