ros-apartment 2.3.0 → 2.4.0

data/spec/unit/elevators/host_hash_spec.rb

@@ -1,29 +1,30 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'apartment/elevators/host_hash'
 
 describe Apartment::Elevators::HostHash do
+  subject(:elevator) { Apartment::Elevators::HostHash.new(proc {}, 'example.com' => 'example_tenant') }
 
-  subject(:elevator){ Apartment::Elevators::HostHash.new(Proc.new{}, 'example.com' => 'example_tenant') }
-
-  describe "#parse_tenant_name" do
-    it "parses the host for a domain name" do
+  describe '#parse_tenant_name' do
+    it 'parses the host for a domain name' do
       request = ActionDispatch::Request.new('HTTP_HOST' => 'example.com')
       expect(elevator.parse_tenant_name(request)).to eq('example_tenant')
     end
 
-    it "raises TenantNotFound exception if there is no host" do
+    it 'raises TenantNotFound exception if there is no host' do
       request = ActionDispatch::Request.new('HTTP_HOST' => '')
       expect { elevator.parse_tenant_name(request) }.to raise_error(Apartment::TenantNotFound)
     end
 
-    it "raises TenantNotFound exception if there is no database associated to current host" do
+    it 'raises TenantNotFound exception if there is no database associated to current host' do
       request = ActionDispatch::Request.new('HTTP_HOST' => 'example2.com')
       expect { elevator.parse_tenant_name(request) }.to raise_error(Apartment::TenantNotFound)
     end
   end
 
-  describe "#call" do
-    it "switches to the proper tenant" do
+  describe '#call' do
+    it 'switches to the proper tenant' do
       expect(Apartment::Tenant).to receive(:switch).with('example_tenant')
 
       elevator.call('HTTP_HOST' => 'example.com')

data/spec/unit/elevators/host_spec.rb

@@ -1,87 +1,87 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'apartment/elevators/host'
 
 describe Apartment::Elevators::Host do
+  subject(:elevator) { described_class.new(proc {}) }
 
-  subject(:elevator){ described_class.new(Proc.new{}) }
-
-  describe "#parse_tenant_name" do
-
-    it "should return nil when no host" do
+  describe '#parse_tenant_name' do
+    it 'should return nil when no host' do
       request = ActionDispatch::Request.new('HTTP_HOST' => '')
       expect(elevator.parse_tenant_name(request)).to be_nil
     end
 
-    context "assuming no ignored_first_subdomains" do
+    context 'assuming no ignored_first_subdomains' do
       before { allow(described_class).to receive(:ignored_first_subdomains).and_return([]) }
 
-      context "with 3 parts" do
-        it "should return the whole host" do
+      context 'with 3 parts' do
+        it 'should return the whole host' do
           request = ActionDispatch::Request.new('HTTP_HOST' => 'foo.bar.com')
           expect(elevator.parse_tenant_name(request)).to eq('foo.bar.com')
         end
       end
 
-      context "with 6 parts" do
-        it "should return the whole host" do
+      context 'with 6 parts' do
+        it 'should return the whole host' do
           request = ActionDispatch::Request.new('HTTP_HOST' => 'one.two.three.foo.bar.com')
           expect(elevator.parse_tenant_name(request)).to eq('one.two.three.foo.bar.com')
         end
       end
     end
 
-    context "assuming ignored_first_subdomains is set" do
-      before { allow(described_class).to receive(:ignored_first_subdomains).and_return(%w{www foo}) }
+    context 'assuming ignored_first_subdomains is set' do
+      before { allow(described_class).to receive(:ignored_first_subdomains).and_return(%w[www foo]) }
 
-      context "with 3 parts" do
-        it "should return host without www" do
+      context 'with 3 parts' do
+        it 'should return host without www' do
           request = ActionDispatch::Request.new('HTTP_HOST' => 'www.bar.com')
           expect(elevator.parse_tenant_name(request)).to eq('bar.com')
         end
 
-        it "should return host without foo" do
+        it 'should return host without foo' do
           request = ActionDispatch::Request.new('HTTP_HOST' => 'foo.bar.com')
           expect(elevator.parse_tenant_name(request)).to eq('bar.com')
         end
       end
 
-      context "with 6 parts" do
-        it "should return host without www" do
+      context 'with 6 parts' do
+        it 'should return host without www' do
           request = ActionDispatch::Request.new('HTTP_HOST' => 'www.one.two.three.foo.bar.com')
           expect(elevator.parse_tenant_name(request)).to eq('one.two.three.foo.bar.com')
         end
 
-        it "should return host without www" do
+        it 'should return host without www' do
           request = ActionDispatch::Request.new('HTTP_HOST' => 'foo.one.two.three.bar.com')
           expect(elevator.parse_tenant_name(request)).to eq('one.two.three.bar.com')
         end
       end
     end
 
