apartment 0.22.1 → 0.23.0

data/spec/tasks/apartment_rake_spec.rb

@@ -1,5 +1,6 @@
 require 'spec_helper'
 require 'rake'
+require 'apartment/migrator'
 
 describe "apartment rake tasks" do
 
@@ -21,6 +22,10 @@ describe "apartment rake tasks" do
     ENV['VERSION'] = nil    # linux users reported env variable carrying on between tests
   end
 
+  after(:all) do
+    Apartment::Test.load_schema
+  end
+
   let(:version){ '1234' }
 
   context 'database migration' do
@@ -112,7 +117,5 @@ describe "apartment rake tasks" do
         @rake['apartment:rollback'].invoke
       end
     end
-
   end
-
-end
+end

data/spec/unit/config_spec.rb

@@ -4,7 +4,7 @@ describe Apartment do
 
   describe "#config" do
 
-    let(:excluded_models){ [Company] }
+    let(:excluded_models){ ["Company"] }
 
     it "should yield the Apartment object" do
       Apartment.configure do |config|
@@ -59,14 +59,14 @@ describe Apartment do
       end
 
       it "should return the invoked proc if appropriate" do
-        dbs = lambda{ Company.scoped }
+        dbs = lambda{ Company.all }
 
         Apartment.configure do |config|
           config.excluded_models = []
           config.database_names = dbs
         end
 
-        Apartment.database_names.should == Company.scoped
+        Apartment.database_names.should == Company.all
       end
     end
 

data/spec/unit/middleware/domain_elevator_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'apartment/elevators/domain'
 
 describe Apartment::Elevators::Domain do
 
@@ -20,7 +21,5 @@ describe Apartment::Elevators::Domain do
       elevator = Apartment::Elevators::Domain.new(nil)
       elevator.parse_database_name(request).should be_nil
     end
-
   end
-
 end

data/spec/{integration → unit}/middleware/first_subdomain_elevator_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'apartment/elevators/first_subdomain'
 
 describe Apartment::Elevators::FirstSubdomain do
   describe "subdomain" do

data/spec/unit/middleware/host_hash_elevator_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'apartment/elevators/host_hash'
 
 describe Apartment::Elevators::HostHash do
 
@@ -20,7 +21,5 @@ describe Apartment::Elevators::HostHash do
       elevator = Apartment::Elevators::HostHash.new(nil, 'example.com' => 'example_database')
       expect { elevator.parse_database_name(request) }.to raise_error(Apartment::DatabaseNotFound)
     end
-
   end
-
 end

data/spec/unit/middleware/subdomain_elevator_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'apartment/elevators/subdomain'
 
 describe Apartment::Elevators::Subdomain do
 
@@ -14,7 +15,5 @@ describe Apartment::Elevators::Subdomain do
       elevator = Apartment::Elevators::Subdomain.new(nil)
       elevator.parse_database_name(request).should be_nil
     end
-
   end
-
 end

data/spec/unit/migrator_spec.rb

@@ -1,8 +1,8 @@
 require 'spec_helper'
+require 'apartment/migrator'
 
-describe Apartment::Migrator do
+describe Apartment::Migrator, database: :postgresql do
 
-  let(:config){ Apartment::Test.config['connections']['postgresql'].symbolize_keys }
   let(:schema_name){ Apartment::Test.next_db }
   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
 
@@ -28,8 +28,10 @@ describe Apartment::Migrator do
     Apartment::Test.drop_schema(schema_name)
   end
 
-  context "postgresql" do
+  # reset db
+  after(:all){ Apartment::Test.load_schema }
 
+  context "postgresql" do
     context "using schemas" do
 
       describe "#migrate" do
@@ -85,5 +87,4 @@ describe Apartment::Migrator do
       end
     end
   end
-
 end

data/spec/unit/reloader_spec.rb

@@ -5,7 +5,11 @@ describe Apartment::Reloader do
   context "using postgresql schemas" do
 
     before do
-      Apartment.excluded_models = ["Company"]
+      Apartment.configure do |config|
+        config.excluded_models = ["Company"]
+        config.use_schemas = true
+      end
+      Apartment::Database.reload!(config)
       Company.reset_table_name  # ensure we're clean
     end
 
@@ -13,10 +17,8 @@ describe Apartment::Reloader do
 
     it "should initialize apartment when called" do
       Company.table_name.should_not include('public.')
