apartment 0.14.2 → 0.14.3

data/HISTORY.md

@@ -1,3 +1,8 @@
+# 0.14.3
+  * Feb 21, 2012
+
+  - Fix yaml serialization of non DJ models
+
 # 0.14.2
   * Feb 21, 2012
 

data/lib/apartment.rb

@@ -1,69 +1,69 @@
 require 'apartment/railtie' if defined?(Rails)
 
 module Apartment
-  
+
   class << self
     attr_accessor :use_postgres_schemas, :seed_after_create, :prepend_environment
     attr_writer :database_names, :excluded_models
-    
+
     # configure apartment with available options
     def configure
       yield self if block_given?
     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
     end
-    
+
     # Default to none
     def excluded_models
       @excluded_models || []
     end
-    
+
   end
-  
+
   autoload :Database, 'apartment/database'
   autoload :Migrator, 'apartment/migrator'
   autoload :Reloader, 'apartment/reloader'
-  
+
   module Adapters
     autoload :AbstractAdapter, 'apartment/adapters/abstract_adapter'
     # Specific adapters will be loaded dynamically based on adapter in config
   end
-  
+
   module Elevators
     autoload :Subdomain, 'apartment/elevators/subdomain'
   end
-  
+
   module Delayed
-    
+
     autoload :Requirements, 'apartment/delayed_job/requirements'
-    
+
     module Job
       autoload :Hooks, 'apartment/delayed_job/hooks'
     end
   end
-  
+
   # Exceptions
   class ApartmentError < StandardError; end
-  
+
   # Raised when apartment cannot find the adapter specified in <tt>config/database.yml</tt>
   class AdapterNotFound < ApartmentError; end
-  
+
   # Raised when database cannot find the specified database
   class DatabaseNotFound < ApartmentError; end
-  
+
   # Raised when trying to create a database that already exists
   class DatabaseExists < ApartmentError; end
-  
+
   # Raised when database cannot find the specified schema
   class SchemaNotFound < ApartmentError; end
-  
+
   # Raised when trying to create a schema that already exists
   class SchemaExists < ApartmentError; end
-  
+
   # Raised when an ActiveRecord object does not have the required database field on it
   class DJSerializationError < ApartmentError; end
-  
+
 end

data/lib/apartment/delayed_job/active_record.rb

@@ -15,7 +15,7 @@ module ActiveRecord
     # Rails > 3.0 now uses encode_with to determine what to encode with yaml
     # @override to include database attribute
     def encode_with_with_database(coder)
-      coder['database'] = database
+      coder['database'] = @database if @database.present?
       encode_with_without_database(coder)
     end
     alias_method_chain :encode_with, :database

data/lib/apartment/delayed_job/enqueue.rb

@@ -4,17 +4,17 @@ require 'apartment/delayed_job/active_record'   # ensure that our AR hooks are l
 module Apartment
   module Delayed
     module Job
-      
+
       # Will enqueue a job ensuring that it happens within the main 'public' database
-      # 
+      #
       # Note that this should not longer be required for versions >= 0.11.0 when using postgresql schemas
-      # 
+      #
       def self.enqueue(payload_object, options = {})
         Apartment::Database.process do
           ::Delayed::Job.enqueue(payload_object, options)
         end
       end
-      
+
     end
   end
 end

data/lib/apartment/delayed_job/requirements.rb

@@ -1,4 +1,4 @@
-require 'apartment/delayed_job/enqueue'
+require 'apartment/delayed_job/active_record'   # ensure that our AR hooks are loaded when queueing
 
 module Apartment
   module Delayed

data/lib/apartment/elevators/subdomain.rb

@@ -3,25 +3,25 @@ module Apartment
     # Provides a rack based db switching solution based on subdomains
     # Assumes that database name should match subdomain
     class Subdomain
-      
+
       def initialize(app)
         @app = app
       end
-      
+
       def call(env)
         request = ActionDispatch::Request.new(env)
-        
+
         database = subdomain(request)
-        
+
         Apartment::Database.switch database if database
-        
+
         @app.call(env)
       end
-      
+
       def subdomain(request)
         request.subdomain.present? && request.subdomain || nil
       end
-      
+
     end
   end
 end

data/lib/apartment/migrator.rb

@@ -1,23 +1,23 @@
 module Apartment
-  
+
   module Migrator
-    
+
     extend self
-  
+
     # Migrate to latest
     def migrate(database)
       Database.process(database){ ActiveRecord::Migrator.migrate(ActiveRecord::Migrator.migrations_path) }
     end
