apartment 0.20.0 → 0.21.0

data/spec/config/database.yml.sample

@@ -1,3 +1,25 @@
+<% if defined?(JRUBY_VERSION) %>
+connections:
+  postgresql:
+    adapter: postgresql
+    database: apartment_postgresql_test
+    username: postgres
+    min_messages: WARNING
+    driver: org.postgresql.Driver
+    url: jdbc:postgresql://localhost:5432/apartment_postgresql_test
+    timeout: 5000
+    pool: 5
+
+  mysql:
+    adapter: mysql
+    database: apartment_mysql_test
+    username: root
+    min_messages: WARNING
+    driver: com.mysql.jdbc.Driver
+    url: jdbc:mysql://localhost:3306/apartment_mysql_test
+    timeout: 5000
+    pool: 5
+<% else %>
 connections:
   postgresql:
     adapter: postgresql
@@ -12,3 +34,4 @@ connections:
     database: apartment_mysql_test
     username: root
     password:
+<% end %>

data/spec/dummy/config/database.yml.sample

@@ -1,6 +1,27 @@
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
+<% if defined?(JRUBY_VERSION) %>
+test:
+  adapter: postgresql
+  database: apartment_postgresql_test
+  username: postgres
+  min_messages: WARNING
+  driver: org.postgresql.Driver
+  url: jdbc:postgresql://localhost:5432/apartment_postgresql_test
+  timeout: 5000
+  pool: 5
+
+development:
+  adapter: postgresql
+  database: apartment_postgresql_development
+  username: postgres
+  min_messages: WARNING
+  driver: org.postgresql.Driver
+  url: jdbc:postgresql://localhost:5432/apartment_postgresql_development
+  timeout: 5000
+  pool: 5
+<% else %>
 test:
   adapter: postgresql
   database: apartment_postgresql_test
@@ -14,3 +35,4 @@ development:
   min_messages: WARNING
   pool: 5
   timeout: 5000
+<% end %>

data/spec/integration/delayed_job_integration_spec.rb

@@ -3,85 +3,87 @@ require 'delayed_job'
 require 'delayed_job_active_record'
 
 describe Apartment::Delayed do
+  unless defined?(JRUBY_VERSION)
 
-  # See apartment.yml file in dummy app config
+    # See apartment.yml file in dummy app config
 
