ros-apartment 2.3.0 → 2.4.0

data/spec/integration/apartment_rake_integration_spec.rb

@@ -1,8 +1,9 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'rake'
 
-describe "apartment rake tasks", database: :postgresql do
-
+describe 'apartment rake tasks', database: :postgresql do
   before do
     @rake = Rake::Application.new
     Rake.application = @rake
@@ -18,8 +19,8 @@ describe "apartment rake tasks", database: :postgresql do
 
     Apartment.configure do |config|
       config.use_schemas = true
-      config.excluded_models = ["Company"]
-      config.tenant_names = lambda{ Company.pluck(:database) }
+      config.excluded_models = ['Company']
+      config.tenant_names = -> { Company.pluck(:database) }
     end
     Apartment::Tenant.reload!(config)
 
@@ -29,40 +30,39 @@ describe "apartment rake tasks", database: :postgresql do
 
   after { Rake.application = nil }
 
-  context "with x number of databases" do
-
-    let(:x){ 1 + rand(5) }    # random number of dbs to create
-    let(:db_names){ x.times.map{ Apartment::Test.next_db } }
-    let!(:company_count){ db_names.length }
+  context 'with x number of databases' do
+    let(:x) { rand(1..5) } # random number of dbs to create
+    let(:db_names) { x.times.map { Apartment::Test.next_db } }
+    let!(:company_count) { db_names.length }
 
     before do
       db_names.collect do |db_name|
         Apartment::Tenant.create(db_name)
-        Company.create :database => db_name
+        Company.create database: db_name
       end
     end
 
     after do
-      db_names.each{ |db| Apartment::Tenant.drop(db) }
+      db_names.each { |db| Apartment::Tenant.drop(db) }
       Company.delete_all
     end
 
-    context "with ActiveRecord below 5.2.0" do
+    context 'with ActiveRecord below 5.2.0' do
       before do
-        allow(ActiveRecord::Migrator).to receive(:migrations_paths) { %w(spec/dummy/db/migrate) }
+        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
+      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
+      describe '#rollback' do
+        it 'should rollback all dbs' do
           expect(ActiveRecord::Migrator).to receive(:rollback).exactly(company_count).times
 
           @rake['apartment:rollback'].invoke
@@ -70,15 +70,15 @@ describe "apartment rake tasks", database: :postgresql do
       end
     end
 
-    context "with ActiveRecord above or equal to 5.2.0" do
+    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
+      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
 
@@ -86,8 +86,8 @@ describe "apartment rake tasks", database: :postgresql do
         end
       end
 
-      describe "#rollback" do
-        it "should rollback all dbs" do
+      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
 
@@ -96,8 +96,8 @@ describe "apartment rake tasks", database: :postgresql do
       end
     end
 
-    describe "apartment:seed" do
-      it "should seed all databases" do
+    describe 'apartment:seed' do
+      it 'should seed all databases' do
         expect(Apartment::Tenant).to receive(:seed).exactly(company_count).times
 
         @rake['apartment:seed'].invoke

data/spec/integration/query_caching_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'query caching' do
@@ -6,8 +8,8 @@ describe 'query caching' do
 
     before do
       Apartment.configure do |config|
-        config.excluded_models = ["Company"]
-        config.tenant_names = lambda{ Company.pluck(:database) }
+        config.excluded_models = ['Company']
+        config.tenant_names = -> { Company.pluck(:database) }
         config.use_schemas = true
       end
 
@@ -20,7 +22,7 @@ describe 'query caching' do
     end
 
     after do
-      db_names.each{ |db| Apartment::Tenant.drop(db) }
+      db_names.each { |db| Apartment::Tenant.drop(db) }
       Apartment::Tenant.reset
       Company.delete_all
     end
@@ -34,10 +36,10 @@ describe 'query caching' do
       ActiveRecord::Base.connection.enable_query_cache!
 
       Apartment::Tenant.switch! db_names.first
-      expect(User.find_by_name(db_names.first).name).to eq(db_names.first)
+      expect(User.find_by(name: db_names.first).name).to eq(db_names.first)
 
       Apartment::Tenant.switch! db_names.last
-      expect(User.find_by_name(db_names.first)).to be_nil
+      expect(User.find_by(name: db_names.first)).to be_nil
     end
   end
 
@@ -46,8 +48,8 @@ describe 'query caching' do
 
     before do
       Apartment.configure do |config|
