ros-apartment 2.11.0 → 3.0.2

data/lib/apartment/active_record/schema_migration.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module ActiveRecord
-  class SchemaMigration < ActiveRecord::Base # :nodoc:
+  class SchemaMigration # :nodoc:
     class << self
       def table_exists?
         connection.table_exists?(table_name)

data/lib/apartment/log_subscriber.rb

@@ -8,26 +8,38 @@ module Apartment
     # NOTE: for some reason, if the method definition is not here, then the custom debug method is not called
     # rubocop:disable Lint/UselessMethodDefinition
     def sql(event)
-      super(event)
+      super
     end
     # rubocop:enable Lint/UselessMethodDefinition
 
     private
 
-    def debug(progname = nil, &block)
+    def debug(progname = nil, &)
       progname = "  #{apartment_log}#{progname}" unless progname.nil?
 
-      super(progname, &block)
+      super
     end
 
     def apartment_log
-      database = color("[#{Apartment.connection.raw_connection.db}] ", ActiveSupport::LogSubscriber::MAGENTA, true)
-      schema = nil
-      unless Apartment.connection.schema_search_path.nil?
-        schema = color("[#{Apartment.connection.schema_search_path.tr('"', '')}] ",
-                       ActiveSupport::LogSubscriber::YELLOW, true)
-      end
+      database = color("[#{database_name}] ", ActiveSupport::LogSubscriber::MAGENTA, bold: true)
+      schema = current_search_path
+      schema = color("[#{schema.tr('"', '')}] ", ActiveSupport::LogSubscriber::YELLOW, bold: true) unless schema.nil?
       "#{database}#{schema}"
     end
+
+    def current_search_path
+      if Apartment.connection.respond_to?(:schema_search_path)
+        Apartment.connection.schema_search_path
+      else
+        Apartment::Tenant.current # all others
+      end
+    end
+
+    def database_name
+      db_name = Apartment.connection.raw_connection.try(:db) # PostgreSQL, PostGIS
+      db_name ||= Apartment.connection.raw_connection.try(:query_options)&.dig(:database) # Mysql
+      db_name ||= Apartment.connection.current_database # Failover
+      db_name
+    end
   end
 end

data/lib/apartment/migrator.rb

@@ -13,40 +13,22 @@ module Apartment
 
         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
+        ActiveRecord::Base.connection.migration_context.migrate(version, &migration_scope_block)
       end
     end
 
     # Migrate up/down to a specific version
     def run(direction, database, version)
       Tenant.switch(database) do
-        if activerecord_below_5_2?
-          ActiveRecord::Migrator.run(direction, ActiveRecord::Migrator.migrations_paths, version)
-        else
-          ActiveRecord::Base.connection.migration_context.run(direction, version)
-        end
+        ActiveRecord::Base.connection.migration_context.run(direction, version)
       end
     end
 
     # rollback latest migration `step` number of times
     def rollback(database, step = 1)
       Tenant.switch(database) do
-        if activerecord_below_5_2?
-          ActiveRecord::Migrator.rollback(ActiveRecord::Migrator.migrations_paths, step)
-        else
-          ActiveRecord::Base.connection.migration_context.rollback(step)
-        end
+        ActiveRecord::Base.connection.migration_context.rollback(step)
       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

@@ -47,7 +47,12 @@ module Apartment
     config.after_initialize do
       # NOTE: Load the custom log subscriber if enabled
       if Apartment.active_record_log
-        ActiveSupport::Notifications.unsubscribe 'sql.active_record'
+        ActiveSupport::Notifications.notifier.listeners_for('sql.active_record').each do |listener|
+          next unless listener.instance_variable_get('@delegate').is_a?(ActiveRecord::LogSubscriber)
+
+          ActiveSupport::Notifications.unsubscribe listener
+        end
+
         Apartment::LogSubscriber.attach_to :active_record
       end
     end

data/lib/apartment/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Apartment
-  VERSION = '2.11.0'
+  VERSION = '3.0.2'
 end

data/lib/apartment.rb

@@ -7,15 +7,9 @@ require 'active_record'
 require 'apartment/tenant'
 
 require_relative 'apartment/log_subscriber'
-
-if ActiveRecord.version.release >= Gem::Version.new('6.0')
-  require_relative 'apartment/active_record/connection_handling'
-end
-
-if ActiveRecord.version.release >= Gem::Version.new('6.1')
-  require_relative 'apartment/active_record/schema_migration'
-  require_relative 'apartment/active_record/internal_metadata'
-end
+require_relative 'apartment/active_record/connection_handling'
+require_relative 'apartment/active_record/schema_migration'
+require_relative 'apartment/active_record/internal_metadata'
 
 # Apartment main definitions
 module Apartment
@@ -33,14 +27,10 @@ module Apartment
     attr_accessor(*ACCESSOR_METHODS)
     attr_writer(*WRITER_METHODS)
 
-    if ActiveRecord.version.release >= Gem::Version.new('6.1')
-      def_delegators :connection_class, :connection, :connection_db_config, :establish_connection
+    def_delegators :connection_class, :connection, :connection_db_config, :establish_connection
 
-      def connection_config
-        connection_db_config.configuration_hash
-      end
-    else
-      def_delegators :connection_class, :connection, :connection_config, :establish_connection
+    def connection_config
+      connection_db_config.configuration_hash
     end
 
     # configure apartment with available options

data/ros-apartment.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   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|documentation)/})
+      f.match(%r{^(test|spec|features|documentation|gemfiles|.github)/})
     end
   end
   s.executables   = s.files.grep(%r{^bin/}).map { |f| File.basename(f) }