-  
+
     # Migrate up/down to a specific version
     def run(direction, database, 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.process(database){ ActiveRecord::Migrator.rollback(ActiveRecord::Migrator.migrations_path, step) }
     end
   end
-    
+
 end

data/lib/apartment/railtie.rb

@@ -2,11 +2,11 @@ require 'rails'
 
 module Apartment
   class Railtie < Rails::Railtie
-    
-    # 
+
+    #
     #   Set up our default config options
     #   Do this before the app initializers run so we don't override custom settings
-    # 
+    #
     config.before_initialize do
       Apartment.configure do |config|
         config.excluded_models = []
@@ -16,39 +16,39 @@ module Apartment
         config.prepend_environment = true
       end
     end
-    
+
     #   Hook into ActionDispatch::Reloader to ensure Apartment is properly initialized
     #   Note that this doens't entirely work as expected in Development, because this is called before classes are reloaded
     #   See the above middleware/console declarations below to help with this.  Hope to fix that soon.
-    # 
+    #
     config.to_prepare do
       Apartment::Database.init
     end
-    
-    # 
+
+    #
     #   Ensure rake tasks are loaded
-    # 
+    #
     rake_tasks do
       load 'tasks/apartment.rake'
     end
-    
-    # 
+
+    #
     #   The following initializers are a workaround to the fact that I can't properly hook into the rails reloader
     #   Note this is technically valid for any environment where cache_classes is false, for us, it's just development
-    # 
+    #
     if Rails.env.development?
-      
+
       # Apartment::Reloader is middleware to initialize things properly on each request to dev
       initializer 'apartment.init' do |app|
         app.config.middleware.use "Apartment::Reloader"
       end
-    
+
       # Overrides reload! to also call Apartment::Database.init as well so that the reloaded classes have the proper table_names
       console do
         require 'apartment/console'
       end
-      
+
     end
-    
+
   end
 end

data/lib/apartment/version.rb

@@ -1,3 +1,3 @@
 module Apartment
-  VERSION = "0.14.2"
+  VERSION = "0.14.3"
 end

data/spec/apartment_spec.rb

@@ -4,7 +4,7 @@ describe Apartment do
   it "should be valid" do
     Apartment.should be_a(Module)
   end
-  
+
   it "should be a valid app" do
     ::Rails.application.should be_a(Dummy::Application)
   end

data/spec/integration/delayed_job_integration_spec.rb

@@ -30,31 +30,6 @@ describe Apartment::Delayed do
     Apartment::Test.reset
   end
 
-  describe Apartment::Delayed::Job do
-    context "#enqueue" do
-
-      before do
-        Apartment::Database.reset
-      end
-
-      it "should queue up jobs in the public schema" do
-        dj_count = Delayed::Job.count
-        Apartment::Database.switch database
-        Apartment::Delayed::Job.enqueue FakeDjClass.new
-        Apartment::Database.reset
-
-        Delayed::Job.count.should == dj_count + 1
-      end
-
-      it "should not queue jobs in the current schema" do
-        Apartment::Database.switch database
-        expect {
-          Apartment::Delayed::Job.enqueue FakeDjClass.new
-        }.to_not change(Delayed::Job, :count)        # because we will still be on the `database` schema, not public
-      end
-    end
-  end
-
   describe Apartment::Delayed::Requirements do
 
     before do

data/spec/unit/config_spec.rb

@@ -1,29 +1,29 @@
 require 'spec_helper'
 
 describe Apartment do
-  
+
   describe "#config" do
-    
+
     let(:excluded_models){ [Company] }
-    
+
     after do
       Apartment::Test.reset
     end
-    
+
     it "should yield the Apartment object" do
       Apartment.configure do |config|
         config.excluded_models = []
         config.should == Apartment
       end
     end
-    
+
     it "should set excluded models" do
       Apartment.configure do |config|
         config.excluded_models = excluded_models
       end
       Apartment.excluded_models.should == excluded_models
     end
-    
+
     it "should set postgres_schemas" do
       Apartment.configure do |config|
         config.excluded_models = []
@@ -31,7 +31,7 @@ describe Apartment do
       end
       Apartment.use_postgres_schemas.should be_false
     end
-    
+
     it "should set seed_after_create" do
       Apartment.configure do |config|
         config.excluded_models = []
@@ -39,40 +39,40 @@ describe Apartment do
       end
       Apartment.seed_after_create.should be_true
     end
-    
+
     context "databases" do
       it "should return object if it doesnt respond_to call" do
         database_names = ['users', 'companies']
-        
+
         Apartment.configure do |config|
           config.excluded_models = []
           config.database_names = database_names
         end
         Apartment.database_names.should == database_names
       end
-      
+
       it "should invoke the proc if appropriate" do
         database_names = lambda{ ['users', 'users'] }
         database_names.should_receive(:call)
-        
+
         Apartment.configure do |config|
           config.excluded_models = []
           config.database_names = database_names
         end
         Apartment.database_names
       end
-      
+
       it "should return the invoked proc if appropriate" do
         dbs = lambda{ Company.scoped }
-        
+
         Apartment.configure do |config|
           config.excluded_models = []
           config.database_names = dbs
         end
-        
+
         Apartment.database_names.should == Company.scoped
       end
     end
-    
+
   end
 end

data/spec/unit/migrator_spec.rb

@@ -1,57 +1,57 @@
 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)
