active_record_host_pool 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '018bdc07dc5428ae890589b96fbf3748d46ef5abc2625c61278ac50ffa079923'
-  data.tar.gz: 101a032eba4e5628106fd4ae8a83c66f52bb68d89f0baad5180ec41c83a932ab
+  metadata.gz: 902e5e0cb2f51303355efa11fe7d25d357d6c9560310cab1e3e6bc5c0ad1758b
+  data.tar.gz: 9584c62c0572915b4de0aff99b2449a787c6236d3828e3858b6a6c2079ef1882
 SHA512:
-  metadata.gz: 1ea8bf1c7704be6d72c97be06dfc084a2a66aa0e64848fcabcbbbcb6c73b360517f9737eac8d0e6459e8b6c85d236d36ea7f2a8bf8ed697a46c9d2eb0eca5d3a
-  data.tar.gz: 6eeb13fbd13582106e01bd8fc8a560eeef690d4c375926d17ebccae96b385ca8d4d3e2a75372fc99efad09e7e1bc90e06fc4417d21b3e5deada1ee940f8e347a
+  metadata.gz: 400906a1082b28c51d7bbcd3efffed956e4e26ce46c8bc2e71a73431ce1028eafcbfef06a0b3a220647ea3e5865b1d9ac8b2dd34960bba76d7ca059339daaf0a
+  data.tar.gz: 8094cbe8a0497f5d16cb7caa27953d4e78e2945cd46f53e00912654b2fff7cb447c8dc323b0faeebc74f3c425bd9e6a2b86f4546485e46171616a3cd2b6f10e3

data/Readme.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/zendesk/active_record_host_pool.svg?branch=master)](https://travis-ci.org/zendesk/active_record_host_pool)
+[![Build status](https://circleci.com/gh/zendesk/active_record_host_pool.svg?style=svg)](https://circleci.com/gh/zendesk/active_record_host_pool)
 
 # ActiveRecord host pooling
 
@@ -17,11 +17,11 @@ Postgres, from an informal reading of the docs, will never support the concept o
 and make sure to require 'active\_record\_host\_pool' in some way.
 
 ## Testing
-You need a local user called 'travis'.
+You need a local user called 'john-doe'.
 
     mysql -uroot
-    CREATE USER 'travis'@'localhost';
-    GRANT SELECT,INSERT,UPDATE,DELETE,CREATE,DROP,INDEX  ON *.* TO 'travis'@'localhost';
+    CREATE USER 'john-doe'@'localhost';
+    GRANT SELECT,INSERT,UPDATE,DELETE,CREATE,DROP,INDEX  ON *.* TO 'john-doe'@'localhost';
     FLUSH PRIVILEGES;
 
 ## Copyright

data/lib/active_record_host_pool/connection_adapter_mixin.rb

@@ -90,9 +90,7 @@ module ActiveRecord
     class ConnectionHandler
       if ActiveRecord::VERSION::MAJOR == 5
         if ActiveRecord::VERSION::MINOR == 0
-          def establish_connection(spec)
-            owner_to_pool[spec.name] = ActiveRecordHostPool::PoolProxy.new(spec)
-          end
+          raise "Unsupported version of Rails (v#{ActiveRecord::VERSION::STRING})"
         else
           def establish_connection(spec)
             resolver = ConnectionAdapters::ConnectionSpecification::Resolver.new(Base.configurations)
@@ -107,21 +105,13 @@ module ActiveRecord
         def establish_connection(owner, spec)
           @class_to_pool.clear
           raise "Anonymous class is not allowed." unless owner.name
-          owner_to_pool[owner.name] = ActiveRecordHostPool::PoolProxy.new(spec)
-        end
 
-      elsif ActiveRecord::VERSION::MAJOR == 3
-
-        def establish_connection(owner, spec)
-          @connection_pools[spec] ||= ActiveRecordHostPool::PoolProxy.new(spec)
-          @class_to_pool[owner] = @connection_pools[spec]
+          owner_to_pool[owner.name] = ActiveRecordHostPool::PoolProxy.new(spec)
         end
 
       else
 
-        def establish_connection(owner, spec)
-          @connection_pools[owner] = ActiveRecordHostPool::PoolProxy.new(spec)
-        end
+        raise "Unsupported version of Rails (v#{ActiveRecord::VERSION::STRING})"
       end
     end
   end

data/lib/active_record_host_pool/pool_proxy.rb

@@ -66,6 +66,7 @@ module ActiveRecordHostPool
     def disconnect!
       p = _connection_pool(false)
       return unless p
+
       p.disconnect!
       p.automatic_reconnect = true if p.respond_to?(:automatic_reconnect=)
       _clear_connection_proxy_cache
@@ -74,6 +75,7 @@ module ActiveRecordHostPool
     def automatic_reconnect=(value)
       p = _connection_pool(false)
       return unless p
+
       p.automatic_reconnect = value if p.respond_to?(:automatic_reconnect=)
     end
 

data/lib/active_record_host_pool/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveRecordHostPool
-  VERSION = "0.11.0"
+  VERSION = "0.12.0"
 end

data/test/database.yml

@@ -52,7 +52,7 @@ test_host_2_db_5:
   adapter: mysql2
   encoding: utf8
   database: arhp_test_4
-  username: travis
+  username: john-doe
   password:
   host: <%= mysql.host %>
   port: <%= mysql.port %>

data/test/helper.rb

@@ -15,14 +15,15 @@ Minitest::Test = MiniTest::Unit::TestCase unless defined?(::Minitest::Test)
 ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + '/test.log')
 
 Phenix.configure do |config|
-  config.skip_database = ->(name, conf) { name =~ /not_there/ || conf['username'] == 'travis' }
+  config.skip_database = ->(name, conf) { name =~ /not_there/ || conf['username'] == 'john-doe' }
 end
 
 module ARHPTestSetup
   private
 
   def arhp_create_models
-    return if Object.const_defined?('Test1')
+    return if ARHPTestSetup.const_defined?('Test1')
+
     eval <<-RUBY
       class Test1 < ActiveRecord::Base
         self.table_name = "tests"

data/test/test_arhp.rb

@@ -150,7 +150,7 @@ class ActiveRecordHostPoolTest < Minitest::Test
 
   def assert_action_uses_correct_database(action, sql)
     (1..4).each do |i|
-      klass = eval "Test#{i}"
+      klass = ARHPTestSetup.const_get("Test#{i}")
       desired_db = "arhp_test_#{i}"
       klass.connection.send(action, sql)
       assert_equal desired_db, current_database(klass)

metadata

@@ -1,14 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: active_record_host_pool
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
+- Benjamin Quorning
+- Gabe Martin-Dempesy
+- Pierre Schambacher
 - Ben Osheroff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-24 00:00:00.000000000 Z
+date: 2019-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,7 +19,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.2.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.0'
@@ -26,7 +29,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.2.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.0'
@@ -104,16 +107,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.55.0
+        version: 0.62.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.55.0
+        version: 0.62.0
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
@@ -128,23 +131,11 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: wwtd
-  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'
 description: ''
 email:
-- ben@gimbo.net
+- bquorning@zendesk.com
+- gabe@zendesk.com
+- pschambacher@zendesk.com
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -181,8 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Allow ActiveRecord to share a connection to multiple databases on the same