@@ -26,11 +26,14 @@ Gem::Specification.new do |s|
 
   s.homepage = 'https://github.com/rails-on-services/apartment'
   s.licenses = ['MIT']
+  s.metadata = {
+    'github_repo' => 'ssh://github.com/rails-on-services/apartment'
+  }
 
-  s.add_dependency 'activerecord', '>= 5.0.0', '< 7.1'
+  s.add_dependency 'activerecord', '>= 6.1.0', '< 7.2'
   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_dependency 'public_suffix', '>= 2.0.5', '< 6.0'
+  s.add_dependency 'rack', '>= 1.3.6', '< 4.0'
 
   s.add_development_dependency 'appraisal', '~> 2.2'
   s.add_development_dependency 'bundler', '>= 1.3', '< 3.0'
@@ -39,11 +42,11 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rake', '~> 13.0'
   s.add_development_dependency 'rspec', '~> 3.4'
   s.add_development_dependency 'rspec_junit_formatter'
-  s.add_development_dependency 'rspec-rails', '~> 3.4'
-  s.add_development_dependency 'rubocop', '~> 0.93'
-  s.add_development_dependency 'rubocop-performance', '~> 1.10'
-  s.add_development_dependency 'rubocop-rails', '~> 2.1'
-  s.add_development_dependency 'rubocop-rspec', '~> 1.44'
+  s.add_development_dependency 'rspec-rails', '~> 6.1'
+  s.add_development_dependency 'rubocop', '~> 1.63'
+  s.add_development_dependency 'rubocop-performance', '~> 1.21'
+  s.add_development_dependency 'rubocop-rails', '~> 2.24'
+  s.add_development_dependency 'rubocop-rspec', '~> 2.29'
 
   if defined?(JRUBY_VERSION)
     s.add_development_dependency 'activerecord-jdbc-adapter'
@@ -53,7 +56,7 @@ Gem::Specification.new do |s|
     s.add_development_dependency 'jdbc-postgres'
   else
     s.add_development_dependency 'mysql2',  '~> 0.5'
-    s.add_development_dependency 'pg',      '~> 1.2'
-    s.add_development_dependency 'sqlite3', '~> 1.3.6'
+    s.add_development_dependency 'pg',      '~> 1.5'
+    s.add_development_dependency 'sqlite3', '< 2.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ros-apartment
 version: !ruby/object:Gem::Version
-  version: 2.11.0
+  version: 3.0.2
 platform: ruby
 authors:
 - Ryan Brunner
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-07 00:00:00.000000000 Z
+date: 2024-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -18,20 +18,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 6.1.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 6.1.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement
@@ -55,7 +55,7 @@ dependencies:
         version: 2.0.5
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -65,7 +65,7 @@ dependencies:
         version: 2.0.5
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -75,7 +75,7 @@ dependencies:
         version: 1.3.6
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -85,7 +85,7 @@ dependencies:
         version: 1.3.6
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -196,70 +196,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '6.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.93'
+        version: '1.63'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.93'
+        version: '1.63'
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.21'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.21'
 - !ruby/object:Gem::Dependency
   name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.24'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.24'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.44'
