apartment 0.10.0 → 0.10.1

data/HISTORY.md

@@ -1,5 +1,10 @@
+# 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, 2001
+  * July 29, 2011
   
   - Added better support for Delayed Job
   - New config option that enables Delayed Job wrappers

data/lib/apartment/database.rb

@@ -37,19 +37,19 @@ module Apartment
 	      @config = nil
       end
       
-  		private
-  		
-  		  def connect_exclusions
-  		    # Establish a connection for each specific excluded model
-          # Thus all other models will shared a connection (at ActiveRecord::Base) and we can modify at will
-    	    Apartment.excluded_models.each do |excluded_model|
-    				excluded_model.establish_connection config
-    			end
-        end
-      
-        def config
-          @config ||= Rails.configuration.database_configuration[Rails.env].symbolize_keys
-        end
+		private
+		
+		  def connect_exclusions
+		    # Establish a connection for each specific excluded model
+        # Thus all other models will shared a connection (at ActiveRecord::Base) and we can modify at will
+  	    Apartment.excluded_models.each do |excluded_model|
+  				excluded_model.establish_connection config
+  			end
+      end
+    
+      def config
+        @config ||= Rails.configuration.database_configuration[Rails.env].symbolize_keys
+      end
     end
 	    					
 	end

data/lib/apartment/delayed_job/hooks.rb

@@ -6,6 +6,7 @@ module Apartment
       
       # Before and after hooks for performing Delayed Jobs within a particular apartment database
       # Include these in your delayed jobs models and make sure provide a @database attr that will be serialized by DJ
+      # Note also that any models that are being serialized need the Apartment::Delayed::Requirements module mixed in to it
       module Hooks
         
         attr_accessor :database

data/lib/apartment/delayed_job/requirements.rb

@@ -3,12 +3,13 @@ require 'apartment/delayed_job/enqueue'
 module Apartment
   module Delayed
     
-    # Mix this module into any model that gets serialized by DJ
+    # Mix this module into any ActiveRecord model that gets serialized by DJ
     module Requirements
       attr_accessor :database
       
       def self.included(klass)
-        klass.after_find :set_database
+        klass.after_find :set_database      # set db when records are pulled so they deserialize properly
+        klass.before_save :set_database     # set db before records are saved so that they also get deserialized properly 
       end
       
     private

data/lib/apartment/version.rb

@@ -1,3 +1,3 @@
 module Apartment
-  VERSION = "0.10.0"
+  VERSION = "0.10.1"
 end

data/spec/dummy/db/migrate/20110613152810_create_dummy_models.rb

@@ -12,16 +12,16 @@ class CreateDummyModels < ActiveRecord::Migration
      end
      
      create_table :delayed_jobs do |t|
-       t.integer  "priority",   :default => 0
-       t.integer  "attempts",   :default => 0
-       t.text     "handler"
-       t.text     "last_error"
-       t.datetime "run_at"
-       t.datetime "locked_at"
-       t.datetime "failed_at"
-       t.string   "locked_by"
-       t.datetime "created_at"
-       t.datetime "updated_at"
+       t.integer  :priority,   :default => 0
+       t.integer  :attempts,   :default => 0
+       t.text     :handler
+       t.text     :last_error
+       t.datetime :run_at
+       t.datetime :locked_at
+       t.datetime :failed_at
+       t.string   :locked_by
+       t.datetime :created_at
+       t.datetime :updated_at
      end
 
      add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority"
@@ -31,5 +31,6 @@ class CreateDummyModels < ActiveRecord::Migration
   def self.down
     drop_table :companies
     drop_table :users
+    drop_table :delayed_jobs
   end
 end

data/spec/integration/delayed_job_integration_spec.rb

@@ -68,7 +68,7 @@ describe Apartment::Delayed do
       user.database.should == database
     end
     
-    it "should not overwrite any previous after_initialize declarations" do      
+    it "should not overwrite any previous after_initialize declarations" do
       User.class_eval do
         after_find :set_name
         
@@ -82,6 +82,11 @@ describe Apartment::Delayed do
       user.name.should == "Some Name"
     end
     
+    it "should set the db on a new record before it saves" do
+      user = User.create
+      user.database.should == database
+    end
+    
     context "serialization" do
       it "should serialize the proper database attribute" do
         user_yaml = User.first.to_yaml

data/spec/integration/middleware/subdomain_elevator_spec.rb

@@ -32,11 +32,11 @@ describe Apartment::Elevators::Subdomain do
     before do
       Apartment::Database.create(company2.subdomain)
       # Create some users for each db
-      Apartment::Test.in_database(company.subdomain) do
+      Apartment::Database.process(company.subdomain) do
         @c1_user_count = (2 + rand(2)).times{ User.create }
       end
       
-      Apartment::Test.in_database(company2.subdomain) do
+      Apartment::Database.process(company2.subdomain) do
         @c2_user_count = (@c1_user_count + 2).times{ User.create }
       end
     end

data/spec/spec_helper.rb

@@ -8,7 +8,6 @@ require "rspec/rails"
 require 'capybara/rspec'
 require 'capybara/rails'
 
-
 ActionMailer::Base.delivery_method = :test
 ActionMailer::Base.perform_deliveries = true
 ActionMailer::Base.default_url_options[:host] = "test.com"

data/spec/support/apartment_helpers.rb

@@ -1,27 +1,32 @@
 module Apartment
   module Test
-    def self.reset
+    
+    extend self
+    
+    def reset
       Apartment::Database.instance_variable_set :@initialized, nil
       Apartment.excluded_models = nil
       Apartment.use_postgres_schemas = nil
     end
     
-    def self.drop_schema(schema)
+    def drop_schema(schema)
       ActiveRecord::Base.silence{ ActiveRecord::Base.connection.execute("DROP SCHEMA IF EXISTS #{schema} CASCADE") }
     end
     
-    def self.create_schema(schema)
+    def create_schema(schema)
       ActiveRecord::Base.connection.execute("CREATE SCHEMA #{schema}")
     end
     
-    def self.load_schema
+    def load_schema
       load "#{Rails.root}/db/schema.rb"
     end
     
-    def self.in_database(db)
-      Apartment::Database.switch db
-      yield if block_given?
-      Apartment::Database.reset
+    def migrate
+      ActiveRecord::Migrator.migrate(Rails.root + ActiveRecord::Migrator.migrations_path)
+    end
+    
+    def rollback
+      ActiveRecord::Migrator.rollback(Rails.root + ActiveRecord::Migrator.migrations_path)
     end
     
   end

metadata

@@ -2,7 +2,7 @@
 name: apartment
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors: 
 - Ryan Brunner
@@ -183,7 +183,6 @@ files:
 - 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
@@ -202,7 +201,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3391988953711779455
+      hash: 2437262217849019999
       segments: 
       - 0
       version: "0"
@@ -211,7 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3391988953711779455
+      hash: 2437262217849019999
       segments: 
       - 0
       version: "0"

data/spec/support/migrate.rb

@@ -1,9 +0,0 @@
-module Apartment
-  
-  module Test
-    
-    def self.migrate
-      ActiveRecord::Migrator.migrate Rails.root + ActiveRecord::Migrator.migrations_path
-    end
-  end
-end