ros-apartment 2.4.0 → 2.7.1

data/{apartment.gemspec → ros-apartment.gemspec}

@@ -11,7 +11,15 @@ Gem::Specification.new do |s|
   s.summary       = 'A Ruby gem for managing database multitenancy. Apartment Gem drop in replacement'
   s.description   = 'Apartment allows Rack applications to deal with database multitenancy through ActiveRecord'
   s.email         = ['ryan@influitive.com', 'brad@influitive.com', 'rui.p.baltazar@gmail.com']
-  s.files         = `git ls-files`.split($/)
+  # Specify which files should be added to the gem when it is released.
+  # The `git ls-files -z` loads the files in the RubyGem that have been
+  # added into git.
+  s.files = Dir.chdir(File.expand_path(__dir__)) do
+    `git ls-files -z`.split("\x0").reject do |f|
+      # NOTE: ignore all test related
+      f.match(%r{^(test|spec|features)/})
+    end
+  end
   s.executables   = s.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
   s.require_paths = ['lib']
@@ -19,16 +27,15 @@ Gem::Specification.new do |s|
   s.homepage = 'https://github.com/rails-on-services/apartment'
   s.licenses = ['MIT']
 
-  # must be >= 3.1.2 due to bug in prepared_statements
-  s.add_dependency 'activerecord',    '>= 3.1.2', '< 6.1'
+  s.add_dependency 'activerecord',    '>= 5.0.0', '< 6.1'
   s.add_dependency 'parallel',        '< 2.0'
   s.add_dependency 'public_suffix',   '>= 2.0.5', '< 5.0'
   s.add_dependency 'rack',            '>= 1.3.6', '< 3.0'
 
   s.add_development_dependency 'appraisal',    '~> 2.2'
-  s.add_development_dependency 'bundler',      '>= 1.3', '< 2.0'
+  s.add_development_dependency 'bundler',      '>= 1.3', '< 3.0'
   s.add_development_dependency 'capybara',     '~> 2.0'
-  s.add_development_dependency 'rake',         '~> 0.9'
+  s.add_development_dependency 'rake',         '~> 13.0'
   s.add_development_dependency 'rspec',        '~> 3.4'
   s.add_development_dependency 'rspec-rails',  '~> 3.4'
 
@@ -38,7 +45,6 @@ Gem::Specification.new do |s|
     s.add_development_dependency 'activerecord-jdbcpostgresql-adapter'
     s.add_development_dependency 'jdbc-mysql'
     s.add_development_dependency 'jdbc-postgres'
-    s.add_development_dependency 'jruby-openssl'
   else
     s.add_development_dependency 'mysql2',  '~> 0.5'
     s.add_development_dependency 'pg',      '~> 1.2'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ros-apartment
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.7.1
 platform: ruby
 authors:
 - Ryan Brunner
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-01 00:00:00.000000000 Z
+date: 2020-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.2
+        version: 5.0.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.1'
@@ -28,7 +28,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.2
+        version: 5.0.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.1'
@@ -109,7 +109,7 @@ dependencies:
         version: '1.3'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -119,7 +119,7 @@ dependencies:
         version: '1.3'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -140,14 +140,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -229,7 +229,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/ISSUE_TEMPLATE.md"
-- ".github/workflows/.rubocop-linter.yml"
 - ".gitignore"
 - ".pryrc"
 - ".rspec"
@@ -244,7 +243,6 @@ files:
 - README.md
 - Rakefile
 - TODO.md
-- apartment.gemspec
 - docker-compose.yml
 - gemfiles/rails_4_2.gemfile
 - gemfiles/rails_5_0.gemfile
@@ -253,6 +251,10 @@ files:
 - gemfiles/rails_6_0.gemfile
 - gemfiles/rails_master.gemfile
 - lib/apartment.rb
+- lib/apartment/active_record/connection_handling.rb
+- lib/apartment/active_record/internal_metadata.rb
+- lib/apartment/active_record/log_subscriber.rb
+- lib/apartment/active_record/schema_migration.rb
 - lib/apartment/adapters/abstract_adapter.rb
 - lib/apartment/adapters/abstract_jdbc_adapter.rb
 - lib/apartment/adapters/jdbc_mysql_adapter.rb
@@ -271,116 +273,18 @@ files:
 - lib/apartment/elevators/host_hash.rb
 - lib/apartment/elevators/subdomain.rb
 - lib/apartment/migrator.rb
+- lib/apartment/model.rb
 - lib/apartment/railtie.rb
 - lib/apartment/reloader.rb
 - lib/apartment/tasks/enhancements.rb
+- lib/apartment/tasks/task_helper.rb
 - lib/apartment/tenant.rb
 - lib/apartment/version.rb
 - lib/generators/apartment/install/USAGE
 - lib/generators/apartment/install/install_generator.rb
 - lib/generators/apartment/install/templates/apartment.rb
 - lib/tasks/apartment.rake