-  let(:config){ Apartment::Test.config['connections']['postgresql'].symbolize_keys }
-  let(:database){ Apartment::Test.next_db }
-  let(:database2){ Apartment::Test.next_db }
+    let(:config) { Apartment::Test.config['connections']['postgresql'].symbolize_keys }
+    let(:database) { Apartment::Test.next_db }
+    let(:database2) { Apartment::Test.next_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
-
-    Apartment.configure do |config|
-      config.use_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.reset
-  end
+    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
 
-  describe Apartment::Delayed::Requirements do
+      Apartment.configure do |config|
+        config.use_schemas = true
+      end
 
-    before do
-      Apartment::Database.switch database
-      User.send(:include, Apartment::Delayed::Requirements)
-      User.create
+      Apartment::Database.create database
+      Apartment::Database.create database2
     end
 
-    it "should initialize a database attribute on a class" do
-      user = User.first
-      user.database.should == database
+    after do
+      Apartment::Test.drop_schema database
+      Apartment::Test.drop_schema database2
+      Apartment.reset
     end
 
-    it "should not overwrite any previous after_initialize declarations" do
-      User.class_eval do
-        after_find :set_name
+    describe Apartment::Delayed::Requirements do
 
-        def set_name
-          self.name = "Some Name"
-        end
+      before do
+        Apartment::Database.switch database
+        User.send(:include, Apartment::Delayed::Requirements)
+        User.create
       end
 
-      user = User.first
-      user.database.should == database
-      user.name.should == "Some Name"
-    end
+      it "should initialize a database attribute on a class" do
+        user = User.first
+        user.database.should == database
+      end
 
-    it "should set the db on a new record before it saves" do
-      user = User.create
-      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
 
-    context "serialization" do
-      it "should serialize the proper database attribute" do
-        user_yaml = User.first.to_yaml
-        Apartment::Database.switch database2
-        user = YAML.load user_yaml
+        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
+          Apartment::Database.switch database2
+          user = YAML.load user_yaml
+          user.database.should == database
+        end
       end
     end
-  end
 
-  describe Apartment::Delayed::Job::Hooks do
+    describe Apartment::Delayed::Job::Hooks do
 
-    let(:worker){ Delayed::Worker.new }
-    let(:job){ Delayed::Job.enqueue User.new }
+      let(:worker) { Delayed::Worker.new }
+      let(:job) { Delayed::Job.enqueue User.new }
 
-    it "should switch to previous db" do
-      Apartment::Database.switch database
-      worker.run(job)
+      it "should switch to previous db" do
+        Apartment::Database.switch database
+        worker.run(job)
 
-      Apartment::Database.current_database.should == database
+        Apartment::Database.current_database.should == database
+      end
     end
-  end
 
+  end
 end

data/spec/spec_helper.rb

@@ -3,13 +3,16 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 # Configure Rails Environment
 ENV["RAILS_ENV"] = "test"
 
-require File.expand_path("../dummy/config/environment.rb",  __FILE__)
+require File.expand_path("../dummy/config/environment.rb", __FILE__)
 require "rspec/rails"
 require 'capybara/rspec'
 require 'capybara/rails'
-require 'pry'
 
-silence_warnings{ IRB = Pry }
+begin
+  require 'pry'
+  silence_warnings{ IRB = Pry }
+rescue LoadError
+end
 
 ActionMailer::Base.delivery_method = :test
 ActionMailer::Base.perform_deliveries = true

data/spec/support/config.rb

@@ -4,7 +4,7 @@ module Apartment
   module Test
 
     def self.config
-      @config ||= YAML.load_file('spec/config/database.yml')
+      @config ||= YAML.load(ERB.new(IO.read('spec/config/database.yml')).result)
     end
   end
 end

data/spec/unit/migrator_spec.rb

@@ -10,6 +10,8 @@ describe Apartment::Migrator 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
+    # Necessary because the JDBC adapter returns $user in the search path
+    @original_schema.gsub!(/"\$user",/, '') if defined?(JRUBY_VERSION)
 
     Apartment.configure do |config|
       config.use_schemas = true

metadata

@@ -1,51 +1,50 @@
 --- !ruby/object:Gem::Specification
 name: apartment
 version: !ruby/object:Gem::Version
-  version: 0.20.0
-  prerelease: 
+  prerelease:
+  version: 0.21.0
 platform: ruby
 authors:
 - Ryan Brunner
 - Brad Robertson
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-02-13 00:00:00.000000000 Z
+date: 2013-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.2
+    none: false
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.6
-description: Apartment allows Rack applications to deal with database multitenancy
-  through ActiveRecord
+    none: false
+  prerelease: false
+  type: :runtime
+description: Apartment allows Rack applications to deal with database multitenancy through ActiveRecord
 email:
 - ryan@influitive.com
 - brad@influitive.com
@@ -53,19 +52,26 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .pryrc
-- .rspec
-- .rvmrc
-- .travis.yml
+- ".gitignore"
+- ".pryrc"
+- ".rspec"
+- ".rvmrc"
+- ".travis.yml"
+- ".vagrant"
+- Cheffile
+- Cheffile.lock
 - Gemfile
 - HISTORY.md
 - README.md
 - Rakefile
+- Vagrantfile
 - apartment.gemspec
 - circle.yml
 - lib/apartment.rb
 - lib/apartment/adapters/abstract_adapter.rb
+- lib/apartment/adapters/abstract_jdbc_adapter.rb
+- lib/apartment/adapters/jdbc_mysql_adapter.rb
+- lib/apartment/adapters/jdbc_postgresql_adapter.rb
 - lib/apartment/adapters/mysql2_adapter.rb
 - lib/apartment/adapters/postgis_adapter.rb
 - lib/apartment/adapters/postgresql_adapter.rb
@@ -90,6 +96,8 @@ files:
 - lib/generators/apartment/install/install_generator.rb
 - lib/generators/apartment/install/templates/apartment.rb
 - lib/tasks/apartment.rake
+- spec/adapters/jdbc_mysql_adapter_spec.rb
+- spec/adapters/jdbc_postgresql_adapter_spec.rb
 - spec/adapters/mysql2_adapter_spec.rb
 - spec/adapters/postgresql_adapter_spec.rb
 - spec/apartment_spec.rb
@@ -155,35 +163,39 @@ files:
 homepage: https://github.com/influitive/apartment
 licenses:
 - MIT
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
       segments:
       - 0
-      hash: 1986473667684990578
-required_rubygems_version: !ruby/object:Gem::Requirement
+      hash: 2
+      version: !binary |-
+        MA==
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
       segments:
       - 0
-      hash: 1986473667684990578
+      hash: 2
+      version: !binary |-
+        MA==
+  none: false
 requirements: []
-rubyforge_project: 
+rubyforge_project:
 rubygems_version: 1.8.24
-signing_key: 
+signing_key:
 specification_version: 3
 summary: A Ruby gem for managing database multitenancy
 test_files:
+- spec/adapters/jdbc_mysql_adapter_spec.rb
+- spec/adapters/jdbc_postgresql_adapter_spec.rb
 - spec/adapters/mysql2_adapter_spec.rb
 - spec/adapters/postgresql_adapter_spec.rb
 - spec/apartment_spec.rb