active_record_host_pool 0.8.3 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c38ebceb4621733f8beab2187309bdd60bbf207
-  data.tar.gz: 3eb2efdc2264d85149ba5aec4e975e844a7b2344
+  metadata.gz: 845aaec086857a96f06d01811462e9470f325c12
+  data.tar.gz: 471aff8ae49c1d0e8b4954537b8f11c0b9bdfcef
 SHA512:
-  metadata.gz: 5a8dd74cc7cc9a89c220169d9f1999098bdb1a598e07be23a0aaa5fd2e510183e279c6533959fdad9099dabbda320e23dbc28a1a5ffece68547300eb40de1110
-  data.tar.gz: 64782949403041135a1cdcae145374cff83f6e347d825ef797e661535d30d857897076d1844b383fa44436d1407b908ee51bfc9fed636d9ee0ca04a6ebc173a6
+  metadata.gz: 38e24829caad45f4a924c1862dd6396056e1d52a2ac9336b16a48e48e001597c50fb9389d57df92cefbadab4789c61a618551207850c153ba6b6b3136186b1df
+  data.tar.gz: cc2a4d67f037f23219bf3b181c0a52629df43e7f31602c9abce2241e7b7c43d898f8eeb6001a4c60d3a667f16957287fd95e4ed57c5b8ce08eea0480bfcb238e

data/lib/active_record_host_pool.rb

@@ -5,4 +5,7 @@ require 'active_record/connection_adapters/abstract_adapter'
 require 'active_record_host_pool/connection_proxy'
 require 'active_record_host_pool/pool_proxy'
 require 'active_record_host_pool/connection_adapter_mixin'
+require 'active_record_host_pool/version'
 
+module ActiveRecordHostPool
+end

data/lib/active_record_host_pool/connection_adapter_mixin.rb

@@ -7,52 +7,41 @@ end
 
 module ActiveRecordHostPool
   module DatabaseSwitch
-    def self.included(base)
+    def self.prepended(base)
       base.class_eval do
         attr_accessor(:_host_pool_current_database)
-        alias_method_chain :execute, :switching
-        alias_method_chain :exec_stmt, :switching if private_instance_methods.map(&:to_sym).include?(:exec_stmt)
-        alias_method_chain :drop_database, :no_switching
-        alias_method_chain :create_database, :no_switching
-        alias_method_chain :disconnect!, :host_pooling
       end
     end
 
-    def execute_with_switching(*args)
+    def execute(*args)
       if _host_pool_current_database && ! @_no_switch
         _switch_connection
       end
-      execute_without_switching(*args)
+      super
     end
 
-    def exec_stmt_with_switching(sql, name, binds, &block)
-      if _host_pool_current_database && ! @_no_switch
-        _switch_connection
-      end
-      exec_stmt_without_switching(sql, name, binds, &block)
-    end
-
-    def drop_database_with_no_switching(*args)
+    def drop_database(*args)
       begin
         @_no_switch = true
-        drop_database_without_no_switching(*args)
+        super
       ensure
         @_no_switch = false
       end
     end
 
-    def create_database_with_no_switching(*args)
+    def create_database(*args)
       begin
         @_no_switch = true
-        create_database_without_no_switching(*args)
+        super
       ensure
         @_no_switch = false
       end
     end
 
-    def disconnect_with_host_pooling!
+    def disconnect!
       @_cached_current_database = nil
-      disconnect_without_host_pooling!
+      @_cached_connection_object_id = nil
+      super
     end
 
     private
@@ -62,6 +51,7 @@ module ActiveRecordHostPool
         log("select_db #{_host_pool_current_database}", "SQL") do
           clear_cache! if respond_to?(:clear_cache!)
           raw_connection.select_db(_host_pool_current_database)
+          @config[:database] = _host_pool_current_database if ActiveRecord::VERSION::MAJOR >= 5
         end
         @_cached_current_database = _host_pool_current_database
         @_cached_connection_object_id = @connection.object_id
@@ -78,18 +68,16 @@ end
 module ActiveRecord
   module ConnectionAdapters
     class ConnectionHandler
-      def establish_connection(name, spec)
+      def establish_connection(owner, spec)
         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]
+          @class_to_pool[owner] = @connection_pools[spec]
         else
