active_record_host_pool 0.10.1 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 336ed17f3718db418f1f757a17a81fbb0e24da41
-  data.tar.gz: a3902cee8a77566286c728feb6511d397a80e5a6
+SHA256:
+  metadata.gz: '018bdc07dc5428ae890589b96fbf3748d46ef5abc2625c61278ac50ffa079923'
+  data.tar.gz: 101a032eba4e5628106fd4ae8a83c66f52bb68d89f0baad5180ec41c83a932ab
 SHA512:
-  metadata.gz: def4a6ebe3b0069c2de4374c46b33c93d739511b0b8c893cc9e12797dc6fc94e449b9971b2214053c29e9572fc993ffdccec49a440266ee974d7976ec7adbc63
-  data.tar.gz: 520d09bd7360556db30a3a0289acc3b5defca029919998d521d9160cc00ada03029f7b8aab9ab209594cad77e70048e60417a5382b9588609da7964b6e0f42b9
+  metadata.gz: 1ea8bf1c7704be6d72c97be06dfc084a2a66aa0e64848fcabcbbbcb6c73b360517f9737eac8d0e6459e8b6c85d236d36ea7f2a8bf8ed697a46c9d2eb0eca5d3a
+  data.tar.gz: 6eeb13fbd13582106e01bd8fc8a560eeef690d4c375926d17ebccae96b385ca8d4d3e2a75372fc99efad09e7e1bc90e06fc4417d21b3e5deada1ee940f8e347a

data/lib/active_record_host_pool/connection_adapter_mixin.rb

@@ -1,11 +1,6 @@
 # frozen_string_literal: true
 
-['mysql_adapter', 'mysql2_adapter'].each do |adapter|
-  begin
-    require "active_record/connection_adapters/#{adapter}"
-  rescue LoadError
-  end
-end
+require "active_record/connection_adapters/mysql2_adapter"
 
 module ActiveRecordHostPool
   module DatabaseSwitch
@@ -132,7 +127,4 @@ module ActiveRecord
   end
 end
 
-["MysqlAdapter", "Mysql2Adapter"].each do |k|
-  next unless ActiveRecord::ConnectionAdapters.const_defined?(k)
-  ActiveRecord::ConnectionAdapters.const_get(k).class_eval { include ActiveRecordHostPool::DatabaseSwitch }
-end
+ActiveRecord::ConnectionAdapters::Mysql2Adapter.include(ActiveRecordHostPool::DatabaseSwitch)

data/lib/active_record_host_pool/connection_proxy.rb

@@ -35,8 +35,8 @@ module ActiveRecordHostPool
     end
 
     # Override Delegator#respond_to_missing? to allow private methods to be accessed without warning
-    def respond_to_missing?(m, include_private)
-      __getobj__.respond_to?(m, include_private)
+    def respond_to_missing?(name, include_private)
+      __getobj__.respond_to?(name, include_private)
     end
 
     def private_methods(all = true)

data/lib/active_record_host_pool/pool_proxy.rb

@@ -86,13 +86,7 @@ module ActiveRecordHostPool
 
     def rescuable_errors
       @rescuable_errors ||= begin
-        e = []
-        if Object.const_defined?("Mysql")
-          e << Mysql::Error
-        end
-        if Object.const_defined?("Mysql2")
-          e << Mysql2::Error
-        end
+        e = [Mysql2::Error]
         if ActiveRecord.const_defined?("NoDatabaseError")
           e << ActiveRecord::NoDatabaseError
         end

data/lib/active_record_host_pool/version.rb

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

data/test/helper.rb

@@ -23,7 +23,7 @@ module ARHPTestSetup
 
   def arhp_create_models
     return if Object.const_defined?('Test1')
-    eval <<-EOL
+    eval <<-RUBY
       class Test1 < ActiveRecord::Base
         self.table_name = "tests"
         establish_connection(:test_host_1_db_1)
@@ -53,7 +53,7 @@ module ARHPTestSetup
         self.table_name = "tests"
         establish_connection(:test_host_2_db_5)
       end
-    EOL
+    RUBY
   end
 
   def current_database(klass)

data/test/test_arhp.rb

@@ -46,6 +46,7 @@ class ActiveRecordHostPoolTest < Minitest::Test
     # Relies on connection.class returning the real class
     Test1.connection.class.class_eval do
       private
+
       def test_private_method
         true
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record_host_pool
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.11.0
 platform: ruby
 authors:
 - Ben Osheroff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-11 00:00:00.000000000 Z
+date: 2018-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -19,7 +19,7 @@ dependencies:
         version: 3.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,15 +29,15 @@ dependencies:
         version: 3.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
-  name: wwtd
+  name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -45,7 +45,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mysql2
+  name: bump
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -59,21 +59,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 12.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 12.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: shoulda
+  name: phenix
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -87,35 +87,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mocha
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 12.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 12.0.0
 - !ruby/object:Gem::Dependency
-  name: bump
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.55.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.55.0
 - !ruby/object:Gem::Dependency
-  name: phenix
+  name: shoulda
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -129,19 +129,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: wwtd
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.48.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.48.0
+        version: '0'
 description: ''
 email:
 - ben@gimbo.net
@@ -182,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Allow ActiveRecord to share a connection to multiple databases on the same