active_record_host_pool 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 741be382dcf1536af363b25893861f8ad2378593
-  data.tar.gz: 9a36bdfa1a6443f397d60f6d3269842bd29ec0ff
+  metadata.gz: 336ed17f3718db418f1f757a17a81fbb0e24da41
+  data.tar.gz: a3902cee8a77566286c728feb6511d397a80e5a6
 SHA512:
-  metadata.gz: 7bbb1ad8a038fee0a4a71d5404e1dd4a3b44e8c122d0f582305fa3b2a0b521525f028a83fd0e307273a8aeb3fa3f2dc767a046a6300a119b66ebc61e53a80111
-  data.tar.gz: aa02de512df8b45a4bfa3bd02e529ee33de4ad72403ab8c1e3948e610cc6f6d6c8983f64b13167f36f2a07343848cb51b3542b39925c2da98f46f0aa875d5bf8
+  metadata.gz: def4a6ebe3b0069c2de4374c46b33c93d739511b0b8c893cc9e12797dc6fc94e449b9971b2214053c29e9572fc993ffdccec49a440266ee974d7976ec7adbc63
+  data.tar.gz: 520d09bd7360556db30a3a0289acc3b5defca029919998d521d9160cc00ada03029f7b8aab9ab209594cad77e70048e60417a5382b9588609da7964b6e0f42b9

data/lib/active_record_host_pool.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'active_record'
 require 'active_record/base'
 require 'active_record/connection_adapters/abstract_adapter'

data/lib/active_record_host_pool/connection_adapter_mixin.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 ['mysql_adapter', 'mysql2_adapter'].each do |adapter|
   begin
     require "active_record/connection_adapters/#{adapter}"
@@ -31,29 +32,30 @@ module ActiveRecordHostPool
       end
     end
 
+    def initialize(*)
+      @_cached_current_database = nil
+      super
+    end
+
     def execute_with_switching(*args)
-      if _host_pool_current_database && ! @_no_switch
+      if _host_pool_current_database && !_no_switch
         _switch_connection
       end
       execute_without_switching(*args)
     end
 
     def drop_database_with_no_switching(*args)
-      begin
-        @_no_switch = true
-        drop_database_without_no_switching(*args)
-      ensure
-        @_no_switch = false
-      end
+      self._no_switch = true
+      drop_database_without_no_switching(*args)
+    ensure
+      self._no_switch = false
     end
 
     def create_database_with_no_switching(*args)
-      begin
-        @_no_switch = true
-        create_database_without_no_switching(*args)
-      ensure
-        @_no_switch = false
-      end
+      self._no_switch = true
+      create_database_without_no_switching(*args)
+    ensure
+      self._no_switch = false
     end
 
     def disconnect_with_host_pooling!
@@ -64,8 +66,14 @@ module ActiveRecordHostPool
 
     private
 
+    attr_accessor :_no_switch
+
     def _switch_connection
-      if _host_pool_current_database && ((_host_pool_current_database != @_cached_current_database) || @connection.object_id != @_cached_connection_object_id)
+      if _host_pool_current_database &&
+         (
+           (_host_pool_current_database != @_cached_current_database) ||
+           @connection.object_id != @_cached_connection_object_id
+         )
         log("select_db #{_host_pool_current_database}", "SQL") do
           clear_cache! if respond_to?(:clear_cache!)
           raw_connection.select_db(_host_pool_current_database)
@@ -85,7 +93,6 @@ end
 module ActiveRecord
   module ConnectionAdapters
     class ConnectionHandler
-
       if ActiveRecord::VERSION::MAJOR == 5
         if ActiveRecord::VERSION::MINOR == 0
           def establish_connection(spec)
@@ -104,11 +111,11 @@ module ActiveRecord
 
         def establish_connection(owner, spec)
           @class_to_pool.clear
-          raise RuntimeError, "Anonymous class is not allowed." unless owner.name
+          raise "Anonymous class is not allowed." unless owner.name
           owner_to_pool[owner.name] = ActiveRecordHostPool::PoolProxy.new(spec)
         end
 
-      elsif ActiveRecord::VERSION::MAJOR == 3 && ActiveRecord::VERSION::MINOR == 2
+      elsif ActiveRecord::VERSION::MAJOR == 3
 
         def establish_connection(owner, spec)
           @connection_pools[spec] ||= ActiveRecordHostPool::PoolProxy.new(spec)
@@ -120,9 +127,7 @@ module ActiveRecord
         def establish_connection(owner, spec)
           @connection_pools[owner] = ActiveRecordHostPool::PoolProxy.new(spec)
         end
-
       end
-
     end
   end
 end

data/lib/active_record_host_pool/connection_proxy.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'delegate'
 
 # the ConnectionProxy sits between user-code and a real connection and says "I expect to be on this database"
@@ -38,7 +39,7 @@ module ActiveRecordHostPool
       __getobj__.respond_to?(m, include_private)
     end
 
-    def private_methods(all=true)
+    def private_methods(all = true)
       __getobj__.private_methods(all) | super
     end
 
@@ -51,10 +52,9 @@ module ActiveRecordHostPool
     end
 
     private
+
     def select(*args)
       @cx.__send__(:select, *args)
     end
   end
 end
-
-

data/lib/active_record_host_pool/pool_proxy.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'delegate'
 require 'active_record'
 require 'active_record_host_pool/connection_adapter_mixin'
@@ -34,15 +35,13 @@ module ActiveRecordHostPool
     end
 
     def connection(*args)
-      begin
-        real_connection = _connection_pool.connection(*args)
-        _connection_proxy_for(real_connection, @config[:database])
-      rescue Exception => e
-        if rescuable_errors.any? { |r| e.is_a?(r) }
-          _connection_pools.delete(_pool_key)
-        end
-        Kernel.raise(e)
+      real_connection = _connection_pool.connection(*args)
+      _connection_proxy_for(real_connection, @config[:database])
+    rescue Exception => e
+      if rescuable_errors.any? { |r| e.is_a?(r) }
+        _connection_pools.delete(_pool_key)
       end
+      Kernel.raise(e)
     end
 
     # by the time we are patched into ActiveRecord, the current thread has already established
@@ -59,9 +58,9 @@ module ActiveRecordHostPool
 
     def with_connection
       cx = checkout
-        yield cx
-      ensure
-        checkin cx
+      yield cx
+    ensure
+      checkin cx
     end
 
     def disconnect!
@@ -83,7 +82,8 @@ module ActiveRecordHostPool
       _clear_connection_proxy_cache
     end
 
-  private
+    private
+
     def rescuable_errors
       @rescuable_errors ||= begin
         e = []
@@ -108,7 +108,7 @@ module ActiveRecordHostPool
       @_pool_key ||= "#{@config[:host]}/#{@config[:port]}/#{@config[:socket]}/#{@config[:username]}/#{@config[:slave] && 'slave'}"
     end
 
-    def _connection_pool(auto_create=true)
+    def _connection_pool(auto_create = true)
       pool = _connection_pools[_pool_key]
       if pool.nil? && auto_create
         pool = _connection_pools[_pool_key] = ActiveRecord::ConnectionAdapters::ConnectionPool.new(@spec)
@@ -132,4 +132,3 @@ module ActiveRecordHostPool
     end
   end
 end
-

data/lib/active_record_host_pool/version.rb

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

data/test/helper.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'bundler/setup'
 require 'minitest/autorun'
 
@@ -7,11 +8,11 @@ require 'logger'
 require 'mocha/setup'
 require 'phenix'
 
-RAILS_ENV = "test"
+RAILS_ENV = 'test'
 
 Minitest::Test = MiniTest::Unit::TestCase unless defined?(::Minitest::Test)
 
-ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/test.log")
+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' }
@@ -21,7 +22,7 @@ module ARHPTestSetup
   private
 
   def arhp_create_models