-        config.excluded_models = ["Company"]
-        config.tenant_names = lambda{ Company.pluck(:database) }
+        config.excluded_models = ['Company']
+        config.tenant_names = -> { Company.pluck(:database) }
         config.use_schemas = false
       end
 
@@ -66,7 +68,7 @@ describe 'query caching' do
       Company.delete_all
     end
 
-    it "configuration value is kept after switching databases" do
+    it 'configuration value is kept after switching databases' do
       ActiveRecord::Base.connection.enable_query_cache!
 
       Apartment::Tenant.switch! db_name

data/spec/integration/use_within_an_engine_spec.rb

@@ -1,7 +1,8 @@
-describe 'using apartment within an engine' do
+# frozen_string_literal: true
 
+describe 'using apartment within an engine' do
   before do
-    engine_path = Pathname.new(File.expand_path('../../dummy_engine', __FILE__))
+    engine_path = Pathname.new(File.expand_path('../dummy_engine', __dir__))
     require engine_path.join('test/dummy/config/application')
     @rake = Rake::Application.new
     Rake.application = @rake
@@ -10,11 +11,11 @@ describe 'using apartment within an engine' do
   end
 
   it 'sucessfully runs rake db:migrate in the engine root' do
-    expect{ Rake::Task['db:migrate'].invoke }.to_not raise_error
+    expect { Rake::Task['db:migrate'].invoke }.to_not raise_error
   end
 
   it 'sucessfully runs rake app:db:migrate in the engine root' do
-    expect{ Rake::Task['app:db:migrate'].invoke }.to_not raise_error
+    expect { Rake::Task['app:db:migrate'].invoke }.to_not raise_error
   end
 
   context 'when Apartment.db_migrate_tenants is false' do
@@ -24,5 +25,4 @@ describe 'using apartment within an engine' do
       Rake::Task['db:migrate'].invoke
     end
   end
-
 end

data/spec/schemas/v1.rb

@@ -1,4 +1,4 @@
-# encoding: UTF-8
+# frozen_string_literal: true
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
@@ -11,6 +11,5 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 0) do
-
+ActiveRecord::Schema.define(version: 0) do
 end

data/spec/schemas/v2.rb

@@ -1,4 +1,4 @@
-# encoding: UTF-8
+# frozen_string_literal: true
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
@@ -11,33 +11,31 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20110613152810) do
-
-  create_table "companies", :force => true do |t|
-    t.boolean "dummy"
-    t.string  "database"
+ActiveRecord::Schema.define(version: 20110613152810) do
+  create_table 'companies', force: true do |t|
+    t.boolean 'dummy'
+    t.string  'database'
   end
 
-  create_table "delayed_jobs", :force => true do |t|
-    t.integer  "priority",   :default => 0
-    t.integer  "attempts",   :default => 0
-    t.text     "handler"
-    t.text     "last_error"
-    t.datetime "run_at"
-    t.datetime "locked_at"
-    t.datetime "failed_at"
-    t.string   "locked_by"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.string   "queue"
+  create_table 'delayed_jobs', force: true do |t|
+    t.integer  'priority',   default: 0
+    t.integer  'attempts',   default: 0
+    t.text     'handler'
+    t.text     'last_error'
+    t.datetime 'run_at'
+    t.datetime 'locked_at'
+    t.datetime 'failed_at'
+    t.string   'locked_by'
+    t.datetime 'created_at'
+    t.datetime 'updated_at'
+    t.string   'queue'
   end
 
-  add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority"
+  add_index 'delayed_jobs', ['priority', 'run_at'], name: 'delayed_jobs_priority'
 
-  create_table "users", :force => true do |t|
-    t.string   "name"
-    t.datetime "birthdate"
-    t.string   "sex"
+  create_table 'users', force: true do |t|
+    t.string   'name'
+    t.datetime 'birthdate'
+    t.string   'sex'
   end
-
 end

data/spec/schemas/v3.rb

@@ -1,4 +1,4 @@
-# encoding: UTF-8
+# frozen_string_literal: true
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
@@ -11,39 +11,37 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20111202022214) do
-
-  create_table "books", :force => true do |t|
-    t.string   "name"
-    t.integer  "pages"
-    t.datetime "published"
+ActiveRecord::Schema.define(version: 20111202022214) do
+  create_table 'books', force: true do |t|
+    t.string   'name'
+    t.integer  'pages'
+    t.datetime 'published'
   end
 
