apartment 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5edda0f57e98bfa6166bb6bd4fcea9368cdc2963
-  data.tar.gz: 8fdda9e1bbee41a48490ae0c61dc6bc18d5084c4
+  metadata.gz: caa901bdacc4fbec1f520ec03a1571b4fed1c087
+  data.tar.gz: 8c794d406def5147e36c94ee8f627178b84448fa
 SHA512:
-  metadata.gz: 7450954792e78f6bd27bb8c4a6414853331562554d027cb54703746f59f1f255d898b8966349640494c7574917924ab3faa690ef07d295791d50693c56b6a0eb
-  data.tar.gz: 9ffd46752338eb87341c0deb314395e0f8223beb5744a2ade9a632be6234f6ec68184a1ab01744b404978e11b25f80d03314645510cda7fb8875a1f86809c86d
+  metadata.gz: d75822a0b53d5d283f4c0989068f3528f0b5c27cd06b9c7ff3b56ceb5d8659e504229445ec73ef01300e14bf7b7d8eae61dcfc7c34d9e66b4f4dd921dedf1502
+  data.tar.gz: 42b087cc0ee285e1da347bd72b3949e491215b1f268f3a88131b353eeb127020ba1295d16f3beaeceb4bbec9ed55db7fc0cd60386a5767f7e6e3c51dc4bf9996

data/Appraisals

@@ -1,5 +1,6 @@
 appraise "rails-3-2" do
   gem "rails", "~> 3.2"
+  gem "test-unit", "~> 3.0"
 end
 
 appraise "rails-4-0" do
@@ -13,3 +14,7 @@ end
 appraise "rails-4-2" do
   gem "rails", "~> 4.2"
 end
+
+appraise "rails-5-0" do
+  gem "rails", "~> 5.0"
+end

data/HISTORY.md