@@ -59,7 +59,7 @@ describe Apartment::Migrator do
         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
@@ -75,7 +75,7 @@ describe Apartment::Migrator do
 
       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)
@@ -83,5 +83,5 @@ describe Apartment::Migrator do
       end
     end
   end
-  
+
 end

data/spec/unit/reloader_spec.rb

@@ -1,22 +1,22 @@
 require 'spec_helper'
 
 describe Apartment::Reloader do
-  
+
   context "using postgresql schemas" do
-    
+
     before do
       Apartment.excluded_models = ["Company"]
       Company.reset_table_name  # ensure we're clean
     end
-    
+
     subject{ Apartment::Reloader.new(mock("Rack::Application", :call => nil)) }
-    
+
     it "should initialize apartment when called" do
       Company.table_name.should_not include('public.')
       subject.call(mock('env'))
       Company.table_name.should include('public.')
     end
   end
-  
-  
+
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apartment
 version: !ruby/object:Gem::Version
-  version: 0.14.2
+  version: 0.14.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-21 00:00:00.000000000Z
+date: 2012-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2155984060 !ruby/object:Gem::Requirement
+  requirement: &2152184980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 3.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *2155984060
+  version_requirements: *2152184980
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2155981900 !ruby/object:Gem::Requirement
+  requirement: &2152183300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *2155981900
+  version_requirements: *2152183300
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2155980140 !ruby/object:Gem::Requirement
+  requirement: &2152182600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2155980140
+  version_requirements: *2152182600
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2155978440 !ruby/object:Gem::Requirement
+  requirement: &2152181680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *2155978440
+  version_requirements: *2152181680
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2155928900 !ruby/object:Gem::Requirement
+  requirement: &2152177640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *2155928900
+  version_requirements: *2152177640
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &2155927460 !ruby/object:Gem::Requirement
+  requirement: &2152176580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -77,10 +77,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2155927460
+  version_requirements: *2152176580
 - !ruby/object:Gem::Dependency
   name: pg
-  requirement: &2155925380 !ruby/object:Gem::Requirement
+  requirement: &2152175640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: 0.11.0
   type: :development
   prerelease: false
-  version_requirements: *2155925380
+  version_requirements: *2152175640
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &2155923980 !ruby/object:Gem::Requirement
+  requirement: &2152162340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -99,10 +99,10 @@ dependencies:
         version: 0.3.7
   type: :development
   prerelease: false
-  version_requirements: *2155923980
+  version_requirements: *2152162340
 - !ruby/object:Gem::Dependency
   name: silent-postgres
-  requirement: &2155922040 !ruby/object:Gem::Requirement
+  requirement: &2152160960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,10 +110,10 @@ dependencies:
         version: 0.1.1
   type: :development
   prerelease: false
-  version_requirements: *2155922040
+  version_requirements: *2152160960
 - !ruby/object:Gem::Dependency
   name: delayed_job
-  requirement: &2155918340 !ruby/object:Gem::Requirement
+  requirement: &2152159540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -121,7 +121,7 @@ dependencies:
         version: 2.1.4
   type: :development
   prerelease: false
-  version_requirements: *2155918340
+  version_requirements: *2152159540
 description: Apartment allows Rails applications to deal with database multitenancy
 email:
 - ryan@ryanbrunner.com
@@ -221,7 +221,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -739145364198480753
+      hash: 3522357192769439782
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -230,7 +230,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -739145364198480753
+      hash: 3522357192769439782
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10