apartment 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6db463e2bcd7fcb50414759a87c1b77ccb959e04
-  data.tar.gz: c614f5ba93fd4e5e779f07a08aaafa4118bd5025
+SHA256:
+  metadata.gz: 12cd184ff975b1b35f44289fb83ffc7a6a644035f90ea4c01fc93d249b814ef2
+  data.tar.gz: 448a27893a2ca2564d368c1ca7140582ddcedbb3f209f07f7a8b2e148bfd252e
 SHA512:
-  metadata.gz: 3bacabc90c5c61c06b266bfa9bfb4d0cf0f3dedfcdba36362894848b065a5bcd6b174badf9d696a97aeadb7589d2063c3e28ef6249ec54bae721fa7914538fbc
-  data.tar.gz: b2a1c68f71969fd0e87bc0cfaebdcfd7f99ca54a5e815c2ae6dce17ab165c6352aa64624a29cad9311dd03925795c298828f35179448153d334f8a0c87b50469
+  metadata.gz: ff5cdb7a876920cbf88f1f5d0cd9821b91de5e518a0eea3eae262552fc6ca1608227ce6f1d2d367f1dca8d97d660f081c61bf89a1ecf2709eb38f8c85582a251
+  data.tar.gz: b84c9287ca34937c46dfb6ec9746d6eadd27e81def1f0016b37281f8007a75092d2d58a4826f94da307bf4c75caf4b0b7d0725a478b3ec70c3b92dc8c4b8f5c0

data/.gitignore