-      subject.call(mock('env'))
+      subject.call(double('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.22.1
+  version: 0.23.0
 platform: ruby
 authors:
 - Ryan Brunner
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-21 00:00:00.000000000 Z
+date: 2013-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -39,6 +39,118 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 1.3.6
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.11'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.11'
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.11'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.11'
+- !ruby/object:Gem::Dependency
+  name: capybara
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.10
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.10
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.11.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.11.0
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Apartment allows Rack applications to deal with database multitenancy
   through ActiveRecord
 email:
@@ -54,6 +166,7 @@ files:
 - .ruby-gemset
 - .ruby-version
 - .travis.yml
+- Appraisals
 - Gemfile
 - HISTORY.md
 - README.md
@@ -61,6 +174,10 @@ files:
 - TODO.md
 - apartment.gemspec
 - circle.yml
+- gemfiles/rails3.2.gemfile
+- gemfiles/rails3.2.gemfile.lock
+- gemfiles/rails4.0.gemfile
+- gemfiles/rails4.0.gemfile.lock
 - lib/apartment.rb
 - lib/apartment/adapters/abstract_adapter.rb
 - lib/apartment/adapters/abstract_jdbc_adapter.rb
@@ -72,11 +189,6 @@ files:
 - lib/apartment/adapters/sqlite3_adapter.rb
 - lib/apartment/console.rb
 - lib/apartment/database.rb
-- lib/apartment/delayed_job/enqueue.rb
-- lib/apartment/delayed_job/hooks.rb
-- lib/apartment/delayed_job/psych_ext.rb
-- lib/apartment/delayed_job/requirements.rb
-- lib/apartment/delayed_job/syck_ext.rb
 - lib/apartment/elevators/domain.rb
 - lib/apartment/elevators/first_subdomain.rb
 - lib/apartment/elevators/generic.rb
@@ -126,7 +238,6 @@ files:
 - spec/dummy/db/schema.rb
 - spec/dummy/db/seeds.rb
 - spec/dummy/db/test.sqlite3
-- spec/dummy/lib/fake_dj_class.rb
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
@@ -138,21 +249,24 @@ files:
 - spec/examples/generic_adapter_examples.rb
 - spec/examples/schema_adapter_examples.rb
 - spec/integration/apartment_rake_integration_spec.rb
-- spec/integration/delayed_job_integration_spec.rb
 - spec/integration/middleware/domain_elevator_spec.rb
-- spec/integration/middleware/first_subdomain_elevator_spec.rb
 - spec/integration/middleware/generic_elevator_spec.rb
 - spec/integration/middleware/subdomain_elevator_spec.rb
 - spec/integration/query_caching_spec.rb
+- spec/schemas/v1.rb
+- spec/schemas/v2.rb
+- spec/schemas/v3.rb
 - spec/spec_helper.rb
 - spec/support/apartment_helpers.rb
 - spec/support/capybara_sessions.rb
 - spec/support/config.rb
 - spec/support/contexts.rb
 - spec/support/requirements.rb
+- spec/support/setup.rb
 - spec/tasks/apartment_rake_spec.rb
 - spec/unit/config_spec.rb
 - spec/unit/middleware/domain_elevator_spec.rb
+- spec/unit/middleware/first_subdomain_elevator_spec.rb
 - spec/unit/middleware/host_hash_elevator_spec.rb
 - spec/unit/middleware/subdomain_elevator_spec.rb
 - spec/unit/migrator_spec.rb
@@ -177,7 +291,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.10
 signing_key: 
 specification_version: 4
 summary: A Ruby gem for managing database multitenancy
@@ -218,7 +332,6 @@ test_files:
 - spec/dummy/db/schema.rb
 - spec/dummy/db/seeds.rb
 - spec/dummy/db/test.sqlite3
-- spec/dummy/lib/fake_dj_class.rb
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
@@ -230,21 +343,24 @@ test_files:
 - spec/examples/generic_adapter_examples.rb
 - spec/examples/schema_adapter_examples.rb
 - spec/integration/apartment_rake_integration_spec.rb
-- spec/integration/delayed_job_integration_spec.rb
 - spec/integration/middleware/domain_elevator_spec.rb
-- spec/integration/middleware/first_subdomain_elevator_spec.rb
 - spec/integration/middleware/generic_elevator_spec.rb
 - spec/integration/middleware/subdomain_elevator_spec.rb
 - spec/integration/query_caching_spec.rb
+- spec/schemas/v1.rb
+- spec/schemas/v2.rb
+- spec/schemas/v3.rb
 - spec/spec_helper.rb
 - spec/support/apartment_helpers.rb
 - spec/support/capybara_sessions.rb
 - spec/support/config.rb
 - spec/support/contexts.rb
 - spec/support/requirements.rb
+- spec/support/setup.rb
 - spec/tasks/apartment_rake_spec.rb
 - spec/unit/config_spec.rb
 - spec/unit/middleware/domain_elevator_spec.rb
+- spec/unit/middleware/first_subdomain_elevator_spec.rb
 - spec/unit/middleware/host_hash_elevator_spec.rb
 - spec/unit/middleware/subdomain_elevator_spec.rb
 - spec/unit/migrator_spec.rb

data/lib/apartment/delayed_job/enqueue.rb

@@ -1,26 +0,0 @@
-require 'delayed_job'
-require 'yaml'
-
-if YAML.parser.class.name =~ /syck|yecht/i
-  require 'apartment/delayed_job/syck_ext'
-else
-  require 'apartment/delayed_job/psych_ext'
-end
-
-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/hooks.rb

@@ -1,26 +0,0 @@
-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)
-          @_current_database = Apartment::Database.current_database
-          Apartment::Database.switch(job.payload_object.database) if job.payload_object.database
-        end
-
-        def after
-          Apartment::Database.switch(@_current_database)
-        end
-
-      end
-    end
-  end
-end