apartment 0.7.0 → 0.8.0

data/HISTORY.md

@@ -1,3 +1,8 @@
+# 0.8.0
+  * June 23, 2011
+  
+  - Added #current_database which will return the current database (or schema) name
+
 # 0.7.0
   * June 22, 2011
   

data/lib/apartment/adapters/abstract_adapter.rb

@@ -15,16 +15,15 @@ module Apartment
         @defaults = defaults
       end
       
-      #   Connect to db or schema, do stuff, reset
+      #   Connect to db or schema, do stuff, reset (equivalent to a switch... do stuff... reset)
       # 
       #   @param {String} database Database or schema to connect to
-      def connect_and_reset(database)
+      def process(database)
 		    connect_to_new(database)
 		    yield if block_given?
 		  ensure
   		  reset
 	    end
-	    alias_method :process, :connect_and_reset     # more succinct name
       
       #   Create new postgres schema
       # 
@@ -32,7 +31,7 @@ module Apartment
   		def create(database)
         # TODO create_database unless using_schemas?
 
-  			connect_and_reset(database) do
+  			process(database) do
     			import_database_schema
 
     			# Manually init schema migrations table (apparently there were issues with Postgres when this isn't done)
@@ -61,6 +60,11 @@ module Apartment
       end
 	    alias_method :seed, :seed_data
       
+      # Return the current database name
+      def current_database
+        ActiveRecord::Base.connection.current_database
+      end
+      
       protected
       
         def create_schema

data/lib/apartment/adapters/postgresql_adapter.rb

@@ -3,7 +3,7 @@ module Apartment
   module Database
     
     def self.postgresql_adapter(config)
-      Adapters::PostgresqlAdapter.new config, :schema_search_path => ActiveRecord::Base.connection.schema_search_path
+      Adapters::PostgresqlAdapter.new config, :schema_search_path => ActiveRecord::Base.connection.schema_search_path   # this is the initial search path before any switches happen
     end
   end
   
@@ -14,7 +14,6 @@ module Apartment
       # Set schema path or connect to new db
 	    def connect_to_new(database)	      
     		return ActiveRecord::Base.connection.schema_search_path = database if using_schemas?
-
 			  super
       rescue ActiveRecord::StatementInvalid => e
         raise SchemaNotFound, e
@@ -28,12 +27,14 @@ module Apartment
       end
 			
 			def reset
-			  if using_schemas?
-    		  ActiveRecord::Base.connection.schema_search_path = @defaults[:schema_search_path]
-  		  else
-  		    super
-		    end
+    		return ActiveRecord::Base.connection.schema_search_path = @defaults[:schema_search_path] if using_schemas?
+		    super
   	  end
+  	  
+  	  def current_database
+  	    return ActiveRecord::Base.connection.schema_search_path if using_schemas?
+  	    super
+	    end
       
       protected
       

data/lib/apartment/database.rb

@@ -1,26 +1,19 @@
-require 'active_support/core_ext/string/inflections'    # for `constantize`
+require 'active_support/core_ext/module/delegation'
 
 module Apartment
 	module Database
 	  
-	  MULTI_TENANT_METHODS = [:create, :switch, :reset, :connect_and_reset, :process, :seed]
-	  
 	  class << self
 
+      # pass these methods to our adapter
+      delegate :create, :switch, :reset, :process, :seed, :current_database, :to => :adapter
+
       # Call init to establish a connection to the public schema on all excluded models
       # This must be done before creating any new schemas or switching
   	  def init
   	    connect_exclusions
       end
       
