apartment 0.18.0 → 0.19.0

data/HISTORY.md

@@ -1,3 +1,10 @@
+# 0.19.0
+  * Dec 29, 2012
+
+  - Apartment is now threadsafe
+  - New postgis adapter [zonpantli]
+  - Removed ActionDispatch dependency for use with Rack apps (regression)
+
 # 0.18.0
   * Nov 27, 2012
 

data/README.md

@@ -164,7 +164,7 @@ of dbs to Apartment.  You can make this dynamic by providing a Proc object to be
 This object should yield an array of string representing each database name.  Example:
 
     # Dynamically get database names to migrate
-    config.database_names = lambda{ Customer.select(:database_name).map(&:database_name) }
+    config.database_names = lambda{ Customer.pluck(:database_name) }
 
     # Use a static list of database names for migrate
     config.database_names = ['db1', 'db2']
@@ -234,4 +234,4 @@ All jobs *must* stored in the global (public) namespace, so add it to the list o
 
 ## License
 
-Apartment is released under the [MIT License](http://www.opensource.org/licenses/MIT).
+Apartment is released under the [MIT License](http://www.opensource.org/licenses/MIT).

data/apartment.gemspec

@@ -25,8 +25,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rails', '>= 3.1.2'
   s.add_development_dependency 'rake', '~> 0.9.2'
   s.add_development_dependency 'sqlite3'
-  s.add_development_dependency 'rspec', '~> 2.10.0'
-  s.add_development_dependency 'rspec-rails', '~> 2.10.0'
+  s.add_development_dependency 'rspec', '~> 2.11'
+  s.add_development_dependency 'rspec-rails', '~> 2.11'
   s.add_development_dependency 'capybara', '~> 1.0.0'
   s.add_development_dependency 'pg', '>= 0.11.0'
   s.add_development_dependency 'mysql2', '~> 0.3.10'

data/lib/apartment.rb

@@ -1,9 +1,11 @@
 require 'apartment/railtie' if defined?(Rails)
+require 'active_support/core_ext/module/delegation'
+require 'active_support/core_ext/object/blank'
 
 module Apartment
 
   class << self
-    ACCESSOR_METHODS  = [:use_postgres_schemas, :seed_after_create, :prepend_environment, :append_environment]
+    ACCESSOR_METHODS  = [:use_schemas, :seed_after_create, :prepend_environment, :append_environment]
     WRITER_METHODS    = [:database_names, :excluded_models, :default_schema, :persistent_schemas, :connection_class]
 
     attr_accessor(*ACCESSOR_METHODS)
@@ -16,11 +18,6 @@ module Apartment
       yield self if block_given?
     end
 
-    # Default switch schema to public
-    def schema_to_switch
-      @schema_to_switch || "public"
-    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
@@ -48,6 +45,16 @@ module Apartment
       (ACCESSOR_METHODS + WRITER_METHODS).each{|method| instance_variable_set(:"@#{method}", nil) }
     end
 
+    def use_postgres_schemas
+      warn "[Deprecation Warning] `use_postgresql_schemas` is now deprecated, please use `use_schemas`"
+      use_schemas
+    end
+
+    def use_postgres_schemas=(to_use_or_not_to_use)
+      warn "[Deprecation Warning] `use_postgresql_schemas=` is now deprecated, please use `use_schemas=`"
+      self.use_schemas = to_use_or_not_to_use
+    end
+
   end
 
   autoload :Database, 'apartment/database'

data/lib/apartment/adapters/abstract_adapter.rb

@@ -8,11 +8,9 @@ module Apartment
 
       #   @constructor
       #   @param {Hash} config Database config
-      #   @param {Hash} defaults Some default options
       #
-      def initialize(config, defaults = {})
+      def initialize(config)
         @config = config
-        @defaults = defaults
       end
 
       #   Create a new database, import schema, seed if appropriate
@@ -39,7 +37,12 @@ module Apartment
       def current_database
         Apartment.connection.current_database
       end
-      alias_method :current, :current_database
+
+      #   Note alias_method here doesn't work with inheritence apparently ??
+      #
+      def current
+        current_database
+      end
 
       #   Drop the database
       #

data/lib/apartment/adapters/postgis_adapter.rb

@@ -0,0 +1,15 @@
+# handle postgis adapter as if it were postgresql,
+# only override the adapter_method used for initialization
+require "apartment/adapters/postgresql_adapter"
+
+module Apartment
+
+  module Database
+
+    def self.postgis_adapter(config)
+      Apartment.use_schemas ?
+        Adapters::PostgresqlSchemaAdapter.new(config) :
+        Adapters::PostgresqlAdapter.new(config)
+    end
+  end
+end

data/lib/apartment/adapters/postgresql_adapter.rb

@@ -3,7 +3,7 @@ module Apartment
   module Database
 
     def self.postgresql_adapter(config)
-      Apartment.use_postgres_schemas ?
+      Apartment.use_schemas ?
         Adapters::PostgresqlSchemaAdapter.new(config) :
         Adapters::PostgresqlAdapter.new(config)
     end
@@ -33,8 +33,6 @@ module Apartment
     # Separate Adapter for Postgresql when using schemas
     class PostgresqlSchemaAdapter < AbstractAdapter
 
-      attr_reader :current_database
-
       #   Drop the database schema
       #
       #   @param {String} database Database (schema) to drop
@@ -81,6 +79,10 @@ module Apartment
         Apartment.connection.schema_search_path = full_search_path
       end
 
+      def current_database
+        @current_database || Apartment.default_schema
+      end
+
     protected
 
       #   Set schema search path to new schema

data/lib/apartment/database.rb

@@ -23,7 +23,7 @@ module Apartment
     #   @return {subclass of Apartment::AbstractAdapter}
     #
     def adapter
-      @adapter ||= begin
+      Thread.current[:apartment_adapter] ||= begin
         adapter_method = "#{config[:adapter]}_adapter"
 
         begin
@@ -43,7 +43,7 @@ module Apartment
     #   Reset config and adapter so they are regenerated
     #
     def reload!
-      @adapter = nil
+      Thread.current[:apartment_adapter] = nil
       @config = nil
     end
 

data/lib/apartment/elevators/generic.rb

@@ -10,7 +10,7 @@ module Apartment
       end
 
       def call(env)
-        request = ActionDispatch::Request.new(env)
+        request = Rack::Request.new(env)
 
         database = @processor.call(request)
 

data/lib/apartment/elevators/subdomain.rb

@@ -6,7 +6,29 @@ module Apartment
     class Subdomain < Generic
 
       def parse_database_name(request)
-        request.subdomain.present? && request.subdomain || nil
+        database = subdomain(request.host)
+
+        database.present? && database || nil
+      end
+
+    private
+
+      # *Almost* a direct ripoff of ActionDispatch::Request subdomain methods
+
+      # Only care about the first subdomain for the database name
+      def subdomain(host)
+        subdomains(host).first
+      end
+
+      #   Assuming tld_length of 1, might need to make this configurable in Apartment in the future for things like .co.uk
+      def subdomains(host, tld_length = 1)
+        return [] unless named_host?(host)
+
+        host.split('.')[0..-(tld_length + 2)]
+      end
+
+      def named_host?(host)
+        !(host.nil? || /\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/.match(host))
       end
     end
   end

data/lib/apartment/railtie.rb

@@ -10,7 +10,7 @@ module Apartment
     config.before_initialize do
       Apartment.configure do |config|
         config.excluded_models = []
-        config.use_postgres_schemas = true
+        config.use_schemas = true
         config.database_names = []
         config.seed_after_create = false
         config.prepend_environment = false

data/lib/apartment/version.rb

@@ -1,3 +1,3 @@
 module Apartment
-  VERSION = "0.18.0"
+  VERSION = "0.19.0"
 end

data/lib/generators/apartment/install/templates/apartment.rb

@@ -10,7 +10,7 @@ Apartment.configure do |config|
   }
 
   # use postgres schemas?
-  config.use_postgres_schemas = true
+  config.use_schemas = true
 
   # configure persistent schemas (E.g. hstore )
   # config.persistent_schemas = %w{ hstore }

data/spec/adapters/postgresql_adapter_spec.rb

@@ -8,7 +8,7 @@ describe Apartment::Adapters::PostgresqlAdapter do
 
   context "using schemas" do
 
-    before{ Apartment.use_postgres_schemas = true }
+    before{ Apartment.use_schemas = true }
 
     # Not sure why, but somehow using let(:database_names) memoizes for the whole example group, not just each test
     def database_names
@@ -23,7 +23,7 @@ describe Apartment::Adapters::PostgresqlAdapter do
 
   context "using databases" do
 
-    before{ Apartment.use_postgres_schemas = false }
+    before{ Apartment.use_schemas = false }
 
     # Not sure why, but somehow using let(:database_names) memoizes for the whole example group, not just each test
     def database_names

data/spec/database_spec.rb

@@ -55,7 +55,7 @@ describe Apartment::Database do
     let(:database2){ Apartment::Test.next_db }
 
     before do
-      Apartment.use_postgres_schemas = true
+      Apartment.use_schemas = true
       ActiveRecord::Base.establish_connection config
       Apartment::Test.load_schema   # load the Rails schema in the public db schema
       subject.stub(:config).and_return config   # Use postgresql database config for this test
@@ -79,6 +79,16 @@ describe Apartment::Database do
         }.to raise_error
       end
 
