ros-apartment 2.7.1 → 2.8.1

data/lib/apartment/tasks/task_helper.rb

@@ -19,7 +19,6 @@ module Apartment
     def self.warn_if_tenants_empty
       return unless tenants.empty? && ENV['IGNORE_EMPTY_TENANTS'] != 'true'
 
-      # rubocop:disable Rails/Output
       puts <<-WARNING
         [WARNING] - The list of tenants to migrate appears to be empty. This could mean a few things:
 
@@ -29,7 +28,13 @@ module Apartment
 
         Note that your tenants currently haven't been migrated. You'll need to run `db:migrate` to rectify this.
       WARNING
-      # rubocop:enable Rails/Output
+    end
+
+    def self.create_tenant(tenant_name)
+      puts("Creating #{tenant_name} tenant")
+      Apartment::Tenant.create(tenant_name)
+    rescue Apartment::TenantExists => e
+      puts "Tried to create already existing tenant: #{e}"
     end
   end
 end

data/lib/apartment/tenant.rb

@@ -10,25 +10,10 @@ module Apartment
     extend Forwardable
 
     def_delegators :adapter, :create, :drop, :switch, :switch!, :current, :each,
-                   :reset, :init, :set_callback, :seed, :current_tenant,
-                   :default_tenant, :environmentify
+                   :reset, :init, :set_callback, :seed, :default_tenant, :environmentify
 
     attr_writer :config
 
-    def init_once
-      return if @already_initialized
-
-      # To avoid infinite loops in work init is doing,
-      # we need to set @already_initialized to true
-      # before init is called
-      @already_initialized = true
-      init
-    end
-
-    def reinitialize
-      @already_initialized = false
-    end
-
     #   Fetch the proper multi-tenant adapter based on Rails config
     #
     #   @return {subclass of Apartment::AbstractAdapter}
@@ -38,9 +23,10 @@ module Apartment
         adapter_method = "#{config[:adapter]}_adapter"
 
         if defined?(JRUBY_VERSION)
-          if config[:adapter] =~ /mysql/
+          case config[:adapter]
+          when /mysql/
             adapter_method = 'jdbc_mysql_adapter'
-          elsif config[:adapter] =~ /postgresql/
+          when /postgresql/
             adapter_method = 'jdbc_postgresql_adapter'
           end
         end
@@ -51,7 +37,9 @@ module Apartment
           raise "The adapter `#{adapter_method}` is not yet supported"
         end
 
-        raise AdapterNotFound, "database configuration specifies nonexistent #{config[:adapter]} adapter" unless respond_to?(adapter_method)
+        unless respond_to?(adapter_method)
+          raise AdapterNotFound, "database configuration specifies nonexistent #{config[:adapter]} adapter"
+        end
 
         send(adapter_method, config)
       end
@@ -61,7 +49,6 @@ module Apartment
     #
     def reload!(config = nil)
       Thread.current[:apartment_adapter] = nil
-      reinitialize
       @config = config
     end
 

data/lib/apartment/version.rb

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

data/lib/generators/apartment/install/templates/apartment.rb

@@ -23,7 +23,8 @@ Apartment.configure do |config|
   # You can make this dynamic by providing a Proc object to be called on migrations.
   # This object should yield either:
   # - an array of strings representing each Tenant name.
-  # - a hash which keys are tenant names, and values custom db config (must contain all key/values required in database.yml)
+  # - a hash which keys are tenant names, and values custom db config
+  # (must contain all key/values required in database.yml)
   #
   # config.tenant_names = lambda{ Customer.pluck(:tenant_name) }
   # config.tenant_names = ['tenant1', 'tenant2']

data/lib/tasks/apartment.rake

@@ -10,12 +10,7 @@ apartment_namespace = namespace :apartment do
     Apartment::TaskHelper.warn_if_tenants_empty
 
     Apartment::TaskHelper.tenants.each do |tenant|
-      begin
-        puts("Creating #{tenant} tenant")
-        Apartment::Tenant.create(tenant)
-      rescue Apartment::TenantExists => e
-        puts e.message
-      end
+      Apartment::TaskHelper.create_tenant(tenant)
     end
   end
 
@@ -36,6 +31,7 @@ apartment_namespace = namespace :apartment 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
@@ -45,11 +41,12 @@ apartment_namespace = namespace :apartment do
   end
 
   desc 'Seed all tenants'
