apartment 0.14.1 → 0.14.2

data/.rvmrc

@@ -1 +1 @@
-rvm --create ruby-1.9.2-p180@apartment
+rvm --create ruby-1.9.3@apartment

data/HISTORY.md

@@ -1,3 +1,8 @@
+# 0.14.2
+  * Feb 21, 2012
+
+  - Fix Delayed::Job yaml encoding with Rails > 3.0.x
+
 # 0.14.1
   * Dec 13, 2011
 

data/apartment.gemspec

@@ -12,17 +12,17 @@ Gem::Specification.new do |s|
   s.email = %w{ryan@ryanbrunner.com bradleyrobertson@gmail.com}
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {spec}/*`.split("\n")
-  
+
   s.homepage = %q{http://github.com/bradrobertson/apartment}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
-  
-  s.add_dependency 'rails', '~> 3.1.2'
-  s.add_development_dependency 'rake', '~> 0.8.7'
+
+  s.add_dependency 'rails', '>= 3.1.2'
+  s.add_development_dependency 'rake', '~> 0.9.2'
   s.add_development_dependency 'sqlite3'
-  s.add_development_dependency 'rspec', '~> 2.6.0'
-  s.add_development_dependency 'rspec-rails', '~> 2.6.1'
+  s.add_development_dependency 'rspec', '~> 2.8.0'
+  s.add_development_dependency 'rspec-rails', '~> 2.8.0'
   s.add_development_dependency 'capybara', '1.0.0'
   s.add_development_dependency 'pg', '~> 0.11.0'
   s.add_development_dependency 'mysql2', '~> 0.3.7'

data/lib/apartment/database.rb

@@ -1,57 +1,57 @@
 require 'active_support/core_ext/module/delegation'
 
 module Apartment
-  
+
   #   The main entry point to Apartment functions
   module Database
-    
+
     extend self
 
     delegate :create, :current_database, :drop, :process, :process_excluded_models, :reset, :seed, :switch, :to => :adapter
 
     #   Initialize Apartment config options such as excluded_models
-    # 
+    #
     def init
       process_excluded_models
     end
-    
+
     #   Fetch the proper multi-tenant adapter based on Rails config
-    # 
+    #
     #   @return {subclass of Apartment::AbstractAdapter}
-    # 
+    #
     def adapter
       @adapter ||= begin
         adapter_method = "#{config[:adapter]}_adapter"
 
         begin
           require "apartment/adapters/#{adapter_method}"
-        rescue LoadError => e
+        rescue LoadError
           raise "The adapter `#{config[:adapter]}` is not yet supported"
         end
 
         unless respond_to?(adapter_method)
           raise AdapterNotFound, "database configuration specifies nonexistent #{config[:adapter]} adapter"
         end
-      
+
         send(adapter_method, config)
       end
     end
-    
+
     #   Reset config and adapter so they are regenerated
-    # 
+    #
     def reload!
       @adapter = nil
       @config = nil
     end
-    
+
   private
-  
+
     #   Fetch the rails database configuration
-    # 
+    #
     def config
       @config ||= Rails.configuration.database_configuration[Rails.env].symbolize_keys
     end
-    
+
   end
-  
+
 end

data/lib/apartment/delayed_job/active_record.rb

@@ -1,9 +1,9 @@
 module ActiveRecord
   class Base
-    
+
     # Overriding Delayed Job's monkey_patch of ActiveRecord so that it works with Apartment
     yaml_as "tag:ruby.yaml.org,2002:ActiveRecord"
-    
+
     def self.yaml_new(klass, tag, val)
       Apartment::Database.process(val['database']) do
         klass.find(val['attributes']['id'])
@@ -11,10 +11,19 @@ module ActiveRecord
     rescue ActiveRecord::RecordNotFound
       raise Delayed::DeserializationError
     end
-    
+
+    # 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
+      encode_with_without_database(coder)
+    end
+    alias_method_chain :encode_with, :database
+
+    # Remain backwards compatible with old yaml serialization
     def to_yaml_properties
       ['@attributes', '@database']    # add in database attribute for serialization
     end
-    
+
   end
 end

data/lib/apartment/delayed_job/hooks.rb

@@ -3,22 +3,22 @@ require 'apartment/delayed_job/enqueue'
 module Apartment
   module Delayed
     module Job
-      
+
       # 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
-        
+
         def before(job)
           Apartment::Database.switch(job.payload_object.database) if job.payload_object.database
         end
-        
+
         def after
           Apartment::Database.reset
         end
-        
+
       end
     end
   end

data/lib/apartment/delayed_job/requirements.rb

@@ -2,22 +2,22 @@ require 'apartment/delayed_job/enqueue'
 
 module Apartment
   module Delayed
-    
+
     # 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      # 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 
+        klass.before_save :set_database     # set db before records are saved so that they also get deserialized properly
       end
-      
+
     private
-    
+
       def set_database
         @database = Apartment::Database.current_database
       end
-    
+
     end
   end
 end

data/lib/apartment/version.rb

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

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

@@ -4,13 +4,13 @@ class CreateDummyModels < ActiveRecord::Migration
       t.boolean :dummy
       t.string :database
     end
-    
+
     create_table :users do |t|
       t.string :name
       t.datetime :birthdate
       t.string :sex
      end
-     
+
      create_table :delayed_jobs do |t|
        t.integer  :priority,   :default => 0
        t.integer  :attempts,   :default => 0
@@ -22,10 +22,11 @@ class CreateDummyModels < ActiveRecord::Migration
        t.string   :locked_by
        t.datetime :created_at
        t.datetime :updated_at
+       t.string   :queue
      end
 
      add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority"
-    
+
   end
 
   def self.down

data/spec/dummy/db/schema.rb

@@ -11,13 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20111202022214) do
-
-  create_table "books", :force => true do |t|
-    t.string   "name"
-    t.integer  "pages"
-    t.datetime "published"
-  end
+ActiveRecord::Schema.define(:version => 20110613152810) do
 
   create_table "companies", :force => true do |t|
     t.boolean "dummy"
@@ -35,6 +29,7 @@ ActiveRecord::Schema.define(:version => 20111202022214) do
     t.string   "locked_by"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.string   "queue"
   end
 
   add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority"

data/spec/integration/apartment_rake_integration_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'rake'
 
 describe "apartment rake tasks" do
-  
+
   before do
     @rake = Rake::Application.new
     Rake.application = @rake
@@ -12,13 +12,13 @@ describe "apartment rake tasks" do
     # it defines a `rails_env` task that our db:migrate depends on
     # No idea why, but during the tests, we somehow lose this tasks, so we get an error when testing migrations
     # This is STUPID!
-    load "rails/tasks/misc.rake"    
+    load "rails/tasks/misc.rake"
   end
-  
+
   after do
     Rake.application = nil
   end
-  
+
   before do
     Apartment.configure do |config|
       config.excluded_models = ["Company"]
@@ -27,7 +27,7 @@ describe "apartment rake tasks" do
   end
 
   context "with x number of databases" do
-    
+
     let(:x){ 1 + rand(5) }    # random number of dbs to create
     let(:db_names){ x.times.map{|y| "database_#{y}" } }
 
@@ -37,38 +37,38 @@ describe "apartment rake tasks" do
         Company.create :database => db_name
       end
     end
-    
+
     after do
       db_names.each{ |db| Apartment::Database.drop(db) }
       Company.delete_all
     end
-    
+
     describe "#migrate" do
       it "should migrate all databases" do
         Apartment::Migrator.should_receive(:migrate).exactly(db_names.length).times
-        
+
         @rake['apartment:migrate'].invoke
       end
     end
-    
+
     describe "#rollback" do
       it "should rollback all dbs" do
         db_names.each do |name|
           Apartment::Migrator.should_receive(:rollback).with(name, anything)
         end
-        
+
         @rake['apartment:rollback'].invoke
         @rake['apartment:migrate'].invoke   # migrate again so that our next test 'seed' can run (requires migrations to be complete)
       end
     end
-    
+
     describe "apartment:seed" do
       it "should seed all databases" do
         Apartment::Database.should_receive(:seed).exactly(db_names.length).times
-        
+
         @rake['apartment:seed'].invoke
       end
     end
-    
+
   end
 end

data/spec/integration/delayed_job_integration_spec.rb

@@ -3,49 +3,49 @@ require 'delayed_job'
 Delayed::Worker.guess_backend
 
 describe Apartment::Delayed do
-  
+
   # See apartment.yml file in dummy app config
-  
+
   let(:config){ Apartment::Test.config['connections']['postgresql'].symbolize_keys }
   let(:database){ "some_new_database" }
   let(:database2){ "another_db" }
-  
+
   before do
     ActiveRecord::Base.establish_connection config
     Apartment::Test.load_schema   # load the Rails schema in the public db schema
     Apartment::Database.stub(:config).and_return config   # Use postgresql database config for this test
     @schema_search_path = ActiveRecord::Base.connection.schema_search_path
-    
+
     Apartment.configure do |config|
       config.use_postgres_schemas = true
     end
-    
+
     Apartment::Database.create database
     Apartment::Database.create database2
   end
-  
+
   after do
     Apartment::Test.drop_schema database
     Apartment::Test.drop_schema database2
     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 {
@@ -54,39 +54,39 @@ describe Apartment::Delayed do
       end
     end
   end
-  
+
   describe Apartment::Delayed::Requirements do
-    
+
     before do
       Apartment::Database.switch database
       User.send(:include, Apartment::Delayed::Requirements)
       User.create
     end
-    
+
     it "should initialize a database attribute on a class" do
       user = User.first
       user.database.should == database
     end
-    
+
     it "should not overwrite any previous after_initialize declarations" do
       User.class_eval do
         after_find :set_name
-        
+
         def set_name
           self.name = "Some Name"
         end
       end
-      
+
       user = User.first
       user.database.should == database
       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
@@ -96,5 +96,5 @@ describe Apartment::Delayed do
       end
     end
   end
-  
+
 end

data/spec/spec_helper.rb

@@ -19,13 +19,13 @@ Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
 
 RSpec.configure do |config|
-  
+
   config.include RSpec::Integration::CapybaraSessions, :type => :request
-  
+
   config.before(:all) do
     # Ensure that each test starts with a clean connection
     # Necessary as some tests will leak things like current_schema into the next test
     ActiveRecord::Base.clear_all_connections!
   end
-  
+
 end

data/spec/support/apartment_helpers.rb

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

data/spec/tasks/apartment_rake_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'rake'
 
 describe "apartment rake tasks" do
-  
+
   before do
     @rake = Rake::Application.new
     Rake.application = @rake
@@ -15,104 +15,104 @@ describe "apartment rake tasks" do
     Rake::Task.define_task('db:migrate:down')
     Rake::Task.define_task('db:migrate:redo')
   end
-  
+
   after do
     Rake.application = nil
     ENV['VERSION'] = nil    # linux users reported env variable carrying on between tests
   end
-  
+
   let(:version){ '1234' }
-  
+
   context 'database migration' do
-    
+
     let(:database_names){ ['company1', 'company2', 'company3'] }
     let(:db_count){ database_names.length }
-    
+
     before do
       Apartment.stub(:database_names).and_return database_names
     end
-    
+
     describe "apartment:migrate" do
       before do
         ActiveRecord::Migrator.stub(:migrate)   # don't care about this
       end
-      
+
       it "should migrate public and all multi-tenant dbs" do
         Apartment::Migrator.should_receive(:migrate).exactly(db_count).times
         @rake['apartment:migrate'].invoke
       end
     end
-    
+
     describe "apartment:migrate:up" do
-      
+
       context "without a version" do
         before do
           ENV['VERSION'] = nil
         end
-      
+
         it "requires a version to migrate to" do
           lambda{
             @rake['apartment:migrate:up'].invoke
           }.should raise_error("VERSION is required")
         end
       end
-      
+
       context "with version" do
-        
+
         before do
           ENV['VERSION'] = version
         end
-        
+
         it "migrates up to a specific version" do
           Apartment::Migrator.should_receive(:run).with(:up, anything, version.to_i).exactly(db_count).times
           @rake['apartment:migrate:up'].invoke
         end
       end
     end
-    
+
     describe "apartment:migrate:down" do
-      
+
       context "without a version" do
         before do
           ENV['VERSION'] = nil
         end
-        
+
         it "requires a version to migrate to" do
           lambda{
             @rake['apartment:migrate:down'].invoke
           }.should raise_error("VERSION is required")
         end
       end
-        
+
       context "with version" do
-        
+
         before do
           ENV['VERSION'] = version
         end
-        
+
         it "migrates up to a specific version" do
           Apartment::Migrator.should_receive(:run).with(:down, anything, version.to_i).exactly(db_count).times
           @rake['apartment:migrate:down'].invoke
         end
       end
     end
-    
+
     describe "apartment:rollback" do
-      
+
       let(:step){ '3' }
-      
+
       it "should rollback dbs" do
         Apartment::Migrator.should_receive(:rollback).exactly(db_count).times
         @rake['apartment:rollback'].invoke
       end
-      
+
       it "should rollback dbs STEP amt" do
         Apartment::Migrator.should_receive(:rollback).with(anything, step.to_i).exactly(db_count).times
         ENV['STEP'] = step
         @rake['apartment:rollback'].invoke
       end
     end
-    
+
   end
-  
+
 end

metadata

@@ -1,140 +1,135 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: apartment
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.14.2
   prerelease: 
-  version: 0.14.1
 platform: ruby
-authors: 
+authors:
 - Ryan Brunner
 - Brad Robertson
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-12-13 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-02-21 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rails
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2155984060 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2155984060
+- !ruby/object:Gem::Dependency
   name: rake
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &2155981900 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.8.7
+      - !ruby/object:Gem::Version
+        version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2155981900
+- !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &2155980140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2155980140
+- !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &2155978440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 2.6.0
+      - !ruby/object:Gem::Version
+        version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2155978440
+- !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &2155928900 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 2.6.1
+      - !ruby/object:Gem::Version
+        version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2155928900
+- !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &2155927460 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2155927460
+- !ruby/object:Gem::Dependency
   name: pg
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &2155925380 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.11.0
   type: :development
   prerelease: false
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2155925380
+- !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &2155923980 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.3.7
   type: :development
   prerelease: false
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2155923980
+- !ruby/object:Gem::Dependency
   name: silent-postgres
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &2155922040 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.1.1
   type: :development
   prerelease: false
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2155922040
+- !ruby/object:Gem::Dependency
   name: delayed_job
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &2155918340 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.1.4
   type: :development
   prerelease: false
-  version_requirements: *id010
+  version_requirements: *2155918340
 description: Apartment allows Rails applications to deal with database multitenancy
-email: 
+email:
 - ryan@ryanbrunner.com
 - bradleyrobertson@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - .rvmrc
@@ -211,39 +206,35 @@ files:
 - spec/unit/middleware/subdomain_elevator_spec.rb
 - spec/unit/migrator_spec.rb
 - spec/unit/reloader_spec.rb
-has_rdoc: true
 homepage: http://github.com/bradrobertson/apartment
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: -3913333331910434381
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -739145364198480753
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: -3913333331910434381
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: -739145364198480753
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A Ruby gem for managing database multitenancy in Rails applications
 test_files: []
-