-    context "assuming localhost" do
-      it "should return localhost" do
+    context 'assuming localhost' do
+      it 'should return localhost' do
         request = ActionDispatch::Request.new('HTTP_HOST' => 'localhost')
         expect(elevator.parse_tenant_name(request)).to eq('localhost')
       end
     end
 
-    context "assuming ip address" do
-      it "should return the ip address" do
+    context 'assuming ip address' do
+      it 'should return the ip address' do
         request = ActionDispatch::Request.new('HTTP_HOST' => '127.0.0.1')
         expect(elevator.parse_tenant_name(request)).to eq('127.0.0.1')
       end
     end
   end
 
-  describe "#call" do
-    it "switches to the proper tenant" do
+  describe '#call' do
+    it 'switches to the proper tenant' do
       allow(described_class).to receive(:ignored_first_subdomains).and_return([])
       expect(Apartment::Tenant).to receive(:switch).with('foo.bar.com')
       elevator.call('HTTP_HOST' => 'foo.bar.com')
     end
 
-    it "ignores ignored_first_subdomains" do
-      allow(described_class).to receive(:ignored_first_subdomains).and_return(%w{foo})
+    it 'ignores ignored_first_subdomains' do
+      allow(described_class).to receive(:ignored_first_subdomains).and_return(%w[foo])
       expect(Apartment::Tenant).to receive(:switch).with('bar.com')
       elevator.call('HTTP_HOST' => 'foo.bar.com')
     end

data/spec/unit/elevators/subdomain_spec.rb

@@ -1,70 +1,71 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'apartment/elevators/subdomain'
 
 describe Apartment::Elevators::Subdomain do
+  subject(:elevator) { described_class.new(proc {}) }
 
-  subject(:elevator){ described_class.new(Proc.new{}) }
-
-  describe "#parse_tenant_name" do
-    context "assuming one tld" do
-      it "should parse subdomain" do
+  describe '#parse_tenant_name' do
+    context 'assuming one tld' do
+      it 'should parse subdomain' do
         request = ActionDispatch::Request.new('HTTP_HOST' => 'foo.bar.com')
         expect(elevator.parse_tenant_name(request)).to eq('foo')
       end
 
-      it "should return nil when no subdomain" do
+      it 'should return nil when no subdomain' do
         request = ActionDispatch::Request.new('HTTP_HOST' => 'bar.com')
         expect(elevator.parse_tenant_name(request)).to be_nil
       end
     end
 
-    context "assuming two tlds" do
-      it "should parse subdomain in the third level domain" do
+    context 'assuming two tlds' do
+      it 'should parse subdomain in the third level domain' do
         request = ActionDispatch::Request.new('HTTP_HOST' => 'foo.bar.co.uk')
-        expect(elevator.parse_tenant_name(request)).to eq("foo")
+        expect(elevator.parse_tenant_name(request)).to eq('foo')
       end
 
-      it "should return nil when no subdomain in the third level domain" do
+      it 'should return nil when no subdomain in the third level domain' do
         request = ActionDispatch::Request.new('HTTP_HOST' => 'bar.co.uk')
         expect(elevator.parse_tenant_name(request)).to be_nil
       end
     end
 
-    context "assuming two subdomains" do
-      it "should parse two subdomains in the two level domain" do
+    context 'assuming two subdomains' do
+      it 'should parse two subdomains in the two level domain' do
         request = ActionDispatch::Request.new('HTTP_HOST' => 'foo.xyz.bar.com')
-        expect(elevator.parse_tenant_name(request)).to eq("foo")
+        expect(elevator.parse_tenant_name(request)).to eq('foo')
       end
 
-      it "should parse two subdomains in the third level domain" do
+      it 'should parse two subdomains in the third level domain' do
         request = ActionDispatch::Request.new('HTTP_HOST' => 'foo.xyz.bar.co.uk')
-        expect(elevator.parse_tenant_name(request)).to eq("foo")
+        expect(elevator.parse_tenant_name(request)).to eq('foo')
       end
     end
 
-    context "assuming localhost" do
-      it "should return nil for localhost" do
+    context 'assuming localhost' do
+      it 'should return nil for localhost' do
         request = ActionDispatch::Request.new('HTTP_HOST' => 'localhost')
         expect(elevator.parse_tenant_name(request)).to be_nil
       end
     end
 
-    context "assuming ip address" do
-      it "should return nil for an ip address" do
+    context 'assuming ip address' do
+      it 'should return nil for an ip address' do
         request = ActionDispatch::Request.new('HTTP_HOST' => '127.0.0.1')
         expect(elevator.parse_tenant_name(request)).to be_nil
       end
     end
   end
 
