apartment 0.14.0 → 0.14.1

data/HISTORY.md

@@ -1,19 +1,29 @@
+# 0.14.1
+  * Dec 13, 2011
+
+  - Fix ActionDispatch::Callbacks deprecation warnings
+
+# 0.14.0
+  * Dec 13, 2011
+
+  - Rails 3.1 Support
+
 # 0.13.1
   * Nov 8, 2011
-  
+
   - Reset prepared statement cache for rails 3.1.1 before switching dbs when using postgresql schemas
     - Only necessary until the next release which will be more schema aware
 
 # 0.13.0
   * Oct 25, 2011
-  
+
   - `process` will now rescue with reset if the previous schema/db is no longer available
   - `create` now takes an optional block which allows you to process within the newly created db
   - Fixed Rails version >= 3.0.10 and < 3.1 because there have been significant testing problems with 3.1, next version will hopefully fix this
-  
+
 # 0.12.0
   * Oct 4, 2011
-  
+
   - Added a `drop` method for removing databases/schemas
   - Refactored abstract adapter to further remove duplication in concrete implementations
   - Excluded models now take string references so they are properly reloaded in development
@@ -21,7 +31,7 @@
 
 # 0.11.1
   * Sep 22, 2011
-  
+
   - Better use of Railties for initializing apartment
   - The following changes were necessary as I haven't figured out how to properly hook into Rails reloading
     - Added reloader middleware in development to init Apartment on each request
@@ -29,88 +39,88 @@
 
 # 0.11.0
   * Sep 20, 2011
-  
+
   - Excluded models no longer use a different connection when using postgresql schemas.  Instead their table_name is prefixed with `public.`
 
 # 0.10.3
   * Sep 20, 2011
-  
+
   - Fix improper raising of exceptions on create and reset
 
 # 0.10.2
   * Sep 15, 2011
-  
+
   - Remove all the annoying logging for loading db schema and seeding on create
 
 # 0.10.1
   * Aug 11, 2011
