ros-apartment 2.3.0 → 2.4.0

data/spec/adapters/postgresql_adapter_spec.rb

@@ -1,39 +1,42 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'apartment/adapters/postgresql_adapter'
 
 describe Apartment::Adapters::PostgresqlAdapter, database: :postgresql do
   unless defined?(JRUBY_VERSION)
 
-    subject{ Apartment::Tenant.postgresql_adapter config }
-
-    context "using schemas with schema.rb" do
+    subject { Apartment::Tenant.postgresql_adapter config }
 
-      before{ Apartment.use_schemas = true }
+    context 'using schemas with schema.rb' do
+      before { Apartment.use_schemas = true }
 
       # Not sure why, but somehow using let(:tenant_names) memoizes for the whole example group, not just each test
       def tenant_names
-        ActiveRecord::Base.connection.execute("SELECT nspname FROM pg_namespace;").collect { |row| row['nspname'] }
+        ActiveRecord::Base.connection.execute('SELECT nspname FROM pg_namespace;').collect { |row| row['nspname'] }
       end
 
       let(:default_tenant) { subject.switch { ActiveRecord::Base.connection.schema_search_path.gsub('"', '') } }
 
-      it_should_behave_like "a generic apartment adapter"
-      it_should_behave_like "a schema based apartment adapter"
+      it_should_behave_like 'a generic apartment adapter'
+      it_should_behave_like 'a schema based apartment adapter'
     end
 
-    context "using schemas with SQL dump" do
-
-      before{ Apartment.use_schemas = true; Apartment.use_sql = true }
+    context 'using schemas with SQL dump' do
+      before do
+        Apartment.use_schemas = true
+        Apartment.use_sql = true
+      end
 
       # Not sure why, but somehow using let(:tenant_names) memoizes for the whole example group, not just each test
       def tenant_names
-        ActiveRecord::Base.connection.execute("SELECT nspname FROM pg_namespace;").collect { |row| row['nspname'] }
+        ActiveRecord::Base.connection.execute('SELECT nspname FROM pg_namespace;').collect { |row| row['nspname'] }
       end
 
       let(:default_tenant) { subject.switch { ActiveRecord::Base.connection.schema_search_path.gsub('"', '') } }
 
-      it_should_behave_like "a generic apartment adapter"
-      it_should_behave_like "a schema based apartment adapter"
+      it_should_behave_like 'a generic apartment adapter'
+      it_should_behave_like 'a schema based apartment adapter'
 
       it 'allows for dashes in the schema name' do
         expect { Apartment::Tenant.create('has-dashes') }.to_not raise_error
@@ -42,20 +45,19 @@ describe Apartment::Adapters::PostgresqlAdapter, database: :postgresql do
       after { Apartment::Tenant.drop('has-dashes') if Apartment.connection.schema_exists? 'has-dashes' }
     end
 
-    context "using connections" do
-
-      before{ Apartment.use_schemas = false }
+    context 'using connections' do
+      before { Apartment.use_schemas = false }
 
       # Not sure why, but somehow using let(:tenant_names) memoizes for the whole example group, not just each test
       def tenant_names
-        connection.execute("select datname from pg_database;").collect { |row| row['datname'] }
+        connection.execute('select datname from pg_database;').collect { |row| row['datname'] }
       end
 
       let(:default_tenant) { subject.switch { ActiveRecord::Base.connection.current_database } }
 
-      it_should_behave_like "a generic apartment adapter"
-      it_should_behave_like "a generic apartment adapter able to handle custom configuration"
-      it_should_behave_like "a connection based apartment adapter"
+      it_should_behave_like 'a generic apartment adapter'
+      it_should_behave_like 'a generic apartment adapter able to handle custom configuration'
+      it_should_behave_like 'a connection based apartment adapter'
     end
   end
 end

data/spec/adapters/sqlite3_adapter_spec.rb

@@ -1,14 +1,16 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'apartment/adapters/sqlite3_adapter'
 
 describe Apartment::Adapters::Sqlite3Adapter, database: :sqlite do
   unless defined?(JRUBY_VERSION)
 
-    subject{ Apartment::Tenant.sqlite3_adapter config }
+    subject { Apartment::Tenant.sqlite3_adapter config }
 
-    context "using connections" do
+    context 'using connections' do
       def tenant_names
-        db_dir = File.expand_path("../../dummy/db", __FILE__)
+        db_dir = File.expand_path('../dummy/db', __dir__)
         Dir.glob("#{db_dir}/*.sqlite3").map { |file| File.basename(file, '.sqlite3') }
       end
 