-- spec/adapters/jdbc_mysql_adapter_spec.rb
-- spec/adapters/jdbc_postgresql_adapter_spec.rb
-- spec/adapters/mysql2_adapter_spec.rb
-- spec/adapters/postgresql_adapter_spec.rb
-- spec/adapters/sqlite3_adapter_spec.rb
-- spec/apartment_spec.rb
-- spec/config/database.yml.sample
-- 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
-- spec/dummy/app/views/layouts/application.html.erb
-- spec/dummy/config.ru
-- spec/dummy/config/application.rb
-- spec/dummy/config/boot.rb
-- spec/dummy/config/database.yml.sample
-- spec/dummy/config/environment.rb
-- spec/dummy/config/environments/development.rb
-- spec/dummy/config/environments/production.rb
-- spec/dummy/config/environments/test.rb
-- spec/dummy/config/initializers/apartment.rb
-- spec/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy/config/initializers/inflections.rb
-- spec/dummy/config/initializers/mime_types.rb
-- spec/dummy/config/initializers/secret_token.rb
-- spec/dummy/config/initializers/session_store.rb
-- spec/dummy/config/locales/en.yml
-- spec/dummy/config/routes.rb
-- spec/dummy/db/migrate/20110613152810_create_dummy_models.rb
-- spec/dummy/db/migrate/20111202022214_create_table_books.rb
-- spec/dummy/db/migrate/20180415260934_create_public_tokens.rb
-- spec/dummy/db/schema.rb
-- spec/dummy/db/seeds.rb
-- spec/dummy/db/seeds/import.rb
-- spec/dummy/db/test.sqlite3
-- spec/dummy/public/404.html
-- spec/dummy/public/422.html
-- spec/dummy/public/500.html
-- spec/dummy/public/favicon.ico
-- spec/dummy/public/stylesheets/.gitkeep
-- spec/dummy/script/rails
-- spec/dummy_engine/.gitignore
-- spec/dummy_engine/Gemfile
-- spec/dummy_engine/Rakefile
-- spec/dummy_engine/bin/rails
-- spec/dummy_engine/config/initializers/apartment.rb
-- spec/dummy_engine/dummy_engine.gemspec
-- spec/dummy_engine/lib/dummy_engine.rb
-- spec/dummy_engine/lib/dummy_engine/engine.rb
-- spec/dummy_engine/lib/dummy_engine/version.rb
-- spec/dummy_engine/test/dummy/Rakefile
-- spec/dummy_engine/test/dummy/config.ru
-- spec/dummy_engine/test/dummy/config/application.rb
-- spec/dummy_engine/test/dummy/config/boot.rb
-- spec/dummy_engine/test/dummy/config/database.yml
-- spec/dummy_engine/test/dummy/config/environment.rb
-- spec/dummy_engine/test/dummy/config/environments/development.rb
-- spec/dummy_engine/test/dummy/config/environments/production.rb
-- spec/dummy_engine/test/dummy/config/environments/test.rb
-- spec/dummy_engine/test/dummy/config/initializers/assets.rb
-- spec/dummy_engine/test/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy_engine/test/dummy/config/initializers/cookies_serializer.rb
-- spec/dummy_engine/test/dummy/config/initializers/filter_parameter_logging.rb
-- spec/dummy_engine/test/dummy/config/initializers/inflections.rb
-- spec/dummy_engine/test/dummy/config/initializers/mime_types.rb
-- spec/dummy_engine/test/dummy/config/initializers/session_store.rb
-- spec/dummy_engine/test/dummy/config/initializers/wrap_parameters.rb
-- spec/dummy_engine/test/dummy/config/locales/en.yml
-- spec/dummy_engine/test/dummy/config/routes.rb
-- spec/dummy_engine/test/dummy/config/secrets.yml
-- spec/examples/connection_adapter_examples.rb
-- spec/examples/generic_adapter_custom_configuration_example.rb
-- spec/examples/generic_adapter_examples.rb
-- spec/examples/schema_adapter_examples.rb
-- spec/integration/apartment_rake_integration_spec.rb
-- spec/integration/query_caching_spec.rb
-- spec/integration/use_within_an_engine_spec.rb
-- spec/schemas/v1.rb
-- spec/schemas/v2.rb
-- spec/schemas/v3.rb
-- spec/spec_helper.rb
-- spec/support/apartment_helpers.rb
-- spec/support/capybara_sessions.rb
-- spec/support/config.rb
-- spec/support/contexts.rb
-- spec/support/requirements.rb
-- spec/support/setup.rb
-- spec/tasks/apartment_rake_spec.rb
-- spec/tenant_spec.rb
-- spec/unit/config_spec.rb
-- spec/unit/elevators/domain_spec.rb
-- spec/unit/elevators/first_subdomain_spec.rb
-- spec/unit/elevators/generic_spec.rb
-- spec/unit/elevators/host_hash_spec.rb
-- spec/unit/elevators/host_spec.rb
-- spec/unit/elevators/subdomain_spec.rb
-- spec/unit/migrator_spec.rb
-- spec/unit/reloader_spec.rb
+- ros-apartment.gemspec
 homepage: https://github.com/rails-on-services/apartment
 licenses:
 - MIT