-  
+
   - Fixed bug in DJ where new objects (that hadn't been pulled from the db) didn't have the proper database assigned
 
 # 0.10.0
   * July 29, 2011
-  
+
   - Added better support for Delayed Job
   - New config option that enables Delayed Job wrappers
   - Note that DJ support uses a work-around in order to get queues stored in the public schema, not sure why it doesn't work out of the box, will look into it, until then, see documentation on queue'ng jobs
-  
+
 # 0.9.2
   * July 4, 2011
-  
+
   - Migrations now run associated rails migration fully, fixes schema.rb not being reloaded after migrations
 
 # 0.9.1
   * June 24, 2011
-  
+
   - Hooks now take the payload object as an argument to fetch the proper db for DJ hooks
 
 # 0.9.0
   * June 23, 2011
-  
+
   - Added module to provide delayed job hooks
 
 # 0.8.0
   * June 23, 2011
-  
+
   - Added #current_database which will return the current database (or schema) name
 
 # 0.7.0
   * June 22, 2011
-  
+
   - Added apartment:seed rake task for seeding all dbs
 
 # 0.6.0
   * June 21, 2011
-  
+
   - Added #process to connect to new db, perform operations, then ensure a reset
 
 # 0.5.1
   * June 21, 2011
-  
+
   - Fixed db migrate up/down/rollback
   - added db:redo
 
 # 0.5.0
   * June 20, 2011
-  
+
   - Added the concept of an "Elevator", a rack based strategy for db switching
   - Added the Subdomain Elevator middleware to enabled db switching based on subdomain
 
 # 0.4.0
   * June 14, 2011
-  
+
   - Added `configure` method on Apartment instead of using yml file, allows for dynamic setting of db names to migrate for rake task
   - Added `seed_after_create` config option to import seed data to new db on create
-  
+
 # 0.3.0
   * June 10, 2011
-  
+
   - Added full support for database migration
   - Added in method to establish new connection for excluded models on startup rather than on each switch
-    
+
 # 0.2.0
   * June 6, 2011 *
-  
+
   - Refactor to use more rails/active_support functionality
   - Refactor config to lazily load apartment.yml if exists
   - Remove OStruct and just use hashes for fetching methods

data/README.md

@@ -17,7 +17,10 @@ Add the following to your Gemfile:
 That's all you need to set up the Apartment libraries. If you want to switch databases 
 on a per-user basis, look under "Usage - Switching databases per request", below.
 
-*NOTE: If using [postgresl schemas](http://www.postgresql.org/docs/9.0/static/ddl-schemas.html) you must use Rails >= 3.0.10, it contains a [patch](https://github.com/rails/rails/pull/1607) that has better postgresql schema support*
+> NOTE: If using [postgresl schemas](http://www.postgresql.org/docs/9.0/static/ddl-schemas.html) you must use:
+>
+> * for Rails 3.0.x: _Rails ~> 3.0.10_, it contains a [patch](https://github.com/rails/rails/pull/1607) that has better postgresql schema support
+> * for Rails 3.1.x: _Rails ~> 3.1.2_, it contains a [patch](https://github.com/rails/rails/pull/3232) that makes prepared statements work with multiple schemas
 
 ## Usage
 

data/lib/apartment/adapters/postgresql_adapter.rb

@@ -1,61 +1,61 @@
 module Apartment
-  
+
   module Database
-    
+
     def self.postgresql_adapter(config)
-      Apartment.use_postgres_schemas ? 
+      Apartment.use_postgres_schemas ?
         Adapters::PostgresqlSchemaAdapter.new(config, :schema_search_path => ActiveRecord::Base.connection.schema_search_path) :
         Adapters::PostgresqlAdapter.new(config)
     end
-    
+
   end
-  
+
   module Adapters
-    
+
     # Default adapter when not using Postgresql Schemas
     class PostgresqlAdapter < AbstractAdapter
-      
+
     protected
-    
+
       #   Connect to new database
       #   Abstract adapter will catch generic ActiveRecord error
       #   Catch specific adapter errors here
-      # 
+      #
       #   @param {String} database Database name
-      # 
+      #
       def connect_to_new(database)
         super
-      rescue PGError => e
+      rescue PGError
         raise DatabaseNotFound, "Cannot find database #{environmentify(database)}"
       end
-      
+
     end
-    
+
     # Separate Adapter for Postgresql when using schemas
     class PostgresqlSchemaAdapter < AbstractAdapter
-      
+
       #   Get the current schema search path
-      # 
+      #
       #   @return {String} current schema search path
-      # 
+      #
       def current_database
         ActiveRecord::Base.connection.schema_search_path
       end
-      
+
       #   Drop the database schema
-      # 
+      #
       #   @param {String} database Database (schema) to drop
-      # 
+      #
       def drop(database)
         ActiveRecord::Base.connection.execute("DROP SCHEMA #{database} CASCADE")
-        
-      rescue ActiveRecord::StatementInvalid => e
+
+      rescue ActiveRecord::StatementInvalid
         raise SchemaNotFound, "The schema #{database.inspect} cannot be found."
       end
 
       #   Reset search path to default search_path
       #   Set the table_name to always use the public namespace for excluded models
-      # 
+      #
       def process_excluded_models
         Apartment.excluded_models.each do |excluded_model|
           # Note that due to rails reloading, we now take string references to classes rather than
@@ -64,9 +64,9 @@ module Apartment
             warn "[Deprecation Warning] Passing class references to excluded models is now deprecated, please use a string instead"
             excluded_model = excluded_model.name
           end
-          
+
           excluded_model.constantize.tap do |klass|
-            # some models (such as delayed_job) seem to load and cache their column names before this, 
+            # some models (such as delayed_job) seem to load and cache their column names before this,
             # so would never get the public prefix, so reset first
             klass.reset_column_information
 
@@ -78,11 +78,11 @@ module Apartment
           end
         end
       end
-      
+
       #   Reset schema search path to the default schema_search_path
-      # 
+      #
       #   @return {String} default schema search path
-      # 
+      #
       def reset
         ActiveRecord::Base.connection.schema_search_path = @defaults[:schema_search_path]
       end
@@ -90,25 +90,25 @@ module Apartment
     protected
 
       #   Set schema search path to new schema
-      # 
+      #
       def connect_to_new(database = nil)
         return reset if database.nil?
         ActiveRecord::Base.connection.schema_search_path = database
 
-      rescue ActiveRecord::StatementInvalid => e
+      rescue ActiveRecord::StatementInvalid
         raise SchemaNotFound, "The schema #{database.inspect} cannot be found."
       end
 
       #   Create the new schema
-      # 
+      #
       def create_database(database)
         ActiveRecord::Base.connection.execute("CREATE SCHEMA #{database}")
 
-      rescue ActiveRecord::StatementInvalid => e
+      rescue ActiveRecord::StatementInvalid
         raise SchemaExists, "The schema #{database} already exists."
       end
-      
+
     end
-    
+
   end
 end

data/lib/apartment/console.rb

@@ -5,7 +5,7 @@
 def reload!(print=true)
   puts "Reloading..." if print
   # This triggers the to_prepare callbacks
-  ActionDispatch::Callbacks.new(Proc.new {}, false).call({})
+  ActionDispatch::Callbacks.new(Proc.new {}).call({})
   # Manually init Apartment again once classes are reloaded
   Apartment::Database.init
   true

data/lib/apartment/reloader.rb

@@ -1,22 +1,24 @@
 module Apartment
-  
+
   class Reloader
-    
+
     #   Middleware used in development to init Apartment for each request
-    #   Necessary due to code reload (annoying).  I couldn't figure out how to properly hook into
-    #   the Rails reload process *after* files are reloaded, so I've used this in the meantime.
-    # 
+    #   Necessary due to code reload (annoying).  When models are reloaded, they no longer have the proper table_name
+    #   That is prepended with the schema (if using postgresql schemas)
+    #   I couldn't figure out how to properly hook into the Rails reload process *after* files are reloaded
+    #   so I've used this in the meantime.
+    #
     #   Also see apartment/console for the re-definition of reload! that re-init's Apartment
-    # 
+    #
     def initialize(app)
       @app = app
     end
-    
+
     def call(env)
       Database.init
       @app.call(env)
     end
-    
+
   end
-  
+
 end

data/lib/apartment/version.rb

@@ -1,3 +1,3 @@
 module Apartment
-  VERSION = "0.14.0"
+  VERSION = "0.14.1"
 end

metadata

@@ -2,7 +2,7 @@
 name: apartment
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.14.0
+  version: 0.14.1
 platform: ruby
 authors: 
 - Ryan Brunner
@@ -225,7 +225,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 538032595049641835
+      hash: -3913333331910434381
       segments: 
       - 0
       version: "0"
@@ -234,7 +234,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 538032595049641835
+      hash: -3913333331910434381
       segments: 
       - 0
       version: "0"