active_record_host_pool 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed2c6298e6e97323f95bf2ebdb3414c64943b129
-  data.tar.gz: a3ffbacc3eb9b673f6a34d2f5aa188f53b10a1c8
+  metadata.gz: 9e48bcf35e8ac749c0b576cc314f936e77d6cda0
+  data.tar.gz: b18961c4654d98d8a9ffce35ec472a535a6e237f
 SHA512:
-  metadata.gz: 5dc67a54dacb5c5f3d681b20edf988492d4a7ae6214d3c1263069a0ae467569daef7021b9a394679beddf831702ff9779ca8cf8ed51485c0a274fe61833f5483
-  data.tar.gz: 9987fbf49b040a43df296b26b754d124e903010f6dfcc300fbe6a78854aceffda6700eb2abaee8f4c8b4080aa91b9554901cce94811dd427451ca605eb66c825
+  metadata.gz: e18c73fa7ade1da87b4faeda2a76705c928a31706288a6264fd6a9d3315b4e889ea0a6cfbd9f37a856ae9422c8110fb638bb1794c5e6721b3cd7909bc2845668
+  data.tar.gz: febcbd225b0e79d8895ec23a223dc8c17dc06a241f7adc238dced5f0906ee77313f65878a2dc045dd98c1d8915675e561470611905c928d0fb27847b4bb6cd3e

data/lib/active_record_host_pool/pool_proxy.rb

@@ -104,7 +104,7 @@ module ActiveRecordHostPool
     end
 
     def _pool_key
-      @_pool_key ||= "#{@config[:host]}/#{@config[:port]}/#{@config[:socket]}/#{@config[:username]}"
+      @_pool_key ||= "#{@config[:host]}/#{@config[:port]}/#{@config[:socket]}/#{@config[:username]}/#{@config[:slave] && 'slave'}"
     end
 
     def _connection_pool(auto_create=true)

data/lib/active_record_host_pool/version.rb

@@ -1,3 +1,3 @@
 module ActiveRecordHostPool
-  VERSION = "0.9.1"
+  VERSION = "0.9.2"
 end

data/test/database.yml

@@ -8,6 +8,17 @@ test_host_1_db_1:
   host: <%= mysql.host %>
   reconnect: true
 
+# Mimic configurations as read by active_record_shards/ar_flexmaster
+test_host_1_db_1_slave:
+  adapter: mysql2
+  encoding: utf8
+  database: arhp_test_1_slave
+  username: <%= mysql.user %>
+  password: <%= mysql.password %>
+  host: <%= mysql.host %>
+  reconnect: true
+  slave: true
+
 test_host_1_db_2:
   adapter: mysql2
   encoding: utf8

data/test/helper.rb

@@ -4,7 +4,7 @@ require 'minitest/autorun'
 require 'active_record_host_pool'
 require 'logger'
 require 'mocha/setup'
-require 'erb'
+require 'phenix'
 
 RAILS_ENV = "test"
 
@@ -12,28 +12,12 @@ Minitest::Test = MiniTest::Unit::TestCase unless defined?(::Minitest::Test)
 
 ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/test.log")
 
-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
+Phenix.configure do |config|
+  config.skip_database = ->(name, conf) { name =~ /not_there/ || conf['username'] == 'travis' }
+end
 
 module ARHPTestSetup
   private
-  def arhp_create_databases
-    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")
-    end
-  end
-
-  def arhp_drop_databases
-    for_each_database do |name, conf|
-      run_mysql_command(conf, "DROP DATABASE IF EXISTS #{conf['database']}")
-    end
-  end
 
   def arhp_create_models
     return if Object.const_defined?("Test1")
@@ -43,6 +27,11 @@ module ARHPTestSetup
         establish_connection(:test_host_1_db_1)
       end
 
+      class Test1Slave < ActiveRecord::Base
+        self.table_name = "tests"
+        establish_connection(:test_host_1_db_1_slave)
+      end
+
       class Test2 < ActiveRecord::Base
         self.table_name =  "tests"
         establish_connection(:test_host_1_db_2)
@@ -65,28 +54,6 @@ 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,15 +1,14 @@
-require File.expand_path('helper', File.dirname(__FILE__))
+require_relative 'helper'
 
 class ActiveRecordHostPoolTest < Minitest::Test
   include ARHPTestSetup
   def setup
-    arhp_drop_databases
-    arhp_create_databases
+    Phenix.rise!
     arhp_create_models
   end
 
   def teardown
-    arhp_drop_databases
+    Phenix.burn!
   end
 
   def test_models_with_matching_hosts_should_share_a_connection
@@ -25,6 +24,10 @@ class ActiveRecordHostPoolTest < Minitest::Test
     assert(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)
+  end
+
   def test_should_select_on_correct_database
     action_should_use_correct_database(:select_all, "select 1")
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record_host_pool
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Ben Osheroff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-22 00:00:00.000000000 Z
+date: 2016-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -44,6 +44,90 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  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'
+- !ruby/object:Gem::Dependency
+  name: rake
+  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'
+- !ruby/object:Gem::Dependency
+  name: shoulda
+  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'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  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'
+- !ruby/object:Gem::Dependency
+  name: bump
+  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'
+- !ruby/object:Gem::Dependency
+  name: phenix
+  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
@@ -84,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Allow ActiveRecord to share a connection to multiple databases on the same