@@ -2,6 +2,7 @@
 .bundle
 *.lock
 gemfiles/*.lock
+gemfiles/vendor
 pkg/*
 *.log
 .idea

data/.travis.yml

@@ -1,18 +1,17 @@
 language: ruby
 rvm:
   - 2.1.9
-  - 2.2.4
-  - 2.3.1
-  - 2.4.1
+  - 2.2.9
+  - 2.3.6
+  - 2.4.3
+  - 2.5.0
   - ruby-head
-  - jruby-9.0.5.0
-  - jruby-9.1.9.0
+  - jruby-9.1.15.0
 gemfile:
-  - gemfiles/rails_4_0.gemfile
-  - gemfiles/rails_4_1.gemfile
   - gemfiles/rails_4_2.gemfile
   - gemfiles/rails_5_0.gemfile
   - gemfiles/rails_5_1.gemfile
+  - gemfiles/rails_5_2.gemfile
   - gemfiles/rails_master.gemfile
 bundler_args: --without local
 before_install:
@@ -24,38 +23,22 @@ matrix:
   allow_failures:
     - rvm: ruby-head
     - gemfile: gemfiles/rails_master.gemfile
+    - rvm: jruby-9.1.15.0
+      gemfile: gemfiles/rails_5_0.gemfile
   exclude:
     - rvm: 2.1.9
       gemfile: gemfiles/rails_5_0.gemfile
     - rvm: 2.1.9
       gemfile: gemfiles/rails_5_1.gemfile
+    - rvm: 2.1.9
+      gemfile: gemfiles/rails_5_2.gemfile
     - rvm: 2.1.9
       gemfile: gemfiles/rails_master.gemfile
-    - rvm: 2.4.1
-      gemfile: gemfiles/rails_4_0.gemfile
-    - rvm: 2.4.1
-      gemfile: gemfiles/rails_4_1.gemfile
-    - rvm: ruby-head
-      gemfile: gemfiles/rails_4_0.gemfile
-    - rvm: ruby-head
-      gemfile: gemfiles/rails_4_1.gemfile
-    - rvm: jruby-9.0.5.0
-      gemfile: gemfiles/rails_4_0.gemfile
-    - rvm: jruby-9.0.5.0
-      gemfile: gemfiles/rails_4_2.gemfile
-    - rvm: jruby-9.0.5.0
-      gemfile: gemfiles/rails_5_0.gemfile
-    - rvm: jruby-9.0.5.0
-      gemfile: gemfiles/rails_5_1.gemfile
-    - rvm: jruby-9.0.5.0
-      gemfile: gemfiles/rails_master.gemfile
-    - rvm: jruby-9.1.9.0
-      gemfile: gemfiles/rails_4_0.gemfile
-    - rvm: jruby-9.1.9.0
-      gemfile: gemfiles/rails_5_0.gemfile
-    - rvm: jruby-9.1.9.0
+    - rvm: jruby-9.1.15.0
       gemfile: gemfiles/rails_5_1.gemfile
-    - rvm: jruby-9.1.9.0
+    - rvm: jruby-9.1.15.0
+      gemfile: gemfiles/rails_5_2.gemfile
+    - rvm: jruby-9.1.15.0
       gemfile: gemfiles/rails_master.gemfile
   fast_finish: true
 cache: bundler

data/Appraisals

@@ -1,23 +1,54 @@
-appraise "rails-4-0" do
-  gem "rails", "~> 4.0.0"
-end
-
-appraise "rails-4-1" do
-  gem "rails", "~> 4.1.0"
-end
-
 appraise "rails-4-2" do
   gem "rails", "~> 4.2.0"
+  platforms :ruby do
+    gem "pg", "< 1.0.0"
+    gem "mysql2", "~> 0.4.0"
+  end
+  platforms :jruby do
+    gem 'activerecord-jdbc-adapter', '~> 1.3'
+    gem 'activerecord-jdbcpostgresql-adapter', '~> 1.3'
+    gem 'activerecord-jdbcmysql-adapter', '~> 1.3'
+  end
 end
 
 appraise "rails-5-0" do
   gem "rails", "~> 5.0.0"
+  platforms :ruby do
+    gem "pg", "< 1.0.0"
+  end
+  platforms :jruby do
+    gem 'activerecord-jdbc-adapter', '~> 50.0'
+    gem 'activerecord-jdbcpostgresql-adapter', '~> 50.0'
+    gem 'activerecord-jdbcmysql-adapter', '~> 50.0'
+  end
 end
 
 appraise "rails-5-1" do
-  gem "rails", "5.1.1"
+  gem "rails", "~> 5.1.0"
+  platforms :ruby do
+    gem "pg", "< 1.0.0"
+  end
+  platforms :jruby do
+    gem 'activerecord-jdbc-adapter', '~> 51.0'
+    gem 'activerecord-jdbcpostgresql-adapter', '~> 51.0'
+    gem 'activerecord-jdbcmysql-adapter', '~> 51.0'
+  end
+end
+
+appraise "rails-5-2" do
+  gem "rails", "~> 5.2.0"
+  platforms :jruby do
+    gem 'activerecord-jdbc-adapter', '~> 51.0'
+    gem 'activerecord-jdbcpostgresql-adapter', '~> 51.0'
+    gem 'activerecord-jdbcmysql-adapter', '~> 51.0'
+  end
 end
 
 appraise "rails-master" do
   gem "rails", git: 'https://github.com/rails/rails.git'
+  platforms :jruby do
+    gem 'activerecord-jdbc-adapter', '~> 51.0'
+    gem 'activerecord-jdbcpostgresql-adapter', '~> 51.0'
+    gem 'activerecord-jdbcmysql-adapter', '~> 51.0'
+  end
 end

data/HISTORY.md

@@ -1,6 +1,33 @@
+# 2.2.0
+  * April 14, 2018
+
+## Added
+  - #523: Add Rails 5.2 support [IngusSkaistkalns]
+  - #504: Test against Ruby 2.5.0 [ahorek]
+  - #528: Test against Rails 5.2 [meganemura]
+
+## Removed
+  - #504: Remove Rails 4.0/4.1 support [ahorek]
+  - #545: Stop supporting for JRuby + Rails 5.0 [meganemura]
+
+## Fixed
+  - #537: Fix PostgresqlSchemaFromSqlAdapter for newer PostgreSQL [shterrett]
+    - #532: Issue is reported by [aldrinmartoq]
+  - #519: Fix exception when main database doesn't exist [mayeco]
+
+## Changed
+  - #514: Fix typo [menorval]
+
 # 2.1.0
   * December 15, 2017
 
+  - Add `parallel_migration_threads` configuration option for running migrations
+    in parallel [ryanbrunner]
+  - Drop Ruby 2.0.0 support [meganemura]
+  - ignore_private when parsing subdomains with PublicSuffix [michiomochi]
+  - Ignore row_security statements in psql dumps for backward compatibility
+    [meganemura]
+  - "Host" elevator [shrmnk]
   - Enhance db:drop task to act on all tenants [kuzukuzu]
 
 # 2.0.0

data/README.md

@@ -149,7 +149,7 @@ This functions much in the same way as Apartment.excluded_models. This example w
 
 #### Switch on first subdomain
 
-To switch on the first subdomain, which analyzes the chain of subdomains of the request and switches to a tenant schema of the first name in the chain (e.g. owls.birds.animals.com would switch to "owl"). It can be used like so:
+To switch on the first subdomain, which analyzes the chain of subdomains of the request and switches to a tenant schema of the first name in the chain (e.g. owls.birds.animals.com would switch to "owls"). It can be used like so:
 
 ```ruby
 # application.rb

data/Rakefile

@@ -59,7 +59,7 @@ namespace :postgres do
     params << "-p#{pg_config['port']}" if pg_config['port']
     %x{ createdb #{params.join(' ')} } rescue "test db already exists"
     ActiveRecord::Base.establish_connection pg_config
-    ActiveRecord::Migrator.migrate('spec/dummy/db/migrate')
+    migrate
   end
 
   desc "drop the PostgreSQL test database"
@@ -87,7 +87,7 @@ namespace :mysql do
     params << "-p#{my_config['password']}" if my_config['password']
     %x{ mysqladmin #{params.join(' ')} create #{my_config['database']} } rescue "test db already exists"
     ActiveRecord::Base.establish_connection my_config
-    ActiveRecord::Migrator.migrate('spec/dummy/db/migrate')
+    migrate
   end
 
   desc "drop the MySQL test database"
@@ -114,3 +114,15 @@ end
 def my_config
   config['mysql']
 end
+
+def activerecord_below_5_2?
+  ActiveRecord.version.release < Gem::Version.new('5.2.0')
+end
+
+def migrate
+  if activerecord_below_5_2?
+    ActiveRecord::Migrator.migrate('spec/dummy/db/migrate')
+  else
+    ActiveRecord::MigrationContext.new('spec/dummy/db/migrate').migrate
+  end
+end

data/apartment.gemspec

@@ -34,12 +34,12 @@ Gem::Specification.new do |s|
     s.add_development_dependency 'activerecord-jdbc-adapter'
     s.add_development_dependency 'activerecord-jdbcpostgresql-adapter'
     s.add_development_dependency 'activerecord-jdbcmysql-adapter'
-    s.add_development_dependency 'jdbc-postgres', '9.2.1002'
+    s.add_development_dependency 'jdbc-postgres'
     s.add_development_dependency 'jdbc-mysql'
     s.add_development_dependency 'jruby-openssl'
   else
-    s.add_development_dependency 'mysql2', '~> 0.3.10'
-    s.add_development_dependency 'pg',     '>= 0.11.0'
+    s.add_development_dependency 'mysql2'
+    s.add_development_dependency 'pg'
     s.add_development_dependency 'sqlite3'
   end
 end

data/docker-compose.yml

@@ -1,7 +1,7 @@
 version: '2'
 services:
   postgresql:
-    image: postgres:9.2
+    image: postgres:10.3
     environment:
       POSTGRES_PASSWORD: ""
     ports:

data/gemfiles/rails_4_2.gemfile

@@ -9,4 +9,15 @@ group :local do
   gem "guard-rspec", "~> 4.2"
 end
 
+platforms :ruby do
+  gem "pg", "< 1.0.0"
+  gem "mysql2", "~> 0.4.0"
+end
+
+platforms :jruby do
+  gem "activerecord-jdbc-adapter", "~> 1.3"
+  gem "activerecord-jdbcpostgresql-adapter", "~> 1.3"
+  gem "activerecord-jdbcmysql-adapter", "~> 1.3"
+end
+
 gemspec path: "../"

data/gemfiles/rails_5_0.gemfile

@@ -9,4 +9,14 @@ group :local do
   gem "guard-rspec", "~> 4.2"
 end
 
+platforms :ruby do
+  gem "pg", "< 1.0.0"
+end
+
+platforms :jruby do
+  gem "activerecord-jdbc-adapter", "~> 50.0"
+  gem "activerecord-jdbcpostgresql-adapter", "~> 50.0"
+  gem "activerecord-jdbcmysql-adapter", "~> 50.0"
+end
+
 gemspec path: "../"

data/gemfiles/rails_5_1.gemfile

@@ -2,11 +2,21 @@
 
 source "http://rubygems.org"
 
-gem "rails", "5.1.1"
+gem "rails", "~> 5.1.0"
 
 group :local do
   gem "pry"
   gem "guard-rspec", "~> 4.2"
 end
 
+platforms :ruby do
+  gem "pg", "< 1.0.0"
+end
+
+platforms :jruby do
+  gem "activerecord-jdbc-adapter", "~> 51.0"
+  gem "activerecord-jdbcpostgresql-adapter", "~> 51.0"
+  gem "activerecord-jdbcmysql-adapter", "~> 51.0"
+end
+
 gemspec path: "../"

data/gemfiles/rails_5_2.gemfile

@@ -0,0 +1,18 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rails", "~> 5.2.0"
+
+group :local do
+  gem "pry"
+  gem "guard-rspec", "~> 4.2"
+end
+
+platforms :jruby do
+  gem "activerecord-jdbc-adapter", "~> 51.0"
+  gem "activerecord-jdbcpostgresql-adapter", "~> 51.0"
+  gem "activerecord-jdbcmysql-adapter", "~> 51.0"
+end
+
+gemspec path: "../"

data/gemfiles/rails_master.gemfile

@@ -9,4 +9,10 @@ group :local do
   gem "guard-rspec", "~> 4.2"
 end
 
+platforms :jruby do
+  gem "activerecord-jdbc-adapter", "~> 51.0"
+  gem "activerecord-jdbcpostgresql-adapter", "~> 51.0"
+  gem "activerecord-jdbcmysql-adapter", "~> 51.0"
+end
+
 gemspec path: "../"

data/lib/apartment.rb

@@ -10,8 +10,8 @@ module Apartment
 
     extend Forwardable
 
-    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, :parallel_migration_threads]
+    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, :parallel_migration_threads, :pg_excluded_names]
 
     attr_accessor(*ACCESSOR_METHODS)
     attr_writer(*WRITER_METHODS)
@@ -78,6 +78,10 @@ module Apartment
       @seed_data_file = "#{Rails.root}/db/seeds.rb"
     end
 
+    def pg_excluded_names
+      @pg_excluded_names || []
+    end
+
     # Reset all the config for Apartment
     def reset
       (ACCESSOR_METHODS + WRITER_METHODS).each{|method| remove_instance_variable(:"@#{method}") if instance_variable_defined?(:"@#{method}") }

data/lib/apartment/adapters/postgresql_adapter.rb

@@ -113,12 +113,24 @@ module Apartment
       ]
 
       def import_database_schema
-        clone_pg_schema
-        copy_schema_migrations
+        preserving_search_path do
+          clone_pg_schema
+          copy_schema_migrations
+        end
       end
 
     private
 
+      # Re-set search path after the schema is imported.
+      # Postgres now sets search path to empty before dumping the schema
+      # and it mut be reset
+      #
+      def preserving_search_path
+        search_path = Apartment.connection.execute("show search_path").first["search_path"]
+        yield
+        Apartment.connection.execute("set search_path = #{search_path}")
+      end
+
       # Clone default schema into new schema named after current tenant
       #
       def clone_pg_schema
@@ -155,7 +167,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 -t ar_internal_metadata -n #{default_tenant} #{dbname}` }
+        with_pg_env { `pg_dump -a --inserts -t #{default_tenant}.schema_migrations -t #{default_tenant}.ar_internal_metadata #{dbname}` }
       end
 
       # Temporary set Postgresql related environment variables if there are in @config
@@ -180,13 +192,23 @@ module Apartment
       def patch_search_path(sql)
         search_path = "SET search_path = \"#{current}\", #{default_tenant};"
 
-        sql
+        swap_schema_qualifier(sql)
           .split("\n")
           .select {|line| check_input_against_regexps(line, PSQL_DUMP_BLACKLISTED_STATEMENTS).empty?}
           .prepend(search_path)
           .join("\n")
       end
 
+      def swap_schema_qualifier(sql)
+        sql.gsub(/#{default_tenant}\.\w*/) do |match|
+          if Apartment.pg_excluded_names.any? { |name| match.include? name }
+            match
+          else
+            match.gsub(default_tenant, %{"#{current}"})
+          end
+        end
+      end
+
       #   Checks if any of regexps matches against input
       #
       def check_input_against_regexps(input, regexps)

