apartment 0.1.3 → 0.5.0

data/spec/unit/middleware/subdomain_elevator_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe Apartment::Elevators::Subdomain do
+  
+  describe "#subdomain" 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'
+    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
+    end
+    
+  end
+  
+end

data/spec/unit/migrator_spec.rb

@@ -0,0 +1,87 @@
+require 'spec_helper'
+
+describe Apartment::Migrator do
+  
+  let(:config){ Apartment::Test.config['connections']['postgresql'].symbolize_keys }
+  let(:schema_name){ 'some_db_schema' }
+  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
+    ActiveRecord::Base.establish_connection config
+    Apartment::Database.stub(:config).and_return config   # Use postgresql config for this test
+    @original_schema = ActiveRecord::Base.connection.schema_search_path
+    
+    Apartment.configure do |config|
+      config.use_postgres_schemas = true
+      config.excluded_models = []
+      config.database_names = [schema_name]
+    end
+    
+    Apartment::Database.create schema_name    # create the schema
+    migrations_path = Rails.root + ActiveRecord::Migrator.migrations_path     # tell AR where the real migrations are
+    ActiveRecord::Migrator.stub(:migrations_path).and_return(migrations_path)
+  end
+  
+  after do
+    Apartment::Test.drop_schema(schema_name)
+  end
+  
+  context "postgresql" do
+
+    context "using schemas" do
+      
+      describe "#migrate" do
+        it "should connect to new db, then reset when done" do
+          ActiveRecord::Base.connection.should_receive(:schema_search_path=).with(schema_name).once
+          ActiveRecord::Base.connection.should_receive(:schema_search_path=).with(@original_schema).once
+          Apartment::Migrator.migrate(schema_name)
+        end
+  
+        it "should migrate db" do
+          ActiveRecord::Migrator.should_receive(:migrate)
+          Apartment::Migrator.migrate(schema_name)
+        end
+      end
+  
+      describe "#run" do
+        context "up" do
+    
+          it "should connect to new db, then reset when done" do
+            ActiveRecord::Base.connection.should_receive(:schema_search_path=).with(schema_name).once
+            ActiveRecord::Base.connection.should_receive(:schema_search_path=).with(@original_schema).once
+            Apartment::Migrator.run(:up, schema_name, version)
+          end
+  
+          it "should migrate to a version" do
+            ActiveRecord::Migrator.should_receive(:run).with(:up, anything, version)
+            Apartment::Migrator.run(:up, schema_name, version)
+          end
+        end
+
+        describe "down" do
+    
+          it "should connect to new db, then reset when done" do
+            ActiveRecord::Base.connection.should_receive(:schema_search_path=).with(schema_name).once
+            ActiveRecord::Base.connection.should_receive(:schema_search_path=).with(@original_schema).once
+            Apartment::Migrator.run(:down, schema_name, version)
+          end
+
+          it "should migrate to a version" do
+            ActiveRecord::Migrator.should_receive(:run).with(:down, anything, version)
+            Apartment::Migrator.run(:down, schema_name, version)
+          end
+        end
+      end
+
+      describe "#rollback" do
+        let(:steps){ 3 }
+  
+        it "should rollback the db" do
+          ActiveRecord::Migrator.should_receive(:rollback).with(anything, steps)
+          Apartment::Migrator.rollback(schema_name, steps)
+        end
+      end
+    end
+  end
+  
+end

metadata

@@ -1,15 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: apartment
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 3
-  version: 0.1.3
+  prerelease: 
+  version: 0.5.0
 platform: ruby
 authors: 
 - Ryan Brunner
+- Brad Robertson
 autorequire: 
 bindir: bin
 cert_chain: []
@@ -18,104 +15,162 @@ date: 2011-04-18 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: activesupport
+  name: rails
+  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 3
-        - 5
-        version: 2.3.5
+        version: 3.0.8
   type: :runtime
-  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: shoulda
+  name: sqlite3
+  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
-  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: bundler
+  name: rspec
+  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
+        version: 2.6.0
   type: :development
-  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: jeweler
+  name: rspec-rails
+  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 5
-        - 1
-        version: 1.5.1
+        version: 2.6.1
   type: :development
-  prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: rcov
+  name: capybara
+  prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+        version: 1.0.0
   type: :development
-  prerelease: false
   version_requirements: *id005
-description: |-
-  Apartment allows Rails applications to deal with 
-  		       multitenancy.
-email: ryan@ryanbrunner.com
+- !ruby/object:Gem::Dependency 
+  name: pg
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.11.0
+  type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: silent-postgres
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.0.8
+  type: :development
+  version_requirements: *id007
+description: Apartment allows Rails applications to deal with database multitenancy
+email: 
+- ryan@ryanbrunner.com
+- bradleyrobertson@gmail.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- README.markdown
+extra_rdoc_files: []
+
 files: 
-- .bundle/config
-- .project
+- .gitignore
+- .rspec
+- .rvmrc
 - Gemfile
-- Gemfile.lock
-- README.markdown
+- HISTORY.md
+- README.md
 - Rakefile
-- VERSION
-- apartment-0.1.3.gem
 - apartment.gemspec
 - lib/apartment.rb
-- lib/apartment/associations/multi_tenant_association.rb
-- lib/apartment/config.rb
-- lib/apartment/config/default_config.yml
+- lib/apartment/adapters/abstract_adapter.rb
+- lib/apartment/adapters/mysql_adapter.rb
+- lib/apartment/adapters/postgresql_adapter.rb
 - lib/apartment/database.rb