@@ -404,105 +308,4 @@ rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A Ruby gem for managing database multitenancy. Apartment Gem drop in replacement
-test_files:
-- spec/adapters/jdbc_mysql_adapter_spec.rb
-- spec/adapters/jdbc_postgresql_adapter_spec.rb
-- spec/adapters/mysql2_adapter_spec.rb
-- spec/adapters/postgresql_adapter_spec.rb
-- spec/adapters/sqlite3_adapter_spec.rb
-- spec/apartment_spec.rb
-- spec/config/database.yml.sample
-- 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
-- spec/dummy/app/views/layouts/application.html.erb
-- spec/dummy/config.ru
-- spec/dummy/config/application.rb
-- spec/dummy/config/boot.rb
-- spec/dummy/config/database.yml.sample
-- spec/dummy/config/environment.rb
-- spec/dummy/config/environments/development.rb
-- spec/dummy/config/environments/production.rb
-- spec/dummy/config/environments/test.rb
-- spec/dummy/config/initializers/apartment.rb
-- spec/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy/config/initializers/inflections.rb
-- spec/dummy/config/initializers/mime_types.rb
-- spec/dummy/config/initializers/secret_token.rb
-- spec/dummy/config/initializers/session_store.rb
-- spec/dummy/config/locales/en.yml
-- spec/dummy/config/routes.rb
-- spec/dummy/db/migrate/20110613152810_create_dummy_models.rb
-- spec/dummy/db/migrate/20111202022214_create_table_books.rb
-- spec/dummy/db/migrate/20180415260934_create_public_tokens.rb
-- spec/dummy/db/schema.rb
-- spec/dummy/db/seeds.rb
-- spec/dummy/db/seeds/import.rb
-- spec/dummy/db/test.sqlite3
-- spec/dummy/public/404.html
-- spec/dummy/public/422.html
-- spec/dummy/public/500.html
-- spec/dummy/public/favicon.ico
-- spec/dummy/public/stylesheets/.gitkeep
-- spec/dummy/script/rails
-- spec/dummy_engine/.gitignore
-- spec/dummy_engine/Gemfile
-- spec/dummy_engine/Rakefile
-- spec/dummy_engine/bin/rails
-- spec/dummy_engine/config/initializers/apartment.rb
-- spec/dummy_engine/dummy_engine.gemspec
-- spec/dummy_engine/lib/dummy_engine.rb
-- spec/dummy_engine/lib/dummy_engine/engine.rb
-- spec/dummy_engine/lib/dummy_engine/version.rb
-- spec/dummy_engine/test/dummy/Rakefile
-- spec/dummy_engine/test/dummy/config.ru
-- spec/dummy_engine/test/dummy/config/application.rb
-- spec/dummy_engine/test/dummy/config/boot.rb
-- spec/dummy_engine/test/dummy/config/database.yml
-- spec/dummy_engine/test/dummy/config/environment.rb
-- spec/dummy_engine/test/dummy/config/environments/development.rb
-- spec/dummy_engine/test/dummy/config/environments/production.rb
-- spec/dummy_engine/test/dummy/config/environments/test.rb
-- spec/dummy_engine/test/dummy/config/initializers/assets.rb
-- spec/dummy_engine/test/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy_engine/test/dummy/config/initializers/cookies_serializer.rb
-- spec/dummy_engine/test/dummy/config/initializers/filter_parameter_logging.rb
-- spec/dummy_engine/test/dummy/config/initializers/inflections.rb
-- spec/dummy_engine/test/dummy/config/initializers/mime_types.rb
-- spec/dummy_engine/test/dummy/config/initializers/session_store.rb
-- spec/dummy_engine/test/dummy/config/initializers/wrap_parameters.rb
-- spec/dummy_engine/test/dummy/config/locales/en.yml
-- spec/dummy_engine/test/dummy/config/routes.rb
-- spec/dummy_engine/test/dummy/config/secrets.yml
-- spec/examples/connection_adapter_examples.rb
-- spec/examples/generic_adapter_custom_configuration_example.rb
-- spec/examples/generic_adapter_examples.rb
-- spec/examples/schema_adapter_examples.rb
-- spec/integration/apartment_rake_integration_spec.rb
-- spec/integration/query_caching_spec.rb
-- spec/integration/use_within_an_engine_spec.rb
-- spec/schemas/v1.rb
-- spec/schemas/v2.rb
-- spec/schemas/v3.rb
-- spec/spec_helper.rb
-- spec/support/apartment_helpers.rb
-- spec/support/capybara_sessions.rb
-- spec/support/config.rb
-- spec/support/contexts.rb
-- spec/support/requirements.rb
-- spec/support/setup.rb
-- spec/tasks/apartment_rake_spec.rb
-- spec/tenant_spec.rb
-- spec/unit/config_spec.rb
-- spec/unit/elevators/domain_spec.rb
-- spec/unit/elevators/first_subdomain_spec.rb
-- spec/unit/elevators/generic_spec.rb
-- spec/unit/elevators/host_hash_spec.rb
-- spec/unit/elevators/host_spec.rb
-- spec/unit/elevators/subdomain_spec.rb
-- spec/unit/migrator_spec.rb
-- spec/unit/reloader_spec.rb
+test_files: []