+        version: '2.29'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.44'
+        version: '2.29'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -280,28 +280,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: '2.0'
 description: Apartment allows Rack applications to deal with database multitenancy
   through ActiveRecord
 email:
@@ -312,31 +312,18 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".circleci/config.yml"
-- ".github/ISSUE_TEMPLATE.md"
-- ".github/workflows/changelog.yml"
-- ".github/workflows/reviewdog.yml"
 - ".gitignore"
 - ".pryrc"
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
 - ".ruby-version"
-- ".story_branch.yml"
 - Appraisals
 - CHANGELOG.md
 - Gemfile
 - Guardfile
-- HISTORY.md
 - README.md
 - Rakefile
-- TODO.md
-- docker-compose.yml
-- gemfiles/rails_5_2.gemfile
-- gemfiles/rails_6_0.gemfile
-- gemfiles/rails_6_1.gemfile
-- gemfiles/rails_7_0.gemfile
-- gemfiles/rails_master.gemfile
 - lib/apartment.rb
 - lib/apartment/active_record/connection_handling.rb
 - lib/apartment/active_record/internal_metadata.rb
@@ -375,7 +362,8 @@ files:
 homepage: https://github.com/rails-on-services/apartment
 licenses:
 - MIT
-metadata: {}
+metadata:
+  github_repo: ssh://github.com/rails-on-services/apartment
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -391,7 +379,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.5.10
 signing_key: 
 specification_version: 4
 summary: A Ruby gem for managing database multitenancy. Apartment Gem drop in replacement

data/.circleci/config.yml

@@ -1,78 +0,0 @@
-version: 2.1
-
-jobs:
-  build:
-    docker:
-      - image: circleci/<< parameters.ruby_version >>
-      - image: circleci/postgres:9.6.2-alpine
-      - image: circleci/mysql:5.7
-        environment:
-          MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
-    parameters:
-      ruby_version:
-        type: string
-      gemfile:
-        type: string
-    environment:
-      BUNDLE_GEMFILE: << parameters.gemfile >>
-    steps:
-      - checkout
-      # Restore Cached Dependencies
-      # - restore_cache:
-      #     keys:
-      #       - gem-cache-v1-{{ arch }}-{{ .Branch }}-{{ checksum "<< parameters.gemfile >>.lock" }}
-      #       - gem-cache-v1-{{ arch }}-{{ .Branch }}
-      #       - gem-cache-v1
-
-      - run: bundle install --path vendor/bundle
-
-      # - save_cache:
-      #     key: gem-cache-v1-{{ arch }}-{{ .Branch }}-{{ checksum "<< parameters.gemfile >>.lock" }}
-      #     paths:
-      #       - vendor/bundle
-
-      - run:
-          name: Install postgres client
-          command: sudo apt install -y postgresql-client
-
-      - run:
-          name: Install mysql client
-          command: sudo apt install -y default-mysql-client
-
-      - run:
-          name: Configure config database.yml
-          command: bundle exec rake db:copy_credentials
-
-      - run:
-          name: wait for postgresql
-          command: dockerize -wait tcp://localhost:5432 -timeout 1m
-
-      - run:
-          name: wait for mysql
-          command: dockerize -wait tcp://localhost:3306 -timeout 1m
-
-      - run:
-          name: Database Setup
-          command: |
-            bundle exec rake db:test:prepare
-
-      - run:
-          name: Run tests
-          command: bundle exec rspec --format progress --format RspecJunitFormatter -o ~/test-results/rspec/rspec.xml
-
-      - store_test_results:
-          path: ~/test-results/rspec/
-
-workflows:
-  tests:
-    jobs:
-      - build:
-          matrix:
-            parameters:
-              ruby_version: ["ruby:2.6-buster", "ruby:2.7-buster", "ruby:3.0-buster"]
-              gemfile: ["gemfiles/rails_5_2.gemfile", "gemfiles/rails_6_0.gemfile", "gemfiles/rails_6_1.gemfile", "gemfiles/rails_7_0.gemfile"]
-            exclude:
-              - ruby_version: "ruby:3.0-buster"
-                gemfile: "gemfiles/rails_5_2.gemfile"
-              - ruby_version: "ruby:2.6-buster"
-                gemfile: "gemfiles/rails_7_0.gemfile"