@@ -16,18 +18,18 @@ describe Apartment::Adapters::Sqlite3Adapter, database: :sqlite do
         subject.switch { File.basename(Apartment::Test.config['connections']['sqlite']['database'], '.sqlite3') }
       end
 
-      it_should_behave_like "a generic apartment adapter"
-      it_should_behave_like "a connection based apartment adapter"
+      it_should_behave_like 'a generic apartment adapter'
+      it_should_behave_like 'a connection based apartment adapter'
 
       after(:all) do
         File.delete(Apartment::Test.config['connections']['sqlite']['database'])
       end
     end
 
-    context "with prepend and append" do
+    context 'with prepend and append' do
       let(:default_dir) { File.expand_path(File.dirname(config[:database])) }
-      describe "#prepend" do
-        let (:db_name) { "db_with_prefix" }
+      describe '#prepend' do
+        let(:db_name) { 'db_with_prefix' }
         before do
           Apartment.configure do |config|
             config.prepend_environment = true
@@ -35,32 +37,44 @@ describe Apartment::Adapters::Sqlite3Adapter, database: :sqlite do
           end
         end
 
-        after { subject.drop db_name rescue nil }
+        after do
+          begin
+            subject.drop db_name
+          rescue StandardError => _e
+            nil
+          end
+        end
 
-        it "should create a new database" do
+        it 'should create a new database' do
           subject.create db_name
 
-          expect(File.exists?("#{default_dir}/#{Rails.env}_#{db_name}.sqlite3")).to eq true
+          expect(File.exist?("#{default_dir}/#{Rails.env}_#{db_name}.sqlite3")).to eq true
         end
       end
 
-      describe "#neither" do
-        let (:db_name) { "db_without_prefix_suffix" }
+      describe '#neither' do
+        let(:db_name) { 'db_without_prefix_suffix' }
         before do
           Apartment.configure { |config| config.prepend_environment = config.append_environment = false }
         end
 
-        after { subject.drop db_name rescue nil }
+        after do
+          begin
+            subject.drop db_name
+          rescue StandardError => _e
+            nil
+          end
+        end
 
-        it "should create a new database" do
+        it 'should create a new database' do
           subject.create db_name
 
-          expect(File.exists?("#{default_dir}/#{db_name}.sqlite3")).to eq true
+          expect(File.exist?("#{default_dir}/#{db_name}.sqlite3")).to eq true
         end
       end
 
-      describe "#append" do
-        let (:db_name) { "db_with_suffix" }
+      describe '#append' do
+        let(:db_name) { 'db_with_suffix' }
         before do
           Apartment.configure do |config|
             config.prepend_environment = false
@@ -68,16 +82,20 @@ describe Apartment::Adapters::Sqlite3Adapter, database: :sqlite do
           end
         end
 
-        after { subject.drop db_name rescue nil }
+        after do
+          begin
+            subject.drop db_name
+          rescue StandardError => _e
+            nil
+          end
+        end
 
-        it "should create a new database" do
+        it 'should create a new database' do
           subject.create db_name
 
-          expect(File.exists?("#{default_dir}/#{db_name}_#{Rails.env}.sqlite3")).to eq true
+          expect(File.exist?("#{default_dir}/#{db_name}_#{Rails.env}.sqlite3")).to eq true
         end
       end
-
     end
-
   end
 end

data/spec/apartment_spec.rb

@@ -1,11 +1,13 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Apartment do
-  it "should be valid" do
+  it 'should be valid' do
     expect(Apartment).to be_a(Module)
   end
 
-  it "should be a valid app" do
+  it 'should be a valid app' do
     expect(::Rails.application).to be_a(Dummy::Application)
   end
 end

data/spec/dummy/app/controllers/application_controller.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 class ApplicationController < ActionController::Base
   protect_from_forgery
-  
-  def index
-  end
+
+  def index; end
 end

data/spec/dummy/app/helpers/application_helper.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 module ApplicationHelper
 end

data/spec/dummy/app/models/application_record.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+# NOTE: Dummy model base
+class ApplicationRecord < ActiveRecord::Base
+  self.abstract_class = true
+end

data/spec/dummy/app/models/company.rb

@@ -1,3 +1,5 @@
-class Company < ActiveRecord::Base
+# frozen_string_literal: true
+
+class Company < ApplicationRecord
   # Dummy models
-end
+end

data/spec/dummy/app/models/user.rb

@@ -1,3 +1,5 @@
-class User < ActiveRecord::Base
+# frozen_string_literal: true
+
+class User < ApplicationRecord
   # Dummy models
-end
+end

data/spec/dummy/config/application.rb

@@ -1,13 +1,15 @@
-require File.expand_path('../boot', __FILE__)
+# frozen_string_literal: true
 