@@ -1,3 +1,15 @@
+# 1.2.0
+  * July 28, 2016
+
+  - Official Rails 5 support
+
+# 1.1.0
+  * May 26, 2016
+
+  - Reset tenant after each request
+  - [Support callbacks](https://github.com/influitive/apartment/commit/ff9c9d092a781026502f5997c0bbedcb5748bc83) on switch [cbeer]
+  - Preliminary support for [separate database hosts](https://github.com/influitive/apartment/commit/abdffbf8cd9fba87243f16c86390da13e318ee1f) [apneadiving]
+
 # 1.0.2
   * July 2, 2015
 
@@ -323,4 +335,3 @@
   * March 30, 2011 *
 
   - Original pass from Ryan
-

data/README.md

@@ -434,6 +434,7 @@ values being a hash with the database configuration to use.
 Example:
 
 ```ruby
+config.with_multi_server_setup = true
 config.tenant_names = {
   'tenant1' => {
     adapter: 'postgresql',

data/apartment.gemspec

@@ -35,7 +35,7 @@ Gem::Specification.new do |s|
   MSG
 
   # must be >= 3.1.2 due to bug in prepared_statements
-  s.add_dependency 'activerecord',    '>= 3.1.2', '< 5.0'
+  s.add_dependency 'activerecord',    '>= 3.1.2', '< 6.0'
   s.add_dependency 'rack',            '>= 1.3.6'
 
   s.add_development_dependency 'appraisal'

data/gemfiles/rails_3_2.gemfile

@@ -2,12 +2,12 @@
 
 source "http://rubygems.org"
 
-gem "rails", "~> 3.2"
+gem "rails", "~> 3.2.0"
+gem "test-unit", "~> 3.0"
 
 group :local do
   gem "pry"
+  gem "guard-rspec", "~> 4.2"
 end
 
 gemspec :path => "../"
-
-gem "test-unit"

data/gemfiles/rails_4_0.gemfile

@@ -2,10 +2,11 @@
 
 source "http://rubygems.org"
 
-gem "rails", "~> 4.0"
+gem "rails", "~> 4.0.0"
 
 group :local do
   gem "pry"
+  gem "guard-rspec", "~> 4.2"
 end
 
 gemspec :path => "../"

data/gemfiles/rails_4_1.gemfile

@@ -2,10 +2,11 @@
 
 source "http://rubygems.org"
 
-gem "rails", "~> 4.1"
+gem "rails", "~> 4.1.0"
 
 group :local do
   gem "pry"
+  gem "guard-rspec", "~> 4.2"
 end
 
 gemspec :path => "../"

data/gemfiles/rails_4_2.gemfile

@@ -2,10 +2,11 @@
 
 source "http://rubygems.org"
 
-gem "rails", "~> 4.2"
+gem "rails", "~> 4.2.0"
 
 group :local do
   gem "pry"
+  gem "guard-rspec", "~> 4.2"
 end
 
 gemspec :path => "../"

data/gemfiles/rails_5_0.gemfile

@@ -0,0 +1,12 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rails", "~> 5.0.0"
+
+group :local do
+  gem "pry"
+  gem "guard-rspec", "~> 4.2"
+end
+
+gemspec :path => "../"

data/lib/apartment.rb

@@ -11,7 +11,7 @@ module Apartment
 
     extend Forwardable
 
-    ACCESSOR_METHODS  = [:use_schemas, :use_sql, :seed_after_create, :prepend_environment, :append_environment]
+    ACCESSOR_METHODS  = [:use_schemas, :use_sql, :seed_after_create, :prepend_environment, :append_environment, :with_multi_server_setup ]
     WRITER_METHODS    = [:tenant_names, :database_schema_file, :excluded_models, :default_schema, :persistent_schemas, :connection_class, :tld_length, :db_migrate_tenants, :seed_data_file]
 
     attr_accessor(*ACCESSOR_METHODS)

data/lib/apartment/adapters/abstract_adapter.rb

@@ -3,6 +3,9 @@ require 'apartment/deprecation'
 module Apartment
   module Adapters
     class AbstractAdapter
+      include ActiveSupport::Callbacks
+      define_callbacks :create, :switch
+
       attr_writer :default_tenant
 
       #   @constructor
@@ -17,15 +20,17 @@ module Apartment
       #   @param {String} tenant Tenant name
       #
       def create(tenant)
-        create_tenant(tenant)
+        run_callbacks :create do
+          create_tenant(tenant)
 
-        switch(tenant) do
-          import_database_schema
+          switch(tenant) do
+            import_database_schema
 
-          # Seed data if appropriate
-          seed_data if Apartment.seed_after_create
+            # Seed data if appropriate
+            seed_data if Apartment.seed_after_create
 
-          yield if block_given?
+            yield if block_given?
+          end
         end
       end
 
@@ -80,10 +85,12 @@ module Apartment
       #   @param {String} tenant name
       #
       def switch!(tenant = nil)
-        return reset if tenant.nil?
+        run_callbacks :switch do
+          return reset if tenant.nil?
 
-        connect_to_new(tenant).tap do
-          Apartment.connection.clear_query_cache
+          connect_to_new(tenant).tap do
+            Apartment.connection.clear_query_cache
+          end
         end
       end
 
@@ -155,9 +162,6 @@ module Apartment
         conn.execute("DROP DATABASE #{environmentify(tenant)}")
       end
 
-      class SeparateDbConnectionHandler < ::ActiveRecord::Base
-      end
-
       #   Create the tenant
       #
       #   @param {String} tenant Database name
@@ -255,12 +259,16 @@ module Apartment
         Apartment.db_config_for(tenant).clone
       end
 
-      # neutral connection is necessary whenever you need to create/remove a database from a server.
-      # example: when you use postgresql, you need to connect to the default postgresql database before you create your own.
-      def with_neutral_connection(tenant, &block)
-        SeparateDbConnectionHandler.establish_connection(multi_tenantify(tenant, false))
-        yield(SeparateDbConnectionHandler.connection)
-        SeparateDbConnectionHandler.connection.close
+     def with_neutral_connection(tenant, &block)
+        if Apartment.with_multi_server_setup
+          # neutral connection is necessary whenever you need to create/remove a database from a server.
+          # example: when you use postgresql, you need to connect to the default postgresql database before you create your own.
+          SeparateDbConnectionHandler.establish_connection(multi_tenantify(tenant, false))
+          yield(SeparateDbConnectionHandler.connection)
+          SeparateDbConnectionHandler.connection.close
+        else
+          yield(Apartment.connection)
+        end
       end
 
       def reset_on_connection_exception?
@@ -278,6 +286,9 @@ module Apartment
       def raise_connect_error!(tenant, exception)
         raise TenantNotFound, "Error while connecting to tenant #{environmentify(tenant)}: #{ exception.message }"
       end
+
+      class SeparateDbConnectionHandler < ::ActiveRecord::Base
+      end
     end
   end
 end

data/lib/apartment/adapters/postgresql_adapter.rb

@@ -140,7 +140,7 @@ module Apartment
       #   @return {String} raw SQL contaning inserts with data from schema_migrations
       #
       def pg_dump_schema_migrations_data
-        with_pg_env { `pg_dump -a --inserts -t schema_migrations -n #{default_tenant} #{dbname}` }
+        with_pg_env { `pg_dump -a --inserts -t schema_migrations -t ar_internal_metadata -n #{default_tenant} #{dbname}` }
       end
 
       # Temporary set Postgresql related environment variables if there are in @config

data/lib/apartment/railtie.rb

@@ -47,7 +47,7 @@ module Apartment
 
       # Apartment::Reloader is middleware to initialize things properly on each request to dev
       initializer 'apartment.init' do |app|
-        app.config.middleware.use "Apartment::Reloader"
+        app.config.middleware.use Apartment::Reloader
       end
 
       # Overrides reload! to also call Apartment::Tenant.init as well so that the reloaded classes have the proper table_names

data/lib/apartment/tenant.rb

@@ -9,7 +9,7 @@ module Apartment
     extend self
     extend Forwardable
 
-    def_delegators :adapter, :create, :drop, :switch, :switch!, :current, :each, :reset, :seed, :current_tenant, :default_tenant
+    def_delegators :adapter, :create, :drop, :switch, :switch!, :current, :each, :reset, :set_callback, :seed, :current_tenant, :default_tenant
 
     attr_writer :config
 

data/lib/apartment/version.rb

@@ -1,3 +1,3 @@
 module Apartment
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/spec/examples/generic_adapter_custom_configuration_example.rb

@@ -12,6 +12,11 @@ shared_examples_for "a generic apartment adapter able to handle custom configura
 
   before do
     Apartment.tenant_names = custom_tenant_names
+    Apartment.with_multi_server_setup = true
+  end
+
+  after do
+    Apartment.with_multi_server_setup = false
   end
 
   context "database key taken from specific config" do

data/spec/support/apartment_helpers.rb

@@ -15,12 +15,6 @@ module Apartment
       "db%d" % @x += 1
     end
 
-    def reset_table_names
-      Apartment.excluded_models.each do |model|
-        model.constantize.reset_table_name
-      end
-    end
-
     def drop_schema(schema)
       ActiveRecord::Base.connection.execute("DROP SCHEMA IF EXISTS #{schema} CASCADE") rescue true
     end

data/spec/support/setup.rb

@@ -22,7 +22,6 @@ module Apartment
             # before
             Apartment::Tenant.reload!(config)
             ActiveRecord::Base.establish_connection config
-            Apartment::Test.reset_table_names
 
             example.run
 
@@ -35,8 +34,8 @@ module Apartment
 
               Apartment.connection_class.remove_connection(klass)
               klass.clear_all_connections!
+              klass.reset_table_name
             end
-            Apartment::Test.reset_table_names
             Apartment.reset
             Apartment::Tenant.reload!
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apartment
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Ryan Brunner
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-26 00:00:00.000000000 Z
+date: 2016-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -20,7 +20,7 @@ dependencies:
         version: 3.1.2
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -30,7 +30,7 @@ dependencies:
         version: 3.1.2
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -184,6 +184,7 @@ files:
 - gemfiles/rails_4_0.gemfile
 - gemfiles/rails_4_1.gemfile
 - gemfiles/rails_4_2.gemfile
+- gemfiles/rails_5_0.gemfile
 - lib/apartment.rb
 - lib/apartment/adapters/abstract_adapter.rb
 - lib/apartment/adapters/abstract_jdbc_adapter.rb