active_record_host_pool 0.6.5 → 0.7.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 3afb58583904ec2e606e050f1a2a13dff283d13e
+  data.tar.gz: 28250948075a9e1e29778b2fdd4a08075da2d4f7
+SHA512:
+  metadata.gz: 30de25c6e3cc4f8caf0a1f89ed2d07eda70288e4860728190e8efdd0b82cb1b27010399d35c98465319099526bbe124672d05655f52b474c1bc6e13661eaa557
+  data.tar.gz: 11d9b5be51cae0d7e23924cf054a6baca3ba4a3ab1080b55b5a73a42213c094106b157d0ae55cb622d627f7627c3df5a3959d770791b429f93918c378cbb6f06

data/Readme.md

@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.org/zendesk/active_record_host_pool.svg?branch=master)](https://travis-ci.org/zendesk/active_record_host_pool)
+
 # ActiveRecord host pooling
 
 This gem allows for one ActiveRecord connection to be used to connect to multiple databases on a server.
@@ -5,9 +7,8 @@ It accomplishes this by calling select_db() as necessary to switch databases bet
 
 ## Support
 
-For now, the only backend known to work is mysql (and not with the mysql2 library, yet).  
-Postgres, from an informal reading of the docs, will never support the concept of one 
-server connection sharing multiple dbs.
+For now, the only backend known to work is MySQL, with the mysql2 gem.
+Postgres, from an informal reading of the docs, will never support the concept of one server connection sharing multiple dbs.
 
 ## Installation
 
@@ -16,11 +17,11 @@ server connection sharing multiple dbs.
 and make sure to require 'active\_record\_host\_pool' in some way.
 
 ## Testing
-You need a local user called snoopy.
+You need a local user called 'travis'.
 
     mysql -uroot
-    CREATE USER 'snoopy'@'localhost';
-    GRANT SELECT,INSERT,UPDATE,DELETE,CREATE,DROP,INDEX  ON *.* TO 'snoopy'@'localhost';
+    CREATE USER 'travis'@'localhost';
+    GRANT SELECT,INSERT,UPDATE,DELETE,CREATE,DROP,INDEX  ON *.* TO 'travis'@'localhost';
     FLUSH PRIVILEGES;
 
 ## Copyright
@@ -28,5 +29,5 @@ You need a local user called snoopy.
 Copyright (c) 2011 Zendesk. See MIT-LICENSE for details.
 
 ## Authors
-Ben Osheroff <ben@gimbo.net>,  
+Ben Osheroff <ben@gimbo.net>,
 Mick Staugaard <mick@staugaard.com>

data/lib/active_record_host_pool/connection_adapter_mixin.rb

@@ -79,10 +79,16 @@ module ActiveRecord
   module ConnectionAdapters
     class ConnectionHandler
       def establish_connection(name, spec)
-        if @class_to_pool # AR 3.2
+        if ActiveRecord::VERSION::MAJOR >= 4
+          owner = name
+
+          @class_to_pool.clear
+          raise RuntimeError, "Anonymous class is not allowed." unless owner.name
+          owner_to_pool[owner.name] = ActiveRecordHostPool::PoolProxy.new(spec)
+        elsif ActiveRecord::VERSION::MAJOR == 3 && ActiveRecord::VERSION::MINOR == 2
           @connection_pools[spec] ||= ActiveRecordHostPool::PoolProxy.new(spec)
           @class_to_pool[name] = @connection_pools[spec]
-        else # AR 3.1 and lower
+        else
           @connection_pools[name] = ActiveRecordHostPool::PoolProxy.new(spec)
         end
       end

data/test/database.yml

@@ -1,5 +1,5 @@
 test_host_1_db_1:
-  adapter: mysql
+  adapter: mysql2
   encoding: utf8
   database: arhp_test_1
   username: root
@@ -8,7 +8,7 @@ test_host_1_db_1:
   reconnect: true
 
 test_host_1_db_2:
-  adapter: mysql
+  adapter: mysql2
   encoding: utf8
   database: arhp_test_2
   username: root
@@ -17,7 +17,7 @@ test_host_1_db_2:
   reconnect: true
 
 test_host_2_db_3:
-  adapter: mysql
+  adapter: mysql2
   encoding: utf8
   database: arhp_test_3
   username: root
@@ -27,7 +27,7 @@ test_host_2_db_3:
   reconnect: true
 
 test_host_2_db_4:
-  adapter: mysql
+  adapter: mysql2
   encoding: utf8
   database: arhp_test_4
   username: root
@@ -37,17 +37,17 @@ test_host_2_db_4:
   reconnect: true
 
 test_host_2_db_5:
-  adapter: mysql
+  adapter: mysql2
   encoding: utf8
   database: arhp_test_4
-  username: snoopy
+  username: travis
   password:
   host: 127.0.0.1
   port: 3306
   reconnect: true
 
 test_host_1_db_not_there:
-  adapter: mysql
+  adapter: mysql2
   encoding: utf8
   database: arhp_test_no_create
   username: root

data/test/helper.rb

@@ -1,5 +1,5 @@
 require 'bundler/setup'
-require 'test/unit'
+require 'minitest/autorun'
 
 require 'active_record_host_pool'
 require 'logger'

data/test/test_arhp.rb

@@ -1,6 +1,6 @@
 require File.expand_path('helper', File.dirname(__FILE__))
 
-class ActiveRecordHostPoolTest < Test::Unit::TestCase
+class ActiveRecordHostPoolTest < MiniTest::Unit::TestCase
   include ARHPTestSetup
   def setup
     arhp_create_databases
@@ -97,7 +97,7 @@ class ActiveRecordHostPoolTest < Test::Unit::TestCase
 
     # now, disable our auto-switching and trigger a mysql reconnect
     switch_to_klass.connection.unproxied.stubs(:_switch_connection).returns(true)
-    switch_to_klass.connection.execute("KILL #{thread_id}")
+    Test3.connection.execute("KILL #{thread_id}")
 
     # and finally, did mysql reconnect correctly?
     puts "\nAnd now we end up on #{current_database(switch_to_klass)}" if debug_me

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_host_pool
 version: !ruby/object:Gem::Version
-  version: 0.6.5
-  prerelease: 
+  version: 0.7.0
 platform: ruby
 authors:
 - Ben Osheroff
@@ -14,17 +13,15 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: ''
@@ -36,12 +33,12 @@ extra_rdoc_files:
 - MIT-LICENSE
 - Readme.md
 files:
+- MIT-LICENSE
 - Readme.md
 - lib/active_record_host_pool.rb
 - lib/active_record_host_pool/connection_adapter_mixin.rb
 - lib/active_record_host_pool/connection_proxy.rb
 - lib/active_record_host_pool/pool_proxy.rb
-- MIT-LICENSE
 - test/database.yml
 - test/helper.rb
 - test/schema.rb
@@ -49,27 +46,26 @@ files:
 homepage: https://github.com/zendesk/active_record_host_pool
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Allow ActiveRecord to share a connection to multiple databases on the same
   host
 test_files:
@@ -77,4 +73,3 @@ test_files:
 - test/helper.rb
 - test/schema.rb
 - test/test_arhp.rb
-has_rdoc: