ros-apartment 2.8.1.rc1 → 2.8.1.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f446466c85cecc098b1fec480bd1400bc849ea49ea4f7b5607c1bb3bd46ab6b6
-  data.tar.gz: ed713631a71b9b9948f942f25f6cb5dba586a41dcdebe40f14fdef6effccf25c
+  metadata.gz: f4eae53ab581ffa6402db4640424f23f864b8a4f72a1cf38bd35dc200fc014bf
+  data.tar.gz: f0ca3c1ae5102e4aa644aab5758543032455d6266fc86c5b3d97bb6e21eab731
 SHA512:
-  metadata.gz: a7bf926bd676c7025c1567063b1b97eb01993e7d6f4821ff8e103e9b1057791712a8590247191070764fdbbfd17dc70cc54848fee5c5a7e5379315eda4554cb5
-  data.tar.gz: 86375a0c10ce05b3a2e9c217c9c0e574a643725fcba1f98631165d7e8682f9d840d152238d24370ebc55d2713989ff47d633e35fd7c2cdde171443cbcbc3dd07
+  metadata.gz: f4bca612be122515d41ab388cf1bc22d96216b0baa8178a6d6d1a52418c932bcafe97f4089dfc1eff3725544ee1044391772f35935b86caf67c66d311e85c7ac
+  data.tar.gz: fb489d69d50d6caea7c3a19be53b8e693fb8ea24782c8850eb4efca070eecce7364f3f2fc7d8f17a37e93caeed6a08ef6cfad3dbd7c47857c91442803e44e51c

data/.circleci/config.yml

@@ -0,0 +1,78 @@
+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/.rubocop.yml

@@ -4,6 +4,11 @@ AllCops:
   Exclude:
     - 'gemfiles/**/*.gemfile'
     - 'gemfiles/vendor/**/*'
+    - 'spec/dummy_engine/dummy_engine.gemspec'
+
+Gemspec/RequiredRubyVersion:
+  Exclude:
+    - 'ros-apartment.gemspec'
 
 Style/WordArray:
   Exclude:

data/CHANGELOG.md