data/.github/ISSUE_TEMPLATE.md

@@ -1,21 +0,0 @@
-## Steps to reproduce
-
-## Expected behavior
-
-## Actual behavior
-
-## System configuration
-
-<!-- Please let us know as far as you can. -->
-
-* Database: (Tell us what database and its version you use.)
-
-* Apartment version:
-
-* Apartment config (in `config/initializers/apartment.rb` or so):
-
-  * `use_schemas`: (`true` or `false`)
-
-* Rails (or ActiveRecord) version:
-
-* Ruby version:

data/.github/workflows/changelog.yml

@@ -1,63 +0,0 @@
-name: Changelog
-
-on:
-  pull_request:
-    types: [closed]
-
-  release:
-    types: [published]
-
-  issues:
-    types: [closed, edited]
-
-jobs:
-  generate_changelog:
-    runs-on: ubuntu-latest
-    name: Generate changelog for master branch
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0 # otherwise, you will failed to push refs to dest repo
-
-      - name: Generate changelog
-        uses: charmixer/auto-changelog-action@v1
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Commit files
-        env:
-          ACTION_EMAIL: action@github.com
-          ACTION_USERNAME: GitHub Action
-        run: |
-          git config --local user.email "$ACTION_EMAIL"
-          git config --local user.name "$ACTION_USERNAME"
-          git add CHANGELOG.md && git commit -m 'Updated CHANGELOG.md' && echo ::set-env name=push::1 || echo "No changes to CHANGELOG.md"
-
-      - name: Push changes
-        if: env.push == 1
-        env:
-          # CI_USER: ${{ secrets.YOUR_GITHUB_USER }}
-          CI_TOKEN: ${{ secrets.CHANGELOG_GITHUB_TOKEN }}
-        run: |
-          git push "https://$GITHUB_ACTOR:$CI_TOKEN@github.com/$GITHUB_REPOSITORY.git" HEAD:master
-
-      # - name: Push changelog to master
-      #   if: env.push == 1
-      #   uses: ad-m/github-push-action@master
-      #   with:
-      #     github_token: ${{ secrets.CHANGELOG_GITHUB_TOKEN }}
-      #     branch: master
-
-      # - name: Cherry-pick changelog to development
-      #   if: env.push == 1
-      #   env:
-      #     ACTION_EMAIL: action@github.com
-      #     ACTION_USERNAME: GitHub Action
-      #   run: |
-      #     git config --local user.email "$ACTION_EMAIL"
-      #     git config --local user.name "$ACTION_USERNAME"
-      #     commit_hash=`git show HEAD | egrep commit\ .+$ | cut -d' ' -f2`
-      #     git checkout development
-      #     git pull
-      #     git cherry-pick $commit_hash
-      #     git push

data/.github/workflows/reviewdog.yml

@@ -1,22 +0,0 @@
-name: reviewdog
-on: [push, pull_request]
-jobs:
-  rubocop:
-    name: runner / rubocop
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out code
-        uses: actions/checkout@v2
-      - name: Read ruby version
-        run: echo ::set-output name=RUBY_VERSION::$(cat .ruby-version | cut -f 1,2 -d .)
-        id: rv
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: "${{ steps.rv.outputs.RUBY_VERSION }}"
-      - uses: reviewdog/action-rubocop@v1
-        with:
-          filter_mode: nofilter
-          reporter: github-check
-          rubocop_version: 0.93.1
-          github_token: ${{ secrets.github_token }}
-          rubocop_extensions: rubocop-performance:1.10.2 rubocop-rails:2.9.1 rubocop-rspec:1.44.1

data/.story_branch.yml

@@ -1,5 +0,0 @@
----
-tracker: github
-issue_placement: beginning
-project_id:
-- rails-on-services/apartment