data/lib/apartment/migrator.rb

@@ -10,8 +10,12 @@ module Apartment
       Tenant.switch(database) do
         version = ENV["VERSION"] ? ENV["VERSION"].to_i : nil
 
-        ActiveRecord::Migrator.migrate(ActiveRecord::Migrator.migrations_paths, version) do |migration|
-          ENV["SCOPE"].blank? || (ENV["SCOPE"] == migration.scope)
+        migration_scope_block = -> (migration) { ENV["SCOPE"].blank? || (ENV["SCOPE"] == migration.scope) }
+
+        if activerecord_below_5_2?
+          ActiveRecord::Migrator.migrate(ActiveRecord::Migrator.migrations_paths, version, &migration_scope_block)
+        else
+          ActiveRecord::Base.connection.migration_context.migrate(version, &migration_scope_block)
         end
       end
     end
@@ -19,15 +23,29 @@ module Apartment
     # Migrate up/down to a specific version
     def run(direction, database, version)
       Tenant.switch(database) do
-        ActiveRecord::Migrator.run(direction, ActiveRecord::Migrator.migrations_paths, version)
+        if activerecord_below_5_2?
+          ActiveRecord::Migrator.run(direction, ActiveRecord::Migrator.migrations_paths, version)
+        else
+          ActiveRecord::Base.connection.migration_context.run(direction, version)
+        end
       end
     end
 
     # rollback latest migration `step` number of times
     def rollback(database, step = 1)
       Tenant.switch(database) do