-    return if Object.const_defined?("Test1")
+    return if Object.const_defined?('Test1')
     eval <<-EOL
       class Test1 < ActiveRecord::Base
         self.table_name = "tests"
@@ -56,6 +57,6 @@ module ARHPTestSetup
   end
 
   def current_database(klass)
-    klass.connection.select_value("select DATABASE()")
+    klass.connection.select_value('select DATABASE()')
   end
 end

data/test/schema.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
-ActiveRecord::Schema.define(:version => 1) do
-  create_table "tests" do |t|
-    t.string   "val"
+
+require_relative 'helper'
+ActiveRecord::Schema.define(version: 1) do
+  create_table 'tests' do |t|
+    t.string   'val'
   end
 end

data/test/test_arhp.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative 'helper'
 
 class ActiveRecordHostPoolTest < Minitest::Test
@@ -13,32 +14,32 @@ class ActiveRecordHostPoolTest < Minitest::Test
   end
 
   def test_models_with_matching_hosts_should_share_a_connection
-    assert(Test1.connection.raw_connection == Test2.connection.raw_connection)
-    assert(Test3.connection.raw_connection == Test4.connection.raw_connection)
+    assert_equal(Test1.connection.raw_connection, Test2.connection.raw_connection)
+    assert_equal(Test3.connection.raw_connection, Test4.connection.raw_connection)
   end
 
   def test_models_without_matching_hosts_should_not_share_a_connection
-    assert(Test1.connection.raw_connection != Test4.connection.raw_connection)
+    refute_equal(Test1.connection.raw_connection, Test4.connection.raw_connection)
   end
 
   def test_models_without_matching_usernames_should_not_share_a_connection
-    assert(Test4.connection.raw_connection != Test5.connection.raw_connection)
+    refute_equal(Test4.connection.raw_connection, Test5.connection.raw_connection)
   end
 
   def test_models_without_match_slave_status_should_not_share_a_connection
-    assert(Test1.connection.raw_connection != Test1Slave.connection.raw_connection)
+    refute_equal(Test1.connection.raw_connection, Test1Slave.connection.raw_connection)
   end
 
   def test_should_select_on_correct_database
-    action_should_use_correct_database(:select_all, "select 1")
+    assert_action_uses_correct_database(:select_all, 'select 1')
   end
 
   def test_should_insert_on_correct_database
-    action_should_use_correct_database(:insert, "insert into tests values(NULL, 'foo')")
+    assert_action_uses_correct_database(:insert, "insert into tests values(NULL, 'foo')")
   end
 
   def test_connection_returns_a_proxy
-    assert Test1.connection.is_a?(ActiveRecordHostPool::ConnectionProxy)
+    assert_kind_of ActiveRecordHostPool::ConnectionProxy, Test1.connection
   end
 
   def test_connection_proxy_handles_private_methods
@@ -52,47 +53,62 @@ class ActiveRecordHostPoolTest < Minitest::Test
     assert Test1.connection.respond_to?(:test_private_method, true)
     refute Test1.connection.respond_to?(:test_private_method)
     assert_includes(Test1.connection.private_methods, :test_private_method)
-    assert(Test1.connection.send(:test_private_method) == true)
+    assert_equal true, Test1.connection.send(:test_private_method)
   end
 
   def test_should_not_share_a_query_cache
-    Test1.create(:val => 'foo')
-    Test2.create(:val => 'foobar')
+    Test1.create(val: 'foo')
+    Test2.create(val: 'foobar')
     Test1.connection.cache do
-      assert Test1.first.val != Test2.first.val
+      refute_equal Test1.first.val, Test2.first.val
     end
   end
 
   def test_object_creation
-    Test1.create(:val => 'foo')
-    assert_equal("arhp_test_1", current_database(Test1))
+    Test1.create(val: 'foo')
+    assert_equal('arhp_test_1', current_database(Test1))
 
-    Test3.create(:val => 'bar')
-    assert_equal("arhp_test_1", current_database(Test1))
-    assert_equal("arhp_test_3", current_database(Test3))
+    Test3.create(val: 'bar')
+    assert_equal('arhp_test_1', current_database(Test1))
+    assert_equal('arhp_test_3', current_database(Test3))
 