-      MULTI_TENANT_METHODS.each do |method|
-        class_eval <<-RUBY
-          def #{method}(*args, &block)
-            adapter.send(:#{method}, *args, &block)
-          end
-        RUBY
-      end
-      
       def adapter
 		    @adapter ||= begin
   		    adapter_method = "#{config[:adapter]}_adapter"

data/lib/apartment/migrator.rb

@@ -6,17 +6,17 @@ module Apartment
   
     # Migrate to latest
 		def migrate(database)
-			Database.connect_and_reset(database){ ActiveRecord::Migrator.migrate(ActiveRecord::Migrator.migrations_path) }
+			Database.process(database){ ActiveRecord::Migrator.migrate(ActiveRecord::Migrator.migrations_path) }
 		end
 	
     # Migrate up/down to a specific version
 		def run(direction, database, version)
-		  Database.connect_and_reset(database){ ActiveRecord::Migrator.run(direction, ActiveRecord::Migrator.migrations_path, version) }
+		  Database.process(database){ ActiveRecord::Migrator.run(direction, ActiveRecord::Migrator.migrations_path, version) }
 	  end
   
     # rollback latest migration `step` number of times
 		def rollback(database, step = 1)
-		  Database.connect_and_reset(database){ ActiveRecord::Migrator.rollback(ActiveRecord::Migrator.migrations_path, step) }
+		  Database.process(database){ ActiveRecord::Migrator.rollback(ActiveRecord::Migrator.migrations_path, step) }
 	  end
   end
 	  

data/lib/apartment/version.rb

@@ -1,3 +1,3 @@
 module Apartment
-  VERSION = "0.7.0"
+  VERSION = "0.8.0"
 end

data/spec/integration/adapters/postgresql_integration_spec.rb

@@ -8,6 +8,10 @@ describe Apartment::Adapters::PostgresqlAdapter do
     @pg = Apartment::Database.postgresql_adapter Apartment::Test.config['connections']['postgresql'].symbolize_keys
   end
   
+  after do
+    ActiveRecord::Base.clear_all_connections!
+  end
+  
   context "using schemas" do
   
     let(:schema1){ 'first_db_schema' }
@@ -36,15 +40,15 @@ describe Apartment::Adapters::PostgresqlAdapter do
       end
     end
     
-    describe "#connect_and_reset" do
+    describe "#process" do
       it "should connect" do
-        @pg.connect_and_reset(schema1) do
+        @pg.process(schema1) do
           ActiveRecord::Base.connection.schema_search_path.should == schema1
         end
       end
       
       it "should reset" do
-        @pg.connect_and_reset(schema1)
+        @pg.process(schema1)
         ActiveRecord::Base.connection.schema_search_path.should == schema_search_path
       end
     end
@@ -69,5 +73,12 @@ describe Apartment::Adapters::PostgresqlAdapter do
       end
     end
     
+    describe "#current_database" do
+      it "should return the current schema name" do
+        @pg.switch(schema1)
+        @pg.current_database.should == schema1
+      end
+    end
+    
   end
 end

data/spec/integration/apartment_rake_integration_spec.rb

@@ -4,7 +4,7 @@ require 'rake'
 describe "apartment rake tasks" do
   
   before :all do
-    Apartment::Test.migrate   # ensure we have latest db
+    Apartment::Test.migrate   # ensure we have latest schema in the public 
   end
   
   before do

data/spec/integration/database_integration_spec.rb

@@ -113,6 +113,14 @@ describe Apartment::Database do
         end
       end
       
+      describe "#current_database" do
+        
+        it "should return the current schema search path" do
+          Apartment::Database.switch database
+          Apartment::Database.current_database.should == database
+        end
+      end
+      
     end
     
   end

data/spec/support/apartment_helpers.rb

@@ -7,7 +7,7 @@ module Apartment
     end
     
     def self.drop_schema(schema)
-      ActiveRecord::Base.connection.execute("DROP SCHEMA IF EXISTS #{schema} CASCADE")
+      ActiveRecord::Base.silence{ ActiveRecord::Base.connection.execute("DROP SCHEMA IF EXISTS #{schema} CASCADE") }
     end
     
     def self.create_schema(schema)

metadata

@@ -2,7 +2,7 @@
 name: apartment
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors: 
 - Ryan Brunner
@@ -185,7 +185,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1175145384606930711
+      hash: -2374879157766889848
       segments: 
       - 0
       version: "0"
@@ -194,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1175145384606930711
+      hash: -2374879157766889848
       segments: 
       - 0
       version: "0"