-        ActiveRecord::Migrator.rollback(ActiveRecord::Migrator.migrations_paths, step)
+        if activerecord_below_5_2?
+          ActiveRecord::Migrator.rollback(ActiveRecord::Migrator.migrations_paths, step)
+        else
+          ActiveRecord::Base.connection.migration_context.rollback(step)
+        end
       end
     end
+
+    private
+
+    def activerecord_below_5_2?
+      ActiveRecord.version.release < Gem::Version.new('5.2.0')
+    end
   end
 end

data/lib/apartment/railtie.rb

@@ -27,10 +27,15 @@ module Apartment
     #   See the middleware/console declarations below to help with this. Hope to fix that soon.
     #
     config.to_prepare do
-      unless ARGV.any? { |arg| arg =~ /\Aassets:(?:precompile|clean)\z/ }
+      next if ARGV.any? { |arg| arg =~ /\Aassets:(?:precompile|clean)\z/ }
+
+      begin
         Apartment.connection_class.connection_pool.with_connection do
           Apartment::Tenant.init
         end
+      rescue ::ActiveRecord::NoDatabaseError
+        # Since `db:create` and other tasks invoke this block from Rails 5.2.0,
+        # we need to swallow the error to execute `db:create` properly.
       end
     end
 

data/lib/apartment/version.rb