-    Test2.create!(:val => 'bar_distinct')
-    assert_equal("arhp_test_2", current_database(Test2))
+    Test2.create!(val: 'bar_distinct')
+    assert_equal('arhp_test_2', current_database(Test2))
     assert Test2.find_by_val('bar_distinct')
-    assert !Test1.find_by_val('bar_distinct')
+    refute Test1.find_by_val('bar_distinct')
   end
 
   def test_disconnect
-    Test1.create(:val => 'foo')
+    Test1.create(val: 'foo')
     unproxied = Test1.connection.unproxied
     Test1.connection_handler.clear_all_connections!
-    Test1.create(:val => 'foo')
+    Test1.create(val: 'foo')
     assert(unproxied != Test1.connection.unproxied)
   end
 
   def test_checkout
     connection = ActiveRecord::Base.connection_pool.checkout
-    assert(connection.is_a?(ActiveRecordHostPool::ConnectionProxy))
+    assert_kind_of(ActiveRecordHostPool::ConnectionProxy, connection)
     ActiveRecord::Base.connection_pool.checkin(connection)
     c2 = ActiveRecord::Base.connection_pool.checkout
     assert(c2 == connection)
   end
 
+  def test_no_switch_when_creating_db
+    conn = Test1.connection
+    conn.expects(:execute_without_switching)
+    conn.expects(:_switch_connection).never
+    assert conn._host_pool_current_database
+    conn.create_database(:some_args)
+  end
+
+  def test_no_switch_when_dropping_db
+    conn = Test1.connection
+    conn.expects(:execute_without_switching)
+    conn.expects(:_switch_connection).never
+    assert conn._host_pool_current_database
+    conn.drop_database(:some_args)
+  end
 
   def test_underlying_assumption_about_test_db
     debug_me = false
@@ -104,10 +120,12 @@ class ActiveRecordHostPoolTest < Minitest::Test
     puts "\nOk, we started on #{first_db}" if debug_me
 
     switch_to_klass = case first_db
-      when "arhp_test_2"
-        Test1
-      when "arhp_test_1"
-        Test2
+    when 'arhp_test_2'
+      Test1
+    when 'arhp_test_1'
+      Test2
+    else
+      raise "Expected a database name, got #{first_db.inspect}"
     end
     expected_database = switch_to_klass.connection.instance_variable_get(:@database)
 
@@ -116,7 +134,7 @@ class ActiveRecordHostPoolTest < Minitest::Test
     puts "\nAnd now we're on #{current_database(switch_to_klass)}" if debug_me
 
     # get the current thread id so we can shoot ourselves in the head
-    thread_id = switch_to_klass.connection.select_value("select @@pseudo_thread_id")
+    thread_id = switch_to_klass.connection.select_value('select @@pseudo_thread_id')
 
     # now, disable our auto-switching and trigger a mysql reconnect
     switch_to_klass.connection.unproxied.stubs(:_switch_connection).returns(true)
@@ -129,12 +147,12 @@ class ActiveRecordHostPoolTest < Minitest::Test
 
   private
 
-  def action_should_use_correct_database(action, sql)
-    (1..4).each { |i|
+  def assert_action_uses_correct_database(action, sql)
+    (1..4).each do |i|
       klass = eval "Test#{i}"
       desired_db = "arhp_test_#{i}"
       klass.connection.send(action, sql)
       assert_equal desired_db, current_database(klass)
-    }
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record_host_pool
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Ben Osheroff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-27 00:00:00.000000000 Z
+date: 2017-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -64,14 +64,14 @@ dependencies:
     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: shoulda
   requirement: !ruby/object:Gem::Requirement
@@ -128,6 +128,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.48.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.48.0
 description: ''
 email:
 - ben@gimbo.net
@@ -168,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Allow ActiveRecord to share a connection to multiple databases on the same