+      context "threadsafety" do
+        before { subject.create database }
+
+        it 'has a threadsafe adapter' do
+          subject.switch(database)
+          thread = Thread.new { subject.current_database.should == Apartment.default_schema }
+          thread.join
+          subject.current_database.should == database
+        end
+      end
     end
 
     context "with schemas" do
@@ -86,7 +96,7 @@ describe Apartment::Database do
       before do
         Apartment.configure do |config|
           config.excluded_models = []
-          config.use_postgres_schemas = true
+          config.use_schemas = true
           config.seed_after_create = true
         end
         subject.create database

data/spec/examples/generic_adapter_examples.rb

@@ -95,6 +95,7 @@ shared_examples_for "a generic apartment adapter" do
     it "should return the current db name" do
       subject.switch(db1)
       subject.current_database.should == db1
+      subject.current.should == db1
     end
   end
 end

data/spec/examples/schema_adapter_examples.rb

@@ -204,12 +204,14 @@ shared_examples_for "a schema based apartment adapter" do
     it "should return the current schema name" do
       subject.switch(schema1)
       subject.current_database.should == schema1
+      subject.current.should == schema1
     end
 
     context "persistent_schemas", :persistent_schemas => true do
       it "should exlude persistent_schemas" do
         subject.switch(schema1)
         subject.current_database.should == schema1