data/.github/workflows/.rubocop-linter.yml

@@ -1,22 +0,0 @@
-name: Rubocop Lint
-
-on: [push]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    container:
-      image: ruby:2.6.5
-
-    steps:
-    - uses: actions/checkout@v1
-    - name: Rubocop Linter
-      uses: andrewmcodes/rubocop-linter-action@v2.0.0
-      with:
-        additional_gems: 'perx-rubocop:0.0.3'
-        fail_level: 'warning'
-        version: '0.77.0'
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

data/spec/adapters/jdbc_mysql_adapter_spec.rb

@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-if defined?(JRUBY_VERSION)
-
-  require 'spec_helper'
-  require 'apartment/adapters/jdbc_mysql_adapter'
-
-  describe Apartment::Adapters::JDBCMysqlAdapter, database: :mysql do
-    subject { Apartment::Tenant.jdbc_mysql_adapter config.symbolize_keys }
-
-    def tenant_names
-      ActiveRecord::Base.connection.execute('SELECT schema_name FROM information_schema.schemata').collect { |row| row['schema_name'] }
-    end
-
-    let(:default_tenant) { subject.switch { ActiveRecord::Base.connection.current_database } }
-
-    it_should_behave_like 'a generic apartment adapter'
-    it_should_behave_like 'a connection based apartment adapter'
-  end
-end

data/spec/adapters/jdbc_postgresql_adapter_spec.rb

@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-if defined?(JRUBY_VERSION)
-
-  require 'spec_helper'
-  require 'apartment/adapters/jdbc_postgresql_adapter'
-
-  describe Apartment::Adapters::JDBCPostgresqlAdapter, database: :postgresql do
-    subject { Apartment::Tenant.jdbc_postgresql_adapter config.symbolize_keys }
-
-    context 'using schemas' 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'] }
-      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'
-    end
-
-    context 'using databases' 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'] }
-      end
-
-      let(:default_tenant) { subject.switch { ActiveRecord::Base.connection.current_database } }
-
-      it_should_behave_like 'a generic apartment adapter'
-      it_should_behave_like 'a connection based apartment adapter'
-    end
-  end
-end

data/spec/adapters/mysql2_adapter_spec.rb

@@ -1,61 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-require 'apartment/adapters/mysql2_adapter'
-
-describe Apartment::Adapters::Mysql2Adapter, database: :mysql do
-  unless defined?(JRUBY_VERSION)
-
-    subject(:adapter) { Apartment::Tenant.mysql2_adapter config }
-
-    def tenant_names
-      ActiveRecord::Base.connection.execute('SELECT schema_name FROM information_schema.schemata').collect { |row| row[0] }
-    end
-
-    let(:default_tenant) { subject.switch { ActiveRecord::Base.connection.current_database } }
-
-    context 'using - the equivalent of - schemas' do
-      before { Apartment.use_schemas = true }
-
-      it_should_behave_like 'a generic apartment adapter'
-
-      describe '#default_tenant' do
-        it 'is set to the original db from config' do
-          expect(subject.default_tenant).to eq(config[:database])
-        end
-      end
-
-      describe '#init' do
-        include Apartment::Spec::AdapterRequirements
-
-        before do
-          Apartment.configure do |config|
-            config.excluded_models = ['Company']
-          end
-        end
-
-        after do
-          # Apartment::Tenant.init creates per model connection.
-          # Remove the connection after testing not to unintentionally keep the connection across tests.
-          Apartment.excluded_models.each do |excluded_model|
-            excluded_model.constantize.remove_connection
-          end
-        end
-
-        it 'should process model exclusions' do
-          Apartment::Tenant.init
-
-          expect(Company.table_name).to eq("#{default_tenant}.companies")
-        end
-      end
-    end
-
-    context 'using connections' do
-      before { Apartment.use_schemas = false }
-
-      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