@@ -1,3 +1,3 @@
 module Apartment
-  VERSION = "2.1.0"
+  VERSION = "2.2.0"
 end

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

@@ -85,6 +85,16 @@ Apartment.configure do |config|
   # Uncomment the line below if you want to disable this behaviour in production.
   #
   # config.prepend_environment = !Rails.env.production?
+
+  # When using PostgreSQL schemas, the database dump will be namespaced, and
+  # apartment will substitute the default namespace (usually public) with the
+  # name of the new tenant when creating a new tenant. Some items must maintain
+  # a reference to the default namespace (ie public) - for instance, a default
+  # uuid generation. Uncomment the line below to create a list of namespaced
+  # items in the schema dump that should *not* have their namespace replaced by
+  # the new tenant
+  #
+  # config.pg_excluded_names = ["uuid_generate_v4"]
 end
 
 # Setup a custom Tenant switching middleware. The Proc should return the name of the Tenant that

data/spec/integration/apartment_rake_integration_spec.rb

@@ -47,19 +47,52 @@ describe "apartment rake tasks", database: :postgresql do
       Company.delete_all
     end
 
-    describe "#migrate" do
-      it "should migrate all databases" do
-        expect(ActiveRecord::Migrator).to receive(:migrate).exactly(company_count).times
+    context "with ActiveRecord below 5.2.0" do
+      before do
+        allow(ActiveRecord::Migrator).to receive(:migrations_paths) { %w(spec/dummy/db/migrate) }
+        allow(Apartment::Migrator).to receive(:activerecord_below_5_2?) { true }
+      end
+
+      describe "#migrate" do
+        it "should migrate all databases" do
+          expect(ActiveRecord::Migrator).to receive(:migrate).exactly(company_count).times
+
+          @rake['apartment:migrate'].invoke
+        end
+      end
+
+      describe "#rollback" do
+        it "should rollback all dbs" do
+          expect(ActiveRecord::Migrator).to receive(:rollback).exactly(company_count).times
 
