ros-apartment 2.8.1 → 3.1.0

data/lib/tasks/apartment.rake

@@ -17,12 +17,10 @@ apartment_namespace = namespace :apartment do
   desc 'Drop all tenants'
   task :drop do
     Apartment::TaskHelper.tenants.each do |tenant|
-      begin
-        puts("Dropping #{tenant} tenant")
-        Apartment::Tenant.drop(tenant)
-      rescue Apartment::TenantNotFound, ActiveRecord::NoDatabaseError => e
-        puts e.message
-      end
+      puts("Dropping #{tenant} tenant")
+      Apartment::Tenant.drop(tenant)
+    rescue Apartment::TenantNotFound, ActiveRecord::NoDatabaseError => e
+      puts e.message
     end
   end
 
@@ -30,13 +28,7 @@ apartment_namespace = namespace :apartment do
   task :migrate do
     Apartment::TaskHelper.warn_if_tenants_empty
     Apartment::TaskHelper.each_tenant do |tenant|
-      begin
-        Apartment::TaskHelper.create_tenant(tenant)
-        puts("Migrating #{tenant} tenant")
-        Apartment::Migrator.migrate tenant
-      rescue Apartment::TenantNotFound => e
-        puts e.message
-      end
+      Apartment::TaskHelper.migrate_tenant(tenant)
     end
   end
 
@@ -45,15 +37,13 @@ apartment_namespace = namespace :apartment do
     Apartment::TaskHelper.warn_if_tenants_empty
 
     Apartment::TaskHelper.each_tenant do |tenant|
-      begin
-        Apartment::TaskHelper.create_tenant(tenant)
-        puts("Seeding #{tenant} tenant")
-        Apartment::Tenant.switch(tenant) do
-          Apartment::Tenant.seed
-        end
-      rescue Apartment::TenantNotFound => e
-        puts e.message
+      Apartment::TaskHelper.create_tenant(tenant)
+      puts("Seeding #{tenant} tenant")
+      Apartment::Tenant.switch(tenant) do
+        Apartment::Tenant.seed
       end
+    rescue Apartment::TenantNotFound => e
+      puts e.message
     end
   end
 
@@ -64,12 +54,10 @@ apartment_namespace = namespace :apartment do
     step = ENV['STEP'] ? ENV['STEP'].to_i : 1
 
     Apartment::TaskHelper.each_tenant do |tenant|
-      begin
-        puts("Rolling back #{tenant} tenant")
-        Apartment::Migrator.rollback tenant, step
-      rescue Apartment::TenantNotFound => e
-        puts e.message
-      end
+      puts("Rolling back #{tenant} tenant")
+      Apartment::Migrator.rollback tenant, step
+    rescue Apartment::TenantNotFound => e
+      puts e.message
     end
   end
 
@@ -82,12 +70,10 @@ apartment_namespace = namespace :apartment do
       raise 'VERSION is required' unless version
 
       Apartment::TaskHelper.each_tenant do |tenant|
-        begin
-          puts("Migrating #{tenant} tenant up")
-          Apartment::Migrator.run :up, tenant, version
-        rescue Apartment::TenantNotFound => e
-          puts e.message
-        end
+        puts("Migrating #{tenant} tenant up")
+        Apartment::Migrator.run :up, tenant, version
+      rescue Apartment::TenantNotFound => e
+        puts e.message
       end
     end
 
@@ -99,12 +85,10 @@ apartment_namespace = namespace :apartment do
       raise 'VERSION is required' unless version
 
       Apartment::TaskHelper.each_tenant do |tenant|
-        begin
-          puts("Migrating #{tenant} tenant down")
-          Apartment::Migrator.run :down, tenant, version
-        rescue Apartment::TenantNotFound => e
-          puts e.message
-        end
+        puts("Migrating #{tenant} tenant down")
+        Apartment::Migrator.run :down, tenant, version
+      rescue Apartment::TenantNotFound => e
+        puts e.message
       end
     end
 

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,18 +26,29 @@ 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', '< 6.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.required_ruby_version = '>= 3.0', '< 3.4'
 