+- lib/apartment/elevators/subdomain.rb
+- lib/apartment/migrator.rb
 - lib/apartment/railtie.rb
-- lib/tasks/multi_tenant_migrate.rake
-- pkg/apartment-0.1.3.gem
+- lib/apartment/version.rb
+- lib/tasks/apartment.rake
+- spec/apartment_spec.rb
+- spec/config/database.yml
+- spec/dummy/Rakefile
+- spec/dummy/app/controllers/application_controller.rb
+- spec/dummy/app/helpers/application_helper.rb
+- spec/dummy/app/models/company.rb
+- spec/dummy/app/models/user.rb
+- spec/dummy/app/views/application/index.html.erb
+- spec/dummy/app/views/layouts/application.html.erb
+- spec/dummy/config.ru
+- spec/dummy/config/application.rb
+- spec/dummy/config/boot.rb
+- spec/dummy/config/database.yml
+- spec/dummy/config/environment.rb
+- spec/dummy/config/environments/development.rb
+- spec/dummy/config/environments/production.rb
+- spec/dummy/config/environments/test.rb
+- spec/dummy/config/initializers/backtrace_silencers.rb
+- spec/dummy/config/initializers/inflections.rb
+- spec/dummy/config/initializers/mime_types.rb
+- spec/dummy/config/initializers/secret_token.rb
+- spec/dummy/config/initializers/session_store.rb
+- spec/dummy/config/locales/en.yml
+- spec/dummy/config/routes.rb
+- spec/dummy/db/migrate/20110613152810_create_dummy_models.rb
+- spec/dummy/db/schema.rb
+- spec/dummy/db/seeds.rb
+- spec/dummy/db/test.sqlite3
+- spec/dummy/log/development.log
+- spec/dummy/log/production.log
+- spec/dummy/log/server.log
+- spec/dummy/public/404.html
+- spec/dummy/public/422.html
+- spec/dummy/public/500.html
+- spec/dummy/public/favicon.ico
+- spec/dummy/public/stylesheets/.gitkeep
+- spec/dummy/script/rails
+- spec/integration/adapters/postgresql_integration_spec.rb
+- spec/integration/apartment_rake_integration_spec.rb
+- spec/integration/database_integration_spec.rb
+- spec/integration/middleware/subdomain_elevator_spec.rb
+- spec/integration/setup_spec.rb
+- spec/spec_helper.rb
+- spec/support/apartment_helpers.rb
+- spec/support/capybara_sessions.rb
+- spec/support/config.rb
+- spec/support/migrate.rb
+- spec/tasks/apartment_rake_spec.rb
+- spec/unit/config_spec.rb
+- spec/unit/middleware/subdomain_elevator_spec.rb
+- spec/unit/migrator_spec.rb
 has_rdoc: true
 homepage: http://github.com/ryanbrunner/apartment
 licenses: 
@@ -130,24 +185,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -190181027694817836
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: A Ruby gem for managing multitenancy in Rails applications
+summary: A Ruby gem for managing database multitenancy in Rails applications
 test_files: []
 

data/.bundle/config

@@ -1,2 +0,0 @@
---- 
-BUNDLE_DISABLE_SHARED_GEMS: "1"

data/.project

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>apartment</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>

data/Gemfile.lock

@@ -1,22 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activesupport (3.0.3)
-    git (1.2.5)
-    jeweler (1.5.1)
-      bundler (~> 1.0.0)
-      git (>= 1.2.5)
-      rake
-    rake (0.8.7)
-    rcov (0.9.9)
-    shoulda (2.11.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activesupport (>= 2.3.5)
-  bundler (~> 1.0.0)
-  jeweler (~> 1.5.1)
-  rcov
-  shoulda

data/VERSION

@@ -1 +0,0 @@
-0.1.3

data/lib/apartment/config.rb

@@ -1,10 +0,0 @@
-module Apartment
-	config = {:excluded_models => ["User"],
-						:use_postgres_schemas => true
-					 }		
-	
-	if File.exists? "config/apartment.yml"
-  	config = config.merge YAML.load_file "config/apartment.yml" 
-		Config = OpenStruct.new(config)
-	end									
-end

data/lib/apartment/config/default_config.yml

@@ -1,17 +0,0 @@
-# Apartment configuration
-
-# Excluded models
-# Indicate which models should be excluded from multi-tenancy. If you have information
-# that does not vary between databases, or information that should be considered global,
-# specify it here. Any classes involved in determining which database to access MUST be
-# specified here
-
-excluded_models: [User]
-
-# Postgres integration mode
-# By default, apartment switches databases in Postgres by changing the schema search path
-# of the current environment database. If preferred, this can be turned off and Postgres will
-# look in different databases for multi-tenanted models.
-
-use_postgres_schemas: true
-

data/lib/tasks/multi_tenant_migrate.rake

@@ -1,14 +0,0 @@
-namespace :apartment do
-	desc "Apply database changes to all multi-tenant databases"
-	task :migrate => :environment do |t, args|
-		
-		puts "[Migrating to default environment]"
-		ActiveRecord::Migrator.migrate(File.join(Rails.root, 'db', 'migrate'))
-		
-		Admin::Company.where("database is not null").select("distinct database").each do |u|
-			puts "[Migrating to #{u.database}]"
-			
-			Apartment::Database.migrate u.database 
-		end
-	end
-end