-        @rake['apartment:migrate'].invoke
+          @rake['apartment:rollback'].invoke
+        end
       end
     end
 
-    describe "#rollback" do
-      it "should rollback all dbs" do
-        expect(ActiveRecord::Migrator).to receive(:rollback).exactly(company_count).times
+    context "with ActiveRecord above or equal to 5.2.0" do
+      let(:migration_context_double) { double(:migration_context) }
+
+      before do
+        allow(Apartment::Migrator).to receive(:activerecord_below_5_2?) { false }
+      end
+
+      describe "#migrate" do
+        it "should migrate all databases" do
+          allow(ActiveRecord::Base.connection).to receive(:migration_context) { migration_context_double }
+          expect(migration_context_double).to receive(:migrate).exactly(company_count).times
+
+          @rake['apartment:migrate'].invoke
+        end
+      end
+
+      describe "#rollback" do
+        it "should rollback all dbs" do
+          allow(ActiveRecord::Base.connection).to receive(:migration_context) { migration_context_double }
+          expect(migration_context_double).to receive(:rollback).exactly(company_count).times
 
-        @rake['apartment:rollback'].invoke
+          @rake['apartment:rollback'].invoke
+        end
       end
     end
 

data/spec/unit/migrator_spec.rb

@@ -8,30 +8,70 @@ describe Apartment::Migrator do
   # Don't need a real switch here, just testing behaviour
   before { allow(Apartment::Tenant.adapter).to receive(:connect_to_new) }
 
-  describe "::migrate" do
-    it "switches and migrates" do
-      expect(Apartment::Tenant).to receive(:switch).with(tenant).and_call_original
-      expect(ActiveRecord::Migrator).to receive(:migrate)
+  context "with ActiveRecord below 5.2.0", skip: ActiveRecord.version >= Gem::Version.new("5.2.0") do
+    before do
+      allow(ActiveRecord::Migrator).to receive(:migrations_paths) { %w(spec/dummy/db/migrate) }
+      allow(Apartment::Migrator).to receive(:activerecord_below_5_2?) { true }
+    end
+
+    describe "::migrate" do
+      it "switches and migrates" do
+        expect(Apartment::Tenant).to receive(:switch).with(tenant).and_call_original
+        expect(ActiveRecord::Migrator).to receive(:migrate)
 