-  create_table "companies", :force => true do |t|
-    t.boolean "dummy"
-    t.string  "database"
+  create_table 'companies', force: true do |t|
+    t.boolean 'dummy'
+    t.string  'database'
   end
 
-  create_table "delayed_jobs", :force => true do |t|
-    t.integer  "priority",   :default => 0
-    t.integer  "attempts",   :default => 0
-    t.text     "handler"
-    t.text     "last_error"
-    t.datetime "run_at"
-    t.datetime "locked_at"
-    t.datetime "failed_at"
-    t.string   "locked_by"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.string   "queue"
+  create_table 'delayed_jobs', force: true do |t|
+    t.integer  'priority',   default: 0
+    t.integer  'attempts',   default: 0
+    t.text     'handler'
+    t.text     'last_error'
+    t.datetime 'run_at'
+    t.datetime 'locked_at'
+    t.datetime 'failed_at'
+    t.string   'locked_by'
+    t.datetime 'created_at'
+    t.datetime 'updated_at'
+    t.string   'queue'
   end
 
-  add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority"
+  add_index 'delayed_jobs', ['priority', 'run_at'], name: 'delayed_jobs_priority'
 
-  create_table "users", :force => true do |t|
-    t.string   "name"
-    t.datetime "birthdate"
-    t.string   "sex"
+  create_table 'users', force: true do |t|
+    t.string   'name'
+    t.datetime 'birthdate'
+    t.string   'sex'
   end
-
 end

data/spec/spec_helper.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 
 # Configure Rails Environment
-ENV["RAILS_ENV"] = "test"
+ENV['RAILS_ENV'] = 'test'
 
-require File.expand_path("../dummy/config/environment.rb", __FILE__)
+require File.expand_path('dummy/config/environment.rb', __dir__)
 
 # Loading dummy applications affects table_name of each excluded models
 # defined in `spec/dummy/config/initializers/apartment.rb`.
@@ -16,19 +18,20 @@ Apartment.excluded_models.each do |model|
   klass.reset_table_name
 end
 
-require "rspec/rails"
+require 'rspec/rails'
 require 'capybara/rspec'
 require 'capybara/rails'
 
 begin
   require 'pry'
-  silence_warnings{ IRB = Pry }
+  silence_warnings { IRB = Pry }
 rescue LoadError
+  nil
 end
 
 ActionMailer::Base.delivery_method = :test
 ActionMailer::Base.perform_deliveries = true
-ActionMailer::Base.default_url_options[:host] = "test.com"
+ActionMailer::Base.default_url_options[:host] = 'test.com'
 
 Rails.backtrace_cleaner.remove_silencers!
 
@@ -36,7 +39,6 @@ Rails.backtrace_cleaner.remove_silencers!
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
 RSpec.configure do |config|
-
   config.include RSpec::Integration::CapybaraSessions, type: :request
   config.include Apartment::Spec::Setup
 

data/spec/support/apartment_helpers.rb

@@ -1,7 +1,10 @@
+# frozen_string_literal: true
+
 module Apartment
   module Test
-
+    # rubocop:disable Style/ModuleFunction
     extend self
+    # rubocop:enable Style/ModuleFunction
 
     def reset
       Apartment.excluded_models = nil
@@ -12,11 +15,13 @@ module Apartment
 
     def next_db
       @x ||= 0
-      "db%d" % @x += 1
+      format('db%<db_idx>d', db_idx: @x += 1)
     end
 
     def drop_schema(schema)
-      ActiveRecord::Base.connection.execute("DROP SCHEMA IF EXISTS #{schema} CASCADE") rescue true
+      ActiveRecord::Base.connection.execute("DROP SCHEMA IF EXISTS #{schema} CASCADE")
+    rescue StandardError => _e
+      true
     end
 
     # Use this if you don't want to import schema.rb etc... but need the postgres schema to exist
@@ -28,7 +33,7 @@ module Apartment
     def load_schema(version = 3)
       file = File.expand_path("../../schemas/v#{version}.rb", __FILE__)
 
-      silence_warnings{ load(file) }
+      silence_warnings { load(file) }
     end
 
     def migrate
@@ -38,6 +43,5 @@ module Apartment
     def rollback
       ActiveRecord::Migrator.rollback(Rails.root + ActiveRecord::Migrator.migrations_path)
     end