-          @connection_pools[name] = ActiveRecordHostPool::PoolProxy.new(spec)
+          @connection_pools[owner] = ActiveRecordHostPool::PoolProxy.new(spec)
         end
       end
     end
@@ -98,5 +86,5 @@ end
 
 ["MysqlAdapter", "Mysql2Adapter"].each do |k|
   next unless ActiveRecord::ConnectionAdapters.const_defined?(k)
-  ActiveRecord::ConnectionAdapters.const_get(k).class_eval { include ActiveRecordHostPool::DatabaseSwitch }
+  ActiveRecord::ConnectionAdapters.const_get(k).class_eval { prepend ActiveRecordHostPool::DatabaseSwitch }
 end

data/lib/active_record_host_pool/pool_proxy.rb

@@ -15,7 +15,7 @@ module ActiveRecordHostPool
     def initialize(spec)
       super(spec)
       @spec = spec
-      @config = spec.config.with_indifferent_access
+      @config = spec.config
     end
 
     def __getobj__
@@ -24,7 +24,7 @@ module ActiveRecordHostPool
 
     def __setobj__(spec)
       @spec = spec
-      @config = spec.config.with_indifferent_access
+      @config = spec.config
       @_pool_key = nil
     end
 

data/lib/active_record_host_pool/version.rb

@@ -0,0 +1,3 @@
+module ActiveRecordHostPool
+  VERSION = "0.9.0"
+end

data/test/database.yml

@@ -1,39 +1,40 @@
+<% mysql = URI(ENV['MYSQL_URL'] || 'mysql://root@127.0.0.1:3306') %>
 test_host_1_db_1:
   adapter: mysql2
   encoding: utf8
   database: arhp_test_1
-  username: root
-  password:
-  host: 127.0.0.1
+  username: <%= mysql.user %>
+  password: <%= mysql.password %>
+  host: <%= mysql.host %>
   reconnect: true
 
 test_host_1_db_2:
   adapter: mysql2
   encoding: utf8
   database: arhp_test_2
-  username: root
-  password:
-  host: 127.0.0.1
+  username: <%= mysql.user %>
+  password: <%= mysql.password %>
+  host: <%= mysql.host %>
   reconnect: true
 
 test_host_2_db_3:
   adapter: mysql2
   encoding: utf8
   database: arhp_test_3
-  username: root
-  password:
-  host: 127.0.0.1
-  port: 3306
+  username: <%= mysql.user %>
+  password: <%= mysql.password %>
+  host: <%= mysql.host %>
+  port: <%= mysql.port %>
   reconnect: true
 
 test_host_2_db_4:
   adapter: mysql2
   encoding: utf8
   database: arhp_test_4
-  username: root
-  password:
-  host: 127.0.0.1
-  port: 3306
+  username: <%= mysql.user %>
+  password: <%= mysql.password %>
+  host: <%= mysql.host %>
+  port: <%= mysql.port %>
   reconnect: true
 
 test_host_2_db_5:
@@ -42,15 +43,15 @@ test_host_2_db_5:
   database: arhp_test_4
   username: travis
   password:
-  host: 127.0.0.1
-  port: 3306
+  host: <%= mysql.host %>
+  port: <%= mysql.port %>
   reconnect: true
 
 test_host_1_db_not_there:
   adapter: mysql2
   encoding: utf8
   database: arhp_test_no_create
-  username: root
-  password:
-  host: 127.0.0.1
+  username: <%= mysql.user %>
+  password: <%= mysql.password %>
+  host: <%= mysql.host %>
   reconnect: true

data/test/helper.rb

@@ -4,28 +4,25 @@ require 'minitest/autorun'
 require 'active_record_host_pool'
 require 'logger'
 require 'mocha/setup'
+require 'erb'
 
 RAILS_ENV = "test"
 
-ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/test.log")
+Minitest::Test = MiniTest::Unit::TestCase unless defined?(::Minitest::Test)
 
-config =  YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml'))
+ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/test.log")
 
-if ENV["BUNDLE_GEMFILE"] =~ /mysql2/
-  config.each do |k, v|
-    v['adapter'] = 'mysql2'
-  end
-end
+config_content = IO.read(File.dirname(__FILE__) + '/database.yml')
+config_content = ERB.new(config_content).result
+config =  YAML.load(config_content)
 
 ActiveRecord::Base.configurations = config
 
 module ARHPTestSetup
   private
   def arhp_create_databases