-      Apartment::Migrator.migrate(tenant)
+        Apartment::Migrator.migrate(tenant)
+      end
     end
-  end
 
-  describe "::run" do
-    it "switches and runs" do
-      expect(Apartment::Tenant).to receive(:switch).with(tenant).and_call_original
-      expect(ActiveRecord::Migrator).to receive(:run).with(:up, anything, 1234)
+    describe "::run" do
+      it "switches and runs" do
+        expect(Apartment::Tenant).to receive(:switch).with(tenant).and_call_original
+        expect(ActiveRecord::Migrator).to receive(:run).with(:up, anything, 1234)
 
-      Apartment::Migrator.run(:up, tenant, 1234)
+        Apartment::Migrator.run(:up, tenant, 1234)
+      end
+    end
+
+    describe "::rollback" do
+      it "switches and rolls back" do
+        expect(Apartment::Tenant).to receive(:switch).with(tenant).and_call_original
+        expect(ActiveRecord::Migrator).to receive(:rollback).with(anything, 2)
+
+        Apartment::Migrator.rollback(tenant, 2)
+      end
     end
   end
 
-  describe "::rollback" do
-    it "switches and rolls back" do
-      expect(Apartment::Tenant).to receive(:switch).with(tenant).and_call_original
-      expect(ActiveRecord::Migrator).to receive(:rollback).with(anything, 2)
+  context "with ActiveRecord above or equal to 5.2.0", skip: ActiveRecord.version < Gem::Version.new("5.2.0") do
+    before do
+      allow(Apartment::Migrator).to receive(:activerecord_below_5_2?) { false }
+    end
+
+    describe "::migrate" do
+      it "switches and migrates" do
+        expect(Apartment::Tenant).to receive(:switch).with(tenant).and_call_original
+        expect_any_instance_of(ActiveRecord::MigrationContext).to receive(:migrate)
+
+        Apartment::Migrator.migrate(tenant)
+      end
+    end
+
+    describe "::run" do
+      it "switches and runs" do
+        expect(Apartment::Tenant).to receive(:switch).with(tenant).and_call_original
+        expect_any_instance_of(ActiveRecord::MigrationContext).to receive(:run).with(:up, 1234)
+
+        Apartment::Migrator.run(:up, tenant, 1234)
+      end
+    end
+
+    describe "::rollback" do
+      it "switches and rolls back" do
+        expect(Apartment::Tenant).to receive(:switch).with(tenant).and_call_original
+        expect_any_instance_of(ActiveRecord::MigrationContext).to receive(:rollback).with(2)
 
-      Apartment::Migrator.rollback(tenant, 2)
+        Apartment::Migrator.rollback(tenant, 2)
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apartment
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Ryan Brunner
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-15 00:00:00.000000000 Z
+date: 2018-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -147,30 +147,30 @@ dependencies:
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.10
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.10
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -208,11 +208,10 @@ files:
 - TODO.md
 - apartment.gemspec
 - docker-compose.yml
-- gemfiles/rails_4_0.gemfile
-- gemfiles/rails_4_1.gemfile
 - gemfiles/rails_4_2.gemfile
 - gemfiles/rails_5_0.gemfile
 - gemfiles/rails_5_1.gemfile
+- gemfiles/rails_5_2.gemfile
 - gemfiles/rails_master.gemfile
 - lib/apartment.rb
 - lib/apartment/adapters/abstract_adapter.rb
@@ -360,7 +359,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A Ruby gem for managing database multitenancy

data/gemfiles/rails_4_0.gemfile

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

data/gemfiles/rails_4_1.gemfile

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