-require "active_model/railtie"
-require "active_record/railtie"
-require "action_controller/railtie"
-require "action_view/railtie"
-require "action_mailer/railtie"
+require File.expand_path('boot', __dir__)
+
+require 'active_model/railtie'
+require 'active_record/railtie'
+require 'action_controller/railtie'
+require 'action_view/railtie'
+require 'action_mailer/railtie'
 
 Bundler.require
-require "apartment"
+require 'apartment'
 
 module Dummy
   class Application < Rails::Application
@@ -20,7 +22,7 @@ module Dummy
     config.middleware.use Apartment::Elevators::Subdomain
 
     # Custom directories with classes and modules you want to be autoloadable.
-    config.autoload_paths += %W(#{config.root}/lib)
+    config.autoload_paths += %W[#{config.root}/lib]
 
     # Only load the plugins named here, in the order given (default is alphabetical).
     # :all can be used as a placeholder for all plugins not explicitly named.
@@ -41,7 +43,7 @@ module Dummy
     # config.action_view.javascript_expansions[:defaults] = %w(jquery rails)
 
     # Configure the default encoding used in templates for Ruby 1.9.
-    config.encoding = "utf-8"
+    config.encoding = 'utf-8'
 
     # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters += [:password]

data/spec/dummy/config/boot.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 require 'rubygems'
 
-gemfile = File.expand_path('../../../../Gemfile', __FILE__)
+gemfile = File.expand_path('../../../Gemfile', __dir__)
 
 if File.exist?(gemfile)
   ENV['BUNDLE_GEMFILE'] = gemfile
@@ -8,4 +10,4 @@ if File.exist?(gemfile)
   Bundler.setup
 end
 
-$:.unshift File.expand_path('../../../../lib', __FILE__)
+$LOAD_PATH.unshift File.expand_path('../../../lib', __dir__)

data/spec/dummy/config/environment.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 # Load the rails application
-require File.expand_path('../application', __FILE__)
+require File.expand_path('application', __dir__)
 
 # Initialize the rails application
 Dummy::Application.initialize!

data/spec/dummy/config/environments/development.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Dummy::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
 
@@ -25,4 +27,3 @@ Dummy::Application.configure do
   # Only use best-standards-support built into browsers
   config.action_dispatch.best_standards_support = :builtin
 end
-

data/spec/dummy/config/environments/production.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Dummy::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
 
@@ -12,7 +14,7 @@ Dummy::Application.configure do
   config.action_controller.perform_caching = true
 
   # Specifies the header that your server uses for sending files
-  config.action_dispatch.x_sendfile_header = "X-Sendfile"
+  config.action_dispatch.x_sendfile_header = 'X-Sendfile'
 
   # For nginx:
   # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect'

data/spec/dummy/config/environments/test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Dummy::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
 
@@ -17,7 +19,7 @@ Dummy::Application.configure do
   config.action_dispatch.show_exceptions = false
 
   # Disable request forgery protection in test environment
-  config.action_controller.allow_forgery_protection    = false
+  config.action_controller.allow_forgery_protection = false
 
   # Tell Action Mailer not to deliver emails to the real world.
   # The :test delivery method accumulates sent emails in the

data/spec/dummy/config/initializers/apartment.rb

@@ -1,4 +1,6 @@
+# frozen_string_literal: true
+
 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) }
 end

data/spec/dummy/config/initializers/backtrace_silencers.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Be sure to restart your server when you modify this file.
 
 # You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.

data/spec/dummy/config/initializers/inflections.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Be sure to restart your server when you modify this file.
 
 # Add new inflection rules using the following format

data/spec/dummy/config/initializers/mime_types.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Be sure to restart your server when you modify this file.
 
 # Add new mime types for use in respond_to blocks:

data/spec/dummy/config/initializers/secret_token.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 # Your secret key for verifying the integrity of signed cookies.

data/spec/dummy/config/initializers/session_store.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
-Dummy::Application.config.session_store :cookie_store, :key => '_dummy_session'
+Dummy::Application.config.session_store :cookie_store, key: '_dummy_session'
 
 # Use the database for sessions instead of the cookie-based default,
 # which shouldn't be used to store highly confidential information

data/spec/dummy/config/routes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Dummy::Application.routes.draw do
-  root :to => 'application#index'
+  root to: 'application#index'
 end

data/spec/dummy/config.ru

@@ -1,4 +1,6 @@
+# frozen_string_literal: true
+
 # This file is used by Rack-based servers to start the application.
 
-require ::File.expand_path('../config/environment',  __FILE__)
+require ::File.expand_path('../config/environment', __FILE__)
 run Dummy::Application

