apartment 0.17.1 → 0.17.2

data/Rakefile

@@ -44,7 +44,7 @@ namespace :postgres do
 
   desc 'Build the PostgreSQL test databases'
   task :build_db do
-    %x{ createdb -E UTF8 #{pg_config['database']} -Upostgres } rescue "test db already exists"
+    %x{ createdb -E UTF8 #{pg_config['database']} -U#{pg_config['username']} } rescue "test db already exists"
     ActiveRecord::Base.establish_connection pg_config
     ActiveRecord::Migrator.migrate('spec/dummy/db/migrate')
   end
@@ -52,7 +52,7 @@ namespace :postgres do
   desc "drop the PostgreSQL test database"
   task :drop_db do
     puts "dropping database #{pg_config['database']}"
-    %x{ dropdb #{pg_config['database']} -Upostgres }
+    %x{ dropdb #{pg_config['database']} -U#{pg_config['username']} }
   end
 
 end
@@ -63,7 +63,7 @@ namespace :mysql do
 
   desc 'Build the MySQL test databases'
   task :build_db do
-    %x{ mysqladmin -u root create #{my_config['database']} } rescue "test db already exists"
+    %x{ mysqladmin -u #{my_config['username']} create #{my_config['database']} } rescue "test db already exists"
     ActiveRecord::Base.establish_connection my_config
     ActiveRecord::Migrator.migrate('spec/dummy/db/migrate')
   end
@@ -71,7 +71,7 @@ namespace :mysql do
   desc "drop the MySQL test database"
   task :drop_db do
     puts "dropping database #{my_config['database']}"
-    %x{ mysqladmin -u root drop #{my_config['database']} --force}
+    %x{ mysqladmin -u #{my_config['username']} drop #{my_config['database']} --force}
   end
 
 end

data/lib/apartment.rb

@@ -14,6 +14,11 @@ module Apartment
       yield self if block_given?
     end
 
+    # Default switch schema to public
+    def schema_to_switch
+      @schema_to_switch || "public"
+    end
+
     # Be careful not to use `return` here so both Proc and lambda can be used without breaking
     def database_names
       @database_names.respond_to?(:call) ? @database_names.call : @database_names
@@ -50,7 +55,8 @@ module Apartment
 
   module Elevators
     autoload :Generic,    'apartment/elevators/generic'
-    autoload :Subdomain,  'apartment/elevators/subdomain'
+    autoload :Subdomain,      'apartment/elevators/subdomain'
+    autoload :FirstSubdomain, 'apartment/elevators/first_subdomain'
     autoload :Domain,     'apartment/elevators/domain'
   end
 

data/lib/apartment/adapters/postgresql_adapter.rb

@@ -92,7 +92,7 @@ module Apartment
         ActiveRecord::Base.connection.schema_search_path = full_search_path
 
       rescue ActiveRecord::StatementInvalid
-        raise SchemaNotFound, "The schema #{database.inspect} cannot be found."
+        raise SchemaNotFound, "One of the following schema(s) is invalid: #{new_search_path}"
       end
 
       #   Create the new schema

data/lib/apartment/elevators/first_subdomain.rb

@@ -0,0 +1,13 @@
+module Apartment
+  module Elevators
+    # Provides a rack based db switching solution based on subdomains
+    # Assumes that database name should match subdomain
+    class FirstSubdomain < Subdomain
+
+      def parse_database_name(request)
+        super(request).match(/(\w+)(\.\w+)?/)[1]
+      end
+
+    end
+  end
+end

data/lib/apartment/version.rb

@@ -1,3 +1,3 @@
 module Apartment
-  VERSION = "0.17.1"
+  VERSION = "0.17.2"
 end

data/spec/examples/schema_adapter_examples.rb

@@ -148,7 +148,50 @@ shared_examples_for "a schema based apartment adapter" do
 
     it "should reset connection if database is nil" do
       subject.switch
-      connection.schema_search_path.should == public_schema
+      connection.schema_search_path.should include public_schema
+    end
+
+    describe "other schemas in search path" do
+      let(:other_schema) { "other_schema" }
+      before do
+        subject.create(other_schema)
+        @old_schema = subject.instance_variable_get(:@defaults)[:schema_search_path]
+        subject.instance_variable_get(:@defaults)[:schema_search_path] += "," + other_schema
+      end
+
+      it "should maintain other schemas on switch" do
+        subject.switch(schema1)
+        connection.schema_search_path.should include other_schema
+      end
+
+      after do
+        subject.instance_variable_get(:@defaults)[:schema_search_path] = @old_schema
+        subject.drop(other_schema)
+      end
+
+      describe "with schema_to_switch specified" do
+        before do
+          Apartment.schema_to_switch = other_schema
+          subject.switch(schema1)
+        end
+
+        after do
+          # Reset the switch schema.
+          Apartment.schema_to_switch = nil
+        end
+
+        it "should switch out the schema to switch rather than public" do
+          connection.schema_search_path.should_not include other_schema
+        end
+
+        it "should retain the public schema" do
+          connection.schema_search_path.should include "public"
+        end
+
+        it "should still switch to the switched schema" do
+          connection.schema_search_path.should include schema1
+        end
+      end
     end
 
     it "should raise an error if schema is invalid" do
@@ -214,4 +257,6 @@ shared_examples_for "a schema based apartment adapter" do
     end
   end
 
+
+
 end

data/spec/integration/middleware/first_subdomain_elevator_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe Apartment::Elevators::FirstSubdomain do
+  describe "subdomain" do
+    subject { described_class.new("test").parse_database_name(request) }
+    let(:request) { double(:request, :subdomain => subdomain)}
+
+    context "one subdomain" do
+      let(:subdomain) { "test" }
+      it { should == "test" }
+    end
+
+    context "nested subdomains" do
+      let(:subdomain) { "test1.test2" }
+      it { should == "test1" }
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apartment
 version: !ruby/object:Gem::Version
-  version: 0.17.1
+  version: 0.17.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-30 00:00:00.000000000 Z
+date: 2012-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -251,6 +251,7 @@ files:
 - lib/apartment/delayed_job/hooks.rb
 - lib/apartment/delayed_job/requirements.rb
 - lib/apartment/elevators/domain.rb
+- lib/apartment/elevators/first_subdomain.rb
 - lib/apartment/elevators/generic.rb
 - lib/apartment/elevators/subdomain.rb
 - lib/apartment/migrator.rb
@@ -310,6 +311,7 @@ files:
 - spec/integration/apartment_rake_integration_spec.rb
 - spec/integration/delayed_job_integration_spec.rb
 - spec/integration/middleware/domain_elevator_spec.rb
+- spec/integration/middleware/first_subdomain_elevator_spec.rb
 - spec/integration/middleware/generic_elevator_spec.rb
 - spec/integration/middleware/subdomain_elevator_spec.rb
 - spec/spec_helper.rb
@@ -339,7 +341,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4170403971247658822
+      hash: 3706391324035318111
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -348,7 +350,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4170403971247658822
+      hash: 3706391324035318111
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24