-
   end
 end

data/spec/support/capybara_sessions.rb

@@ -1,15 +1,15 @@
+# frozen_string_literal: true
+
 module RSpec
   module Integration
     module CapybaraSessions
-      
-      def in_new_session(&block)
+      def in_new_session(&_block)
         yield new_session
       end
-      
+
       def new_session
         Capybara::Session.new(Capybara.current_driver, Capybara.app)
       end
-      
     end
   end
-end
+end

data/spec/support/config.rb

@@ -1,10 +1,13 @@
+# frozen_string_literal: true
+
 require 'yaml'
 
 module Apartment
   module Test
-
     def self.config
+      # rubocop:disable Security/YAMLLoad
       @config ||= YAML.load(ERB.new(IO.read('spec/config/database.yml')).result)
+      # rubocop:enable Security/YAMLLoad
     end
   end
-end
+end

data/spec/support/contexts.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 #   Some shared contexts for specs
 
-shared_context "with default schema", :default_schema => true do
-  let(:default_schema){ Apartment::Test.next_db }
+shared_context 'with default schema', default_schema: true do
+  let(:default_schema) { Apartment::Test.next_db }
 
   before do
     Apartment::Test.create_schema(default_schema)
@@ -16,7 +18,7 @@ shared_context "with default schema", :default_schema => true do
 end
 
 # Some default setup for elevator specs
-shared_context "elevators", elevator: true do
+shared_context 'elevators', elevator: true do
   let(:company1)  { mock_model(Company, database: db1).as_null_object }
   let(:company2)  { mock_model(Company, database: db2).as_null_object }
 
@@ -37,16 +39,16 @@ shared_context "elevators", elevator: true do
   end
 end
 
-shared_context "persistent_schemas", :persistent_schemas => true do
-  let(:persistent_schemas){ ['hstore', 'postgis'] }
+shared_context 'persistent_schemas', persistent_schemas: true do
+  let(:persistent_schemas) { %w[hstore postgis] }
 
   before do
-    persistent_schemas.map{|schema| subject.create(schema) }
+    persistent_schemas.map { |schema| subject.create(schema) }
     Apartment.persistent_schemas = persistent_schemas
   end
 
   after do
     Apartment.persistent_schemas = []
-    persistent_schemas.map{|schema| subject.drop(schema) }
+    persistent_schemas.map { |schema| subject.drop(schema) }
   end
-end
+end

data/spec/support/requirements.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 module Apartment
   module Spec
-
     #
     #   Define the interface methods required to
     #   use an adapter shared example
@@ -19,16 +20,28 @@ module Apartment
           # Reset before dropping (can't drop a db you're connected to)
           subject.reset
 
-          # sometimes we manually drop these schemas in testing, don't care if we can't drop, hence rescue
-          subject.drop(db1) rescue true
-          subject.drop(db2) rescue true
+          # sometimes we manually drop these schemas in testing, don't care if
+          # we can't drop, hence rescue
+          begin
+            subject.drop(db1)
+          rescue StandardError => _e
+            true
+          end
+
+          begin
+            subject.drop(db2)
+          rescue StandardError => _e
+            true
+          end
         end
       end
 
-      %w{subject tenant_names default_tenant}.each do |method|
+      %w[subject tenant_names default_tenant].each do |method|
+        next if defined?(method)
+
         define_method method do
           raise "You must define a `#{method}` method in your host group"
-        end unless defined?(method)
+        end
       end
     end
   end

data/spec/support/setup.rb

@@ -1,18 +1,18 @@
+# frozen_string_literal: true
+
 module Apartment
   module Spec
     module Setup
-
       def self.included(base)
         base.instance_eval do
-          let(:db1){ Apartment::Test.next_db }
-          let(:db2){ Apartment::Test.next_db }
-          let(:connection){ ActiveRecord::Base.connection }
+          let(:db1) { Apartment::Test.next_db }
+          let(:db2) { Apartment::Test.next_db }
+          let(:connection) { ActiveRecord::Base.connection }
 
           # This around ensures that we run these hooks before and after
           # any before/after hooks defined in individual tests
           # Otherwise these actually get run after test defined hooks
           around(:each) do |example|
-
             def config
               db = RSpec.current_example.metadata.fetch(:database, :postgresql)