data/spec/dummy/db/seeds/import.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 def create_users
-  6.times {|x| User.where(name: "Different User #{x}").first_or_create! }
+  6.times { |x| User.where(name: "Different User #{x}").first_or_create! }
 end
 
 create_users

data/spec/dummy/script/rails

@@ -1,6 +1,8 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 # This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
 
-APP_PATH = File.expand_path('../../config/application',  __FILE__)
-require File.expand_path('../../config/boot',  __FILE__)
+APP_PATH = File.expand_path('../config/application', __dir__)
+require File.expand_path('../config/boot', __dir__)
 require 'rails/commands'

data/spec/dummy_engine/config/initializers/apartment.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Require whichever elevator you're using below here...
 #
 # require 'apartment/elevators/generic'
@@ -8,7 +10,6 @@ require 'apartment/elevators/subdomain'
 # Apartment Configuration
 #
 Apartment.configure do |config|
-
   # These models will not be multi-tenanted,
   # but remain in the global (public) namespace
   #
@@ -17,13 +18,13 @@ Apartment.configure do |config|
   #
   # config.excluded_models = %w{Tenant}
   #
-  config.excluded_models = %w{}
+  config.excluded_models = %w[]
 
   # use postgres schemas?
   config.use_schemas = true
 
   # use raw SQL dumps for creating postgres schemas? (only appies with use_schemas set to true)
-  #config.use_sql = true
+  # config.use_sql = true
 
   # configure persistent schemas (E.g. hstore )
   # config.persistent_schemas = %w{ hstore }

data/spec/dummy_engine/lib/dummy_engine/engine.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DummyEngine
   class Engine < ::Rails::Engine
   end

data/spec/dummy_engine/lib/dummy_engine/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DummyEngine
-  VERSION = "0.0.1"
+  VERSION = '0.0.1'
 end

data/spec/dummy_engine/lib/dummy_engine.rb

@@ -1,4 +1,6 @@
-require "dummy_engine/engine"
+# frozen_string_literal: true
+
+require 'dummy_engine/engine'
 
 module DummyEngine
 end

data/spec/dummy_engine/test/dummy/config/application.rb

@@ -1,9 +1,11 @@
-require File.expand_path('../boot', __FILE__)
+# frozen_string_literal: true
+
+require File.expand_path('boot', __dir__)
 
 require 'rails/all'
 
 Bundler.require(*Rails.groups)
-require "dummy_engine"
+require 'dummy_engine'
 
 module Dummy
   class Application < Rails::Application

data/spec/dummy_engine/test/dummy/config/boot.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 # Set up gems listed in the Gemfile.
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../../Gemfile', __FILE__)
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../Gemfile', __dir__)
 
 require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
-$LOAD_PATH.unshift File.expand_path('../../../../lib', __FILE__)
+$LOAD_PATH.unshift File.expand_path('../../../lib', __dir__)

data/spec/dummy_engine/test/dummy/config/environment.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 # Load the Rails application.
-require File.expand_path('../application', __FILE__)
+require File.expand_path('application', __dir__)
 
 # Initialize the Rails application.
 Rails.application.initialize!

data/spec/dummy_engine/test/dummy/config/environments/development.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 

data/spec/dummy_engine/test/dummy/config/environments/production.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 

data/spec/dummy_engine/test/dummy/config/environments/test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 

data/spec/dummy_engine/test/dummy/config/initializers/assets.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 # Version of your assets, change this if you want to expire all your assets.

data/spec/dummy_engine/test/dummy/config/initializers/backtrace_silencers.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Be sure to restart your server when you modify this file.
 
 # You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.

data/spec/dummy_engine/test/dummy/config/initializers/cookies_serializer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
-Rails.application.config.action_dispatch.cookies_serializer = :json
+Rails.application.config.action_dispatch.cookies_serializer = :json

data/spec/dummy_engine/test/dummy/config/initializers/filter_parameter_logging.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 # Configure sensitive parameters which will be filtered from the log file.

data/spec/dummy_engine/test/dummy/config/initializers/inflections.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Be sure to restart your server when you modify this file.
 
 # Add new inflection rules using the following format. Inflections

data/spec/dummy_engine/test/dummy/config/initializers/mime_types.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Be sure to restart your server when you modify this file.
 
 # Add new mime types for use in respond_to blocks:

data/spec/dummy_engine/test/dummy/config/initializers/session_store.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 Rails.application.config.session_store :cookie_store, key: '_dummy_session'

data/spec/dummy_engine/test/dummy/config/initializers/wrap_parameters.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 # This file contains settings for ActionController::ParamsWrapper which

data/spec/dummy_engine/test/dummy/config/routes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Rails.application.routes.draw do
   # The priority is based upon order of creation: first created -> highest priority.
   # See how all your routes lay out with "rake routes".