+        subject.current.should == schema1
       end
     end
   end

data/spec/integration/delayed_job_integration_spec.rb

@@ -16,7 +16,7 @@ describe Apartment::Delayed do
     Apartment::Database.stub(:config).and_return config   # Use postgresql database config for this test
 
     Apartment.configure do |config|
-      config.use_postgres_schemas = true
+      config.use_schemas = true
     end
 
     Apartment::Database.create database

data/spec/integration/middleware/first_subdomain_elevator_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Apartment::Elevators::FirstSubdomain do
   describe "subdomain" do
     subject { described_class.new("test").parse_database_name(request) }
-    let(:request) { double(:request, :subdomain => subdomain)}
+    let(:request) { double(:request, :host => "#{subdomain}.example.com") }
 
     context "one subdomain" do
       let(:subdomain) { "test" }

data/spec/support/apartment_helpers.rb

@@ -5,7 +5,7 @@ module Apartment
 
     def reset
       Apartment.excluded_models = nil
-      Apartment.use_postgres_schemas = nil
+      Apartment.use_schemas = nil
       Apartment.seed_after_create = nil
       Apartment.default_schema = nil
     end

data/spec/support/contexts.rb

@@ -28,7 +28,7 @@ shared_context "elevators", :elevator => true do
    before do
      Apartment.reset # reset all config
      Apartment.seed_after_create = false
-     Apartment.use_postgres_schemas = true
+     Apartment.use_schemas = true
      api.reload! # reload adapter
 
      api.create(database1)

data/spec/unit/config_spec.rb

@@ -20,12 +20,12 @@ describe Apartment do
       Apartment.excluded_models.should == excluded_models
     end
 
-    it "should set postgres_schemas" do
+    it "should set use_schemas" do
       Apartment.configure do |config|
         config.excluded_models = []
-        config.use_postgres_schemas = false
+        config.use_schemas = false
       end
-      Apartment.use_postgres_schemas.should be_false
+      Apartment.use_schemas.should be_false
     end
 
     it "should set seed_after_create" do

data/spec/unit/migrator_spec.rb

@@ -12,7 +12,7 @@ describe Apartment::Migrator do
     @original_schema = ActiveRecord::Base.connection.schema_search_path
 
     Apartment.configure do |config|
-      config.use_postgres_schemas = true
+      config.use_schemas = true
       config.excluded_models = []
       config.database_names = [schema_name]
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apartment
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.19.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-28 00:00:00.000000000 Z
+date: 2012-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -115,7 +115,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: '2.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -123,7 +123,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: '2.11'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -131,7 +131,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: '2.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -139,7 +139,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: '2.11'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -244,6 +244,7 @@ files:
 - lib/apartment.rb
 - lib/apartment/adapters/abstract_adapter.rb
 - lib/apartment/adapters/mysql2_adapter.rb
+- lib/apartment/adapters/postgis_adapter.rb
 - lib/apartment/adapters/postgresql_adapter.rb
 - lib/apartment/console.rb
 - lib/apartment/database.rb
@@ -342,7 +343,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2510818630049995736
+      hash: -3842088920209676639
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -351,7 +352,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2510818630049995736
+      hash: -3842088920209676639
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24