@@ -9,6 +9,7 @@
 **Fixed bugs:**
 
 - New version raises an error with ActiveSupport::LogSubscriber [#128](https://github.com/rails-on-services/apartment/issues/128)
+- Weird logs when tenant fails to create [#127](<https://github.com/rails-on-services/apartment/issues/127>)
 
 **Closed issues:**
 

data/README.md

@@ -351,7 +351,7 @@ Please note that our custom logger inherits from `ActiveRecord::LogSubscriber` s
 
 ```ruby
 Apartment.configure do |config|
-  active_record_log = true
+  config.active_record_log = true
 end
 ```
 

data/Rakefile

@@ -47,9 +47,9 @@ namespace :db do
     rails_db_file = 'spec/dummy/config/database.yml'
 
     unless File.exist?(apartment_db_file)
-      FileUtils.copy(apartment_db_file + '.sample', apartment_db_file, verbose: true)
+      FileUtils.copy("#{apartment_db_file}.sample", apartment_db_file, verbose: true)
     end
-    FileUtils.copy(rails_db_file + '.sample', rails_db_file, verbose: true) unless File.exist?(rails_db_file)
+    FileUtils.copy("#{rails_db_file}.sample", rails_db_file, verbose: true) unless File.exist?(rails_db_file)
   end
 end
 
@@ -65,6 +65,7 @@ namespace :postgres do
     params << "-U#{pg_config['username']}"
     params << "-h#{pg_config['host']}" if pg_config['host']
     params << "-p#{pg_config['port']}" if pg_config['port']
+
     begin
       `createdb #{params.join(' ')}`
     rescue StandardError

data/lib/apartment/adapters/abstract_adapter.rb

@@ -201,11 +201,13 @@ module Apartment
       #   @param {String}  tenant: Database name
       #   @param {Boolean} with_database: if true, use the actual tenant's db name
       #                                   if false, use the default db name from the db
+      # rubocop:disable Style/OptionalBooleanParameter
       def multi_tenantify(tenant, with_database = true)
         db_connection_config(tenant).tap do |config|
           multi_tenantify_with_tenant_db_name(config, tenant) if with_database
         end
       end
+      # rubocop:enable Style/OptionalBooleanParameter
 
       def multi_tenantify_with_tenant_db_name(config, tenant)
         config[:database] = environmentify(tenant)

data/lib/apartment/adapters/postgresql_adapter.rb

@@ -98,7 +98,7 @@ module Apartment
 
       def create_tenant_command(conn, tenant)
         # NOTE: This was causing some tests to fail because of the database strategy for rspec
-        if ActiveRecord::Base.connection.open_transactions > 0
+        if ActiveRecord::Base.connection.open_transactions.positive?
           conn.execute(%(CREATE SCHEMA "#{tenant}"))
         else
           schema = %(BEGIN;
@@ -113,7 +113,7 @@ module Apartment
       end
 
       def rollback_transaction(conn)
-        conn.execute("ROLLBACK;")
+        conn.execute('ROLLBACK;')
       end
 
       #   Generate the final search path to set including persistent_schemas

data/lib/apartment/console.rb

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
 
-# A workaraound to get `reload!` to also call Apartment::Tenant.init
+# A workaround to get `reload!` to also call Apartment::Tenant.init
 # This is unfortunate, but I haven't figured out how to hook into the reload process *after* files are reloaded
 
 # reloads the environment
+# rubocop:disable Style/OptionalBooleanParameter
 def reload!(print = true)
   puts 'Reloading...' if print
 
@@ -13,6 +14,7 @@ def reload!(print = true)
   Apartment::Tenant.init
   true
 end
+# rubocop:enable Style/OptionalBooleanParameter
 
 def st(schema_name = nil)
   if schema_name.nil?

data/lib/apartment/log_subscriber.rb

@@ -3,10 +3,14 @@
 require 'active_record/log_subscriber'
 
 module Apartment
+  # Custom Log subscriber to include database name and schema name in sql logs
   class LogSubscriber < ActiveRecord::LogSubscriber
+    # 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)
     end
+    # rubocop:enable Lint/UselessMethodDefinition
 
     private
 
@@ -17,7 +21,7 @@ module Apartment
     end
 
     def apartment_log
-      database = color("[#{Apartment.connection.current_database}] ", ActiveSupport::LogSubscriber::MAGENTA, true)
+      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('"', '')}] ",

data/lib/apartment/railtie.rb

@@ -6,7 +6,6 @@ require 'apartment/reloader'
 
 module Apartment
   class Railtie < Rails::Railtie
-
     #
     #   Set up our default config options
     #   Do this before the app initializers run so we don't override custom settings
@@ -27,13 +26,14 @@ module Apartment
     end
 
     #   Hook into ActionDispatch::Reloader to ensure Apartment is properly initialized
-    #   Note that this doens't entirely work as expected in Development, because this is called before classes are reloaded
+    #   Note that this doesn't entirely work as expected in Development,
+    #   because this is called before classes are reloaded
     #   See the middleware/console declarations below to help with this. Hope to fix that soon.
     #
     config.to_prepare do
       next if ARGV.any? { |arg| arg =~ /\Aassets:(?:precompile|clean)\z/ }
       next if ARGV.any? { |arg| arg == 'webpacker:compile' }
-      next if ENV["APARTMENT_DISABLE_INIT"]
+      next if ENV['APARTMENT_DISABLE_INIT']
 
       begin
         Apartment.connection_class.connection_pool.with_connection do
@@ -45,7 +45,7 @@ module Apartment
       end
     end
 
-    config.after_initialize do |app|
+    config.after_initialize do
       # NOTE: Load the custom log subscriber if enabled
       if Apartment.active_record_log
         ActiveSupport::Notifications.unsubscribe 'sql.active_record'
@@ -72,10 +72,13 @@ module Apartment
         app.config.middleware.use Apartment::Reloader
       end
 
-      # Overrides reload! to also call Apartment::Tenant.init as well so that the reloaded classes have the proper table_names
+      # Overrides reload! to also call Apartment::Tenant.init as well
+      # so that the reloaded classes have the proper table_names
+      # rubocop:disable Lint/Debugger
       console do
         require 'apartment/console'
       end
+      # rubocop:enable Lint/Debugger
     end
   end
 end

data/lib/apartment/tenant.rb

@@ -24,9 +24,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

data/lib/apartment/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ros-apartment
 version: !ruby/object:Gem::Version
-  version: 2.8.1.rc1
+  version: 2.8.1.rc2
 platform: ruby
 authors:
 - Ryan Brunner
@@ -228,6 +228,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".github/ISSUE_TEMPLATE.md"
 - ".github/workflows/changelog.yml"
 - ".gitignore"
@@ -236,7 +237,6 @@ files:
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
 - ".story_branch.yml"
-- ".travis.yml"
 - Appraisals
 - CHANGELOG.md
 - Gemfile

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 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