-    ActiveRecord::Base.configurations.each do |name, conf|
-      next if name =~ /not_there/
-      `echo "drop DATABASE IF EXISTS #{conf['database']}" | mysql --user=#{conf['username']}`
-      `echo "create DATABASE #{conf['database']}" | mysql --user=#{conf['username']}`
+    for_each_database do |name, conf|
+      run_mysql_command(conf, "CREATE DATABASE #{conf['database']}")
       ActiveRecord::Base.establish_connection(name.to_sym)
       ActiveRecord::Migration.verbose = false
       load(File.dirname(__FILE__) + "/schema.rb")
@@ -33,8 +30,8 @@ module ARHPTestSetup
   end
 
   def arhp_drop_databases
-    ActiveRecord::Base.configurations.each do |name, conf|
-      ActiveRecord::Base.connection.execute("DROP DATABASE if exists #{conf['database']}")
+    for_each_database do |name, conf|
+      run_mysql_command(conf, "DROP DATABASE IF EXISTS #{conf['database']}")
     end
   end
 
@@ -68,6 +65,28 @@ module ARHPTestSetup
     EOL
   end
 
+  def for_each_database
+    ActiveRecord::Base.configurations.each do |name, conf|
+      next if name =~ /not_there/
+      next if conf['username'] == 'travis'
+      yield(name, conf)
+    end
+  end
+
+  def run_mysql_command(conf, command)
+    @mysql_command ||= begin
+      commands = [
+        'mysql',
+        "--user=#{conf['username']}"
+      ]
+      commands << "--host=#{conf['host']}" if conf['host'].present?
+      commands << "--port=#{conf['port']}" if conf['port'].present?
+      commands << " --password=#{conf['password']} 2> /dev/null" if conf['password'].present?
+      commands.join(' ')
+    end
+    `echo "#{command}" | #{@mysql_command}`
+  end
+
   def current_database(klass)
     klass.connection.select_value("select DATABASE()")
   end

data/test/test_arhp.rb

@@ -1,12 +1,17 @@
 require File.expand_path('helper', File.dirname(__FILE__))
 
-class ActiveRecordHostPoolTest < MiniTest::Unit::TestCase
+class ActiveRecordHostPoolTest < Minitest::Test
   include ARHPTestSetup
   def setup
+    arhp_drop_databases
     arhp_create_databases
     arhp_create_models
   end
 
+  def teardown
+    arhp_drop_databases
+  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)
@@ -91,7 +96,7 @@ class ActiveRecordHostPoolTest < MiniTest::Unit::TestCase
     Test1.first
 
     # which is the "default" DB to connect to?
-    first_db = Test1.connection.unproxied.instance_variable_get("@connection_options")[3]
+    first_db = Test1.connection.unproxied.instance_variable_get(:@_cached_current_database)
     puts "\nOk, we started on #{first_db}" if debug_me
 
     switch_to_klass = case first_db
@@ -100,7 +105,7 @@ class ActiveRecordHostPoolTest < MiniTest::Unit::TestCase
       when "arhp_test_1"
         Test2
     end
-    expected_database = switch_to_klass.connection.instance_variable_get("@database")
+    expected_database = switch_to_klass.connection.instance_variable_get(:@database)
 
     # switch to the other database
     switch_to_klass.first
@@ -118,10 +123,6 @@ class ActiveRecordHostPoolTest < MiniTest::Unit::TestCase
     assert_equal expected_database, current_database(switch_to_klass)
   end
 
-  def teardown
-    arhp_drop_databases
-  end
-
   private
 
   def action_should_use_correct_database(action, sql)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record_host_pool
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.9.0
 platform: ruby
 authors:
 - Ben Osheroff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-11 00:00:00.000000000 Z
+date: 2016-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: wwtd
   requirement: !ruby/object:Gem::Requirement
@@ -53,6 +59,7 @@ files:
 - 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
+- lib/active_record_host_pool/version.rb
 - test/database.yml
 - test/helper.rb
 - test/schema.rb
@@ -77,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: Allow ActiveRecord to share a connection to multiple databases on the same