-  s.add_development_dependency 'appraisal',    '~> 2.2'
-  s.add_development_dependency 'bundler',      '>= 1.3', '< 3.0'
-  s.add_development_dependency 'capybara',     '~> 2.0'
-  s.add_development_dependency 'rake',         '~> 13.0'
-  s.add_development_dependency 'rspec',        '~> 3.4'
-  s.add_development_dependency 'rspec-rails',  '~> 3.4'
+  s.add_dependency 'activerecord', '>= 6.1.0', '< 7.2'
+  s.add_dependency 'parallel', '< 2.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'
+  s.add_development_dependency 'guard-rspec', '~> 4.2'
+  s.add_development_dependency 'pry'
+  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', '~> 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'
@@ -47,7 +58,8 @@ 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'
+    s.add_development_dependency 'trilogy', '< 3.0'
   end
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: ros-apartment
 version: !ruby/object:Gem::Version
-  version: 2.8.1
+  version: 3.1.0
 platform: ruby
 authors:
 - Ryan Brunner
 - Brad Robertson
 - Rui Baltazar
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-18 00:00:00.000000000 Z
+date: 2024-05-28 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: '6.2'
+        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: '6.2'
+        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
@@ -121,19 +121,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: capybara
+  name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '4.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '4.2'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -162,20 +176,90 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
+- !ruby/object:Gem::Dependency
+  name: rspec_junit_formatter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     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: '1.63'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.63'
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.21'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.21'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.24'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.24'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.29'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.29'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -196,28 +280,42 @@ 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'
+- !ruby/object:Gem::Dependency
+  name: trilogy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 description: Apartment allows Rack applications to deal with database multitenancy
   through ActiveRecord
 email:
@@ -228,33 +326,22 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".circleci/config.yml"
-- ".github/ISSUE_TEMPLATE.md"
-- ".github/workflows/changelog.yml"
 - ".gitignore"
 - ".pryrc"
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
-- ".story_branch.yml"
+- ".ruby-version"
 - Appraisals
 - CHANGELOG.md
 - Gemfile
 - Guardfile
-- HISTORY.md
 - README.md
 - Rakefile
-- TODO.md
-- docker-compose.yml
-- gemfiles/rails_4_2.gemfile
-- gemfiles/rails_5_0.gemfile
-- gemfiles/rails_5_1.gemfile
-- gemfiles/rails_5_2.gemfile
-- 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/postgresql_adapter.rb
 - lib/apartment/active_record/schema_migration.rb
 - lib/apartment/adapters/abstract_adapter.rb
 - lib/apartment/adapters/abstract_jdbc_adapter.rb
@@ -264,6 +351,7 @@ files:
 - lib/apartment/adapters/postgis_adapter.rb
 - lib/apartment/adapters/postgresql_adapter.rb
 - lib/apartment/adapters/sqlite3_adapter.rb
+- lib/apartment/adapters/trilogy_adapter.rb
 - lib/apartment/console.rb
 - lib/apartment/custom_console.rb
 - lib/apartment/deprecation.rb
@@ -277,7 +365,6 @@ files:
 - 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
@@ -290,8 +377,9 @@ files:
 homepage: https://github.com/rails-on-services/apartment
 licenses:
 - MIT
-metadata: {}
-post_install_message:
+metadata:
+  github_repo: ssh://github.com/rails-on-services/apartment
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -299,15 +387,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.0'
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: '3.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key:
+rubygems_version: 3.5.10
+signing_key: 
 specification_version: 4
 summary: A Ruby gem for managing database multitenancy. Apartment Gem drop in replacement
 test_files: []

data/.circleci/config.yml

@@ -1,78 +0,0 @@
-version: 2.1
-
-orbs:
-  rubocop: hanachin/rubocop@0.0.6
-
-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
-
-workflows:
-  tests:
-    jobs:
-      - build:
-          matrix:
-            parameters:
-              ruby_version: ["ruby:2.6-buster", "ruby:2.7-buster"]
-              gemfile: ["gemfiles/rails_5_2.gemfile", "gemfiles/rails_6_0.gemfile"]
-
-  rubocop:
-    jobs:
-      - rubocop/rubocop:
-          version: 0.88.0

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/.story_branch.yml

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