-  task seed: :create do
+  task :seed 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

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)/})
+      f.match(%r{^(test|spec|features|documentation)/})
     end
   end
   s.executables   = s.files.grep(%r{^bin/}).map { |f| File.basename(f) }
@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
   s.homepage = 'https://github.com/rails-on-services/apartment'
   s.licenses = ['MIT']
 
-  s.add_dependency 'activerecord',    '>= 5.0.0', '< 6.1'
+  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'

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: ros-apartment
 version: !ruby/object:Gem::Version
-  version: 2.7.1
+  version: 2.8.1
 platform: ruby
 authors:
 - Ryan Brunner
 - Brad Robertson
 - Rui Baltazar
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-27 00:00:00.000000000 Z
+date: 2020-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -21,7 +21,7 @@ dependencies:
         version: 5.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -31,7 +31,7 @@ dependencies:
         version: 5.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement
@@ -228,15 +228,17 @@ 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"
-- ".travis.yml"
 - Appraisals
+- CHANGELOG.md
 - Gemfile
 - Guardfile
 - HISTORY.md
@@ -253,7 +255,6 @@ files:
 - 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
@@ -272,6 +273,7 @@ files:
 - lib/apartment/elevators/host.rb
 - lib/apartment/elevators/host_hash.rb
 - lib/apartment/elevators/subdomain.rb
+- lib/apartment/log_subscriber.rb
 - lib/apartment/migrator.rb
 - lib/apartment/model.rb
 - lib/apartment/railtie.rb
@@ -289,7 +291,7 @@ homepage: https://github.com/rails-on-services/apartment
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -304,8 +306,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: A Ruby gem for managing database multitenancy. Apartment Gem drop in replacement
 test_files: []

data/.travis.yml

@@ -1,49 +0,0 @@
-os: linux
-
-language: ruby
-services:
-  - docker
-rvm:
-  - jruby-9.2.11.0
-  - 2.4.10
-  - 2.5.8
-  - 2.6.6
-  - 2.7.1
-  - jruby-head
-  - ruby-head
-
-branches:
-  only:
-    - master
-    - development
-
-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
-
-bundler_args: --without local
-before_install:
-  - sudo /etc/init.d/mysql stop
-  - sudo /etc/init.d/postgresql stop
-  - docker-compose up -d
-
-env:
-  RUBY_GC_MALLOC_LIMIT: 90000000
-  RUBY_GC_HEAP_FREE_SLOTS: 200000
-jobs:
-  include:
-  - name: Rubocop Lint
-    script: gem install perx-rubocop && rubocop
-
-  allow_failures:
-    - rvm: ruby-head
-    - rvm: jruby-head
-    - gemfile: gemfiles/rails_master.gemfile
-  exclude:
-    - rvm: 2.4.10
-      gemfile: gemfiles/rails_6_0.gemfile
-  fast_finish: true
-cache: bundler

data/lib/apartment/active_record/log_subscriber.rb

@@ -1,41 +0,0 @@
-# frozen_string_literal: true
-
-module ActiveRecord
-  class LogSubscriber
-    def apartment_log
-      return unless Apartment.active_record_log
-
-      database = color("[#{Apartment.connection.current_database}] ", ActiveSupport::LogSubscriber::MAGENTA, true)
-      schema = nil
-      schema = color("[#{Apartment.connection.schema_search_path.tr('"', '')}] ", ActiveSupport::LogSubscriber::YELLOW, true) unless Apartment.connection.schema_search_path.nil?
-      "#{database}#{schema}"
-    end
-
-    def payload_binds(binds, type_casted_binds)
-      return unless (binds || []).empty?
-
-      casted_params = type_casted_binds(type_casted_binds)
-      binds = '  ' + binds.zip(casted_params).map { |attr, value| render_bind(attr, value) }.inspect
-      binds
-    end
-
-    def sql(event)
-      self.class.runtime += event.duration
-      return unless logger.debug?
-
-      payload = event.payload
-
-      return if IGNORE_PAYLOAD_NAMES.include?(payload[:name])
-
-      name  = "#{payload[:name]} (#{event.duration.round(1)}ms)"
-      name  = "CACHE #{name}" if payload[:cached]
-      sql = payload[:sql]
-      binds = payload_binds(payload[:binds], payload[:type_casted_binds])
-
-      name = colorize_payload_name(name, payload[:name])
-      sql  = color(sql, sql_color(sql), true) if colorize_logging
-
-      debug "    #{apartment_log}#{name} #{sql}#{binds}"
-    end
-  end
-end