-  describe "#call" do
-    it "switches to the proper tenant" do
+  describe '#call' do
+    it 'switches to the proper tenant' do
       expect(Apartment::Tenant).to receive(:switch).with('tenant1')
       elevator.call('HTTP_HOST' => 'tenant1.example.com')
     end
 
-    it "ignores excluded subdomains" do
-      described_class.excluded_subdomains = %w{foo}
+    it 'ignores excluded subdomains' do
+      described_class.excluded_subdomains = %w[foo]
 
       expect(Apartment::Tenant).not_to receive(:switch)
 

data/spec/unit/migrator_spec.rb

@@ -1,21 +1,22 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'apartment/migrator'
 
 describe Apartment::Migrator do
-
-  let(:tenant){ Apartment::Test.next_db }
+  let(:tenant) { Apartment::Test.next_db }
 
   # Don't need a real switch here, just testing behaviour
   before { allow(Apartment::Tenant.adapter).to receive(:connect_to_new) }
 
-  context "with ActiveRecord below 5.2.0", skip: ActiveRecord.version >= Gem::Version.new("5.2.0") do
+  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(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
+    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)
 
@@ -23,8 +24,8 @@ describe Apartment::Migrator do
       end
     end
 
-    describe "::run" do
-      it "switches and runs" do
+    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)
 
@@ -32,8 +33,8 @@ describe Apartment::Migrator do
       end
     end
 
-    describe "::rollback" do
-      it "switches and rolls back" do
+    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)
 
@@ -42,13 +43,13 @@ describe Apartment::Migrator do
     end
   end
 
-  context "with ActiveRecord above or equal to 5.2.0", skip: ActiveRecord.version < Gem::Version.new("5.2.0") do
+  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
+    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)
 
@@ -56,8 +57,8 @@ describe Apartment::Migrator do
       end
     end
 
-    describe "::run" do
-      it "switches and runs" do
+    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)
 
@@ -65,8 +66,8 @@ describe Apartment::Migrator do
       end
     end
 
-    describe "::rollback" do
-      it "switches and rolls back" do
+    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)
 

data/spec/unit/reloader_spec.rb

@@ -1,24 +1,24 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Apartment::Reloader do
-
-  context "using postgresql schemas" do
-
+  context 'using postgresql schemas' do
     before do
       Apartment.configure do |config|
-        config.excluded_models = ["Company"]
+        config.excluded_models = ['Company']
         config.use_schemas = true
       end
       Apartment::Tenant.reload!(config)
-      Company.reset_table_name  # ensure we're clean
+      Company.reset_table_name # ensure we're clean
     end
 
-    subject{ Apartment::Reloader.new(double("Rack::Application", :call => nil)) }
+    subject { Apartment::Reloader.new(double('Rack::Application', call: nil)) }
 
-    it "should initialize apartment when called" do
+    it 'should initialize apartment when called' do
       expect(Company.table_name).not_to include('public.')
       subject.call(double('env'))
       expect(Company.table_name).to include('public.')
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ros-apartment
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Ryan Brunner
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-03 00:00:00.000000000 Z
+date: 2020-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -36,30 +36,36 @@ dependencies:
   name: parallel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: public_suffix
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: 2.0.5
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: 2.0.5
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -67,6 +73,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.6
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,20 +83,23 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.6
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -168,30 +180,30 @@ dependencies:
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -217,9 +229,13 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/ISSUE_TEMPLATE.md"
+- ".github/workflows/.rubocop-linter.yml"
 - ".gitignore"
 - ".pryrc"
 - ".rspec"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
+- ".story_branch.yml"
 - ".travis.yml"
 - Appraisals
 - Gemfile
@@ -246,6 +262,7 @@ files:
 - lib/apartment/adapters/postgresql_adapter.rb
 - lib/apartment/adapters/sqlite3_adapter.rb
 - lib/apartment/console.rb
+- lib/apartment/custom_console.rb
 - lib/apartment/deprecation.rb
 - lib/apartment/elevators/domain.rb
 - lib/apartment/elevators/first_subdomain.rb
@@ -273,6 +290,7 @@ files:
 - spec/dummy/Rakefile
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
+- spec/dummy/app/models/application_record.rb
 - spec/dummy/app/models/company.rb
 - spec/dummy/app/models/user.rb
 - spec/dummy/app/views/application/index.html.erb
@@ -382,8 +400,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A Ruby gem for managing database multitenancy. Apartment Gem drop in replacement
@@ -398,6 +415,7 @@ test_files:
 - spec/dummy/Rakefile
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
+- spec/dummy/app/models/application_record.rb
 - spec/dummy/app/models/company.rb
 - spec/dummy/app/models/user.rb
 - spec/dummy/app/views/application/index.html.erb