makara 0.5.0 → 0.5.1

data/spec/connection_wrapper_spec.rb

@@ -1,8 +1,7 @@
 require 'spec_helper'
 
 describe Makara::ConnectionWrapper do
-
-  let(:proxy){ FakeProxy.new({:makara => {:blacklist_duration => 5, :connections => [{:role => 'master'}, {:role => 'slave'}, {:role => 'slave'}]}}) }
+  let(:proxy){ FakeProxy.new({makara: {blacklist_duration: 5, connections: [{role: 'master'}, {role: 'slave'}, {role: 'slave'}]}}) }
   let(:connection){ subject._makara_connection }
 
   subject{ proxy.master_pool.connections.first }

data/spec/cookie_spec.rb

@@ -63,7 +63,7 @@ describe Makara::Cookie do
     end
 
     it 'allows custom cookie options to be provided' do
-      Makara::Cookie.store(context_data, headers, { :secure => true })
+      Makara::Cookie.store(context_data, headers, { secure: true })
 
       expect(headers['Set-Cookie']).to include("#{cookie_key}=mysql%3A#{(now + 5).to_f}%7Credis%3A#{(now + 5).to_f};")
       expect(headers['Set-Cookie']).to include("path=/; max-age=10; expires=#{(Time.now + 10).httpdate}; secure; HttpOnly")

data/spec/middleware_spec.rb

@@ -12,7 +12,7 @@ describe Makara::Middleware do
 
   let(:env){ {} }
   let(:proxy){ FakeProxy.new(config(1,2)) }
-  let(:middleware){ described_class.new(app, :secure => true) }
+  let(:middleware){ described_class.new(app, secure: true) }
 
   let(:key){ Makara::Cookie::IDENTIFIER }
 

data/spec/pool_spec.rb

@@ -1,10 +1,9 @@
 require 'spec_helper'
 
 describe Makara::Pool do
-
-  let(:proxy){ FakeProxy.new({:makara => pool_config.merge(:connections => [])}) }
+  let(:proxy){ FakeProxy.new({makara: pool_config.merge(connections: [])}) }
   let(:pool){ Makara::Pool.new('test', proxy) }
-  let(:pool_config){ {:blacklist_duration => 5} }
+  let(:pool_config){ {blacklist_duration: 5} }
   let(:master_pool){ Makara::Pool.new('master', proxy) }
 
   it 'should wrap connections with a ConnectionWrapper as theyre added to the pool' do
@@ -13,7 +12,7 @@ describe Makara::Pool do
     connection_a = FakeConnection.new(something: 'a')
 
     wrapper_a = pool.add(pool_config){ connection_a }
-    wrapper_b = pool.add(pool_config.merge(:weight => 2)){ FakeConnection.new }
+    wrapper_b = pool.add(pool_config.merge(weight: 2)){ FakeConnection.new }
 
     connections = pool.connections
     weighted_connections = pool.strategy.instance_variable_get("@weighted_connections")
@@ -29,7 +28,6 @@ describe Makara::Pool do
   end
 
   it 'should determine if its completely blacklisted' do
-
     pool.add(pool_config){ FakeConnection.new }
     pool.add(pool_config){ FakeConnection.new }
 
@@ -41,7 +39,6 @@ describe Makara::Pool do
   end
 
   it 'sends methods to all underlying objects if asked to' do
-
     a = FakeConnection.new
     b = FakeConnection.new
 
@@ -52,11 +49,9 @@ describe Makara::Pool do
     expect(b).to receive(:query).with('test').once
 
     pool.send_to_all :query, 'test'
-
   end
 
   it 'only sends methods to underlying objects which are not blacklisted' do
-
     a = FakeConnection.new
     b = FakeConnection.new
     c = FakeConnection.new
@@ -72,11 +67,9 @@ describe Makara::Pool do
     wrapper_c._makara_blacklist!
 
     pool.send_to_all :query, 'test'
-
   end
 
   it 'provides the next connection and blacklists' do
-
     connection_a = FakeConnection.new(something: 'a')
     connection_b = FakeConnection.new(something: 'b')
 
@@ -96,7 +89,6 @@ describe Makara::Pool do
       expect(wrapper_a._makara_blacklisted?).to eq(false)
       expect(wrapper_b._makara_blacklisted?).to eq(false)
     end
-
   end
 
   it 'provides the same connection if the context has not changed and the proxy is sticky' do
@@ -126,7 +118,6 @@ describe Makara::Pool do
   end
 
   it 'raises an error when all connections are blacklisted' do
-
     wrapper_a = pool.add(pool_config.dup){ FakeConnection.new }
     wrapper_b = pool.add(pool_config.dup){ FakeConnection.new }
 
@@ -135,7 +126,6 @@ describe Makara::Pool do
 
     allow(pool).to receive(:next).and_return(wrapper_a, wrapper_b, nil)
 
-
     begin
       pool.provide do |connection|
         raise Makara::Errors::BlacklistConnection.new(connection, StandardError.new('failure'))
@@ -147,7 +137,6 @@ describe Makara::Pool do
   end
 
   it 'skips blacklisted connections when choosing the next one' do
-
     pool.add(pool_config){ FakeConnection.new }
     pool.add(pool_config){ FakeConnection.new }
 
@@ -155,7 +144,6 @@ describe Makara::Pool do
     wrapper_b._makara_blacklist!
 
     10.times{ pool.provide{|connection| expect(connection).not_to eq(wrapper_b) } }
-
   end
 
   it 'should error out while blacklisted in transaction' do
@@ -180,5 +168,4 @@ describe Makara::Pool do
     end
     10.times{ master_pool.provide{|connection| expect(connection).not_to eq(wrapper_a) } }
   end
-
 end

data/spec/proxy_spec.rb

@@ -1,10 +1,8 @@
 require 'spec_helper'
 
 describe Makara::Proxy do
-
   let(:klass){ FakeProxy }
 
-
   it 'sets up a master and slave pool no matter the number of connections' do
     proxy = klass.new(config(0, 0))
     expect(proxy.master_pool).to be_a(Makara::Pool)
@@ -23,7 +21,6 @@ describe Makara::Proxy do
     expect(proxy.slave_pool).to be_a(Makara::Pool)
   end
 
-
   it 'instantiates N connections within each pool' do
     proxy = klass.new(config(1, 2))
 
@@ -89,7 +86,6 @@ describe Makara::Proxy do
     end
   end
 
-
   describe '#appropriate_pool' do
     let(:proxy) { klass.new(config(1,1)) }
 

data/spec/spec_helper.rb

@@ -6,7 +6,7 @@ require 'yaml'
 require 'rack'
 
 begin
-  require 'byebug'
+  require 'pry'
 rescue LoadError
 end
 
@@ -15,6 +15,10 @@ begin
 rescue LoadError
 end
 
+if RUBY_VERSION >= "2.7.0"
+  Warning[:deprecated] = true
+end
+
 RSpec.configure do |config|
   config.run_all_when_everything_filtered = true
   config.filter_run :focus

data/spec/strategies/priority_failover_spec.rb

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
 describe Makara::Strategies::PriorityFailover do
-  let(:proxy){ FakeProxy.new({:makara => pool_config.merge(makara_config).merge(:connections => [])}) }
+  let(:proxy){ FakeProxy.new({makara: pool_config.merge(makara_config).merge(connections: [])}) }
   let(:pool){ Makara::Pool.new('master', proxy) }
-  let(:pool_config){ {:blacklist_duration => 5} }
-  let(:makara_config) { { :master_strategy => 'failover' } }
+  let(:pool_config){ {blacklist_duration: 5} }
+  let(:makara_config) { { master_strategy: 'failover' } }
   let(:strategy) { pool.strategy }
 
   it 'should use the strategy' do
@@ -45,5 +45,4 @@ describe Makara::Strategies::PriorityFailover do
     expect(strategy.current.something).to eql('b')
     expect(strategy.next.something).to eql('b')
   end
-
 end

data/spec/strategies/round_robin_spec.rb

@@ -1,9 +1,9 @@
 require 'spec_helper'
 
 describe Makara::Strategies::RoundRobin do
-  let(:proxy){ FakeProxy.new({:makara => pool_config.merge(makara_config).merge(:connections => [])}) }
+  let(:proxy){ FakeProxy.new({makara: pool_config.merge(makara_config).merge(connections: [])}) }
   let(:pool){ Makara::Pool.new('test', proxy) }
-  let(:pool_config){ {:blacklist_duration => 5} }
+  let(:pool_config){ {blacklist_duration: 5} }
   let(:makara_config) { {} }
   let(:strategy) { pool.strategy }
 
@@ -14,7 +14,7 @@ describe Makara::Strategies::RoundRobin do
   end
 
   context 'bad config' do
-    let(:makara_config) { { :test_strategy => 'SomethingElse::Here' } }
+    let(:makara_config) { { test_strategy: 'SomethingElse::Here' } }
     it 'should raise name error' do
       expect {
         pool
@@ -23,13 +23,12 @@ describe Makara::Strategies::RoundRobin do
   end
 
   context 'given in config' do
-    let(:makara_config) { { :test_strategy => 'round_robin' } }
+    let(:makara_config) { { test_strategy: 'round_robin' } }
     it 'should use the strategy' do
       expect(pool.strategy).to be_instance_of(Makara::Strategies::RoundRobin)
     end
   end
 
-
   it 'should loop through with weights' do
     wrapper_a = pool.add(pool_config){ FakeConnection.new(something: 'a') }
     wrapper_b = pool.add(pool_config){ FakeConnection.new(something: 'b') }
@@ -61,7 +60,4 @@ describe Makara::Strategies::RoundRobin do
     expect(strategy.next.something).to eql('c')
     expect(strategy.next.something).to eql('b')
   end
-
-
-
 end

data/spec/strategies/shard_aware_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe Makara::Strategies::ShardAware do
-
   def with_shard(shard_id)
     begin
       Thread.current['makara_shard_id'] = shard_id
@@ -12,7 +11,7 @@ describe Makara::Strategies::ShardAware do
   end
 
   describe "failover strategy with shard awareness," do
-    let(:proxy){ FakeProxy.new({:makara => pool_config.merge(makara_config).merge(:connections => [])}) }
+    let(:proxy){ FakeProxy.new({makara: pool_config.merge(makara_config).merge(connections: [])}) }
     let(:pool){ Makara::Pool.new('master', proxy) }
     let(:pool_config){ { blacklist_duration: 5} }
     let(:makara_config) { {
@@ -109,7 +108,7 @@ describe Makara::Strategies::ShardAware do
   end
 
   describe "round_robin strategy with shard awareness," do
-    let(:proxy){ FakeProxy.new({:makara => pool_config.merge(makara_config).merge(:connections => [])}) }
+    let(:proxy){ FakeProxy.new({makara: pool_config.merge(makara_config).merge(connections: [])}) }
     let(:pool){ Makara::Pool.new('master', proxy) }
     let(:pool_config){ { blacklist_duration: 5} }
     let(:makara_config) { {
@@ -186,7 +185,7 @@ describe Makara::Strategies::ShardAware do
   end
 
   describe "uses the configured failover strategy when shard_aware set to false," do
-    let(:proxy){ FakeProxy.new({:makara => pool_config.merge(makara_config).merge(:connections => [])}) }
+    let(:proxy){ FakeProxy.new({makara: pool_config.merge(makara_config).merge(connections: [])}) }
     let(:pool){ Makara::Pool.new('master', proxy) }
     let(:pool_config){ { blacklist_duration: 5} }
     let(:makara_config) { {
@@ -202,7 +201,7 @@ describe Makara::Strategies::ShardAware do
   end
 
   describe "uses the configured roundrobin strategy when shard_aware set to false," do
-    let(:proxy){ FakeProxy.new({:makara => pool_config.merge(makara_config).merge(:connections => [])}) }
+    let(:proxy){ FakeProxy.new({makara: pool_config.merge(makara_config).merge(connections: [])}) }
     let(:pool){ Makara::Pool.new('master', proxy) }
     let(:pool_config){ { blacklist_duration: 5} }
     let(:makara_config) { {

data/spec/support/deep_dup.rb

@@ -9,4 +9,4 @@ unless Hash.respond_to?(:deep_dup)
       duplicate
     end
   end
-end
+end

data/spec/support/helpers.rb

@@ -11,16 +11,16 @@ module SpecHelpers
 
   def config(masters = 1, slaves = 2)
     connections = []
-    masters.times{ connections << {:role => 'master'} }
-    slaves.times{ connections << {:role => 'slave'} }
+    masters.times{ connections << {role: 'master'} }
+    slaves.times{ connections << {role: 'slave'} }
     {
-      :makara => {
+      makara: {
         # Defaults:
         # :master_ttl => 5,
         # :blacklist_duration => 30,
         # :sticky => true
-        :id => 'mock_mysql',
-        :connections => connections
+        id: 'mock_mysql',
+        connections: connections
       }
     }
   end

data/spec/support/mock_objects.rb

@@ -1,7 +1,6 @@
 require 'active_record/connection_adapters/makara_abstract_adapter'
 
 class FakeConnection < Struct.new(:config)
-
   def ping
     'ping!'
   end
@@ -32,7 +31,6 @@ class FakeConnection < Struct.new(:config)
 end
 
 class FakeDatabaseAdapter < Struct.new(:config)
-
   def execute(sql, name = nil)
     []
   end
@@ -48,11 +46,9 @@ class FakeDatabaseAdapter < Struct.new(:config)
   def active?
     true
   end
-
 end
 
 class FakeProxy < Makara::Proxy
-
   send_to_all :ping
   hijack_method :execute
 
@@ -62,6 +58,7 @@ class FakeProxy < Makara::Proxy
 
   def needs_master?(method_name, args)
     return false if args.first =~ /^select/
+
     true
   end
 end

data/spec/support/mysql2_database.yml

@@ -1,9 +1,9 @@
 test:
   adapter: 'mysql2_makara'
   database: 'makara_test'
-  username: 'root'
+  host: <%= ENV["MYSQL_HOST"] %>
+  username: root
   password: ''
-
   timeout: 5000
   connect_timeout: 1
   read_timeout: 1

data/spec/support/mysql2_database_with_custom_errors.yml

@@ -1,9 +1,9 @@
 test:
   adapter: 'mysql2_makara'
   database: 'makara_test'
-  username: 'root'
+  host: <%= ENV["MYSQL_HOST"] %>
+  username: root
   password: ''
-
   timeout: 5000
   connect_timeout: 1
   read_timeout: 1

data/spec/support/pool_extensions.rb

@@ -1,5 +1,4 @@
 module PoolExtensions
-
   def connections
     @connections
   end
@@ -7,8 +6,6 @@ module PoolExtensions
   def connection_count
     @connections.length
   end
-
 end
 
-
 Makara::Pool.send(:include, PoolExtensions)

data/spec/support/postgis_schema.rb

@@ -5,7 +5,7 @@ conn.execute "create extension if not exists postgis"
 if conn.table_exists? "towns"
   conn.execute("TRUNCATE TABLE towns")
 else
-  conn.create_table "towns", :force => true do |t|
+  conn.create_table "towns", force: true do |t|
     t.st_point "location"
   end
 end

data/spec/support/postgresql_database.yml

@@ -1,8 +1,6 @@
 test:
   adapter: 'postgresql_makara'
   database: 'makara_test'
-  username: 'root'
-  password: ''
 
   timeout: 5000
 

data/spec/support/proxy_extensions.rb

@@ -1,7 +1,6 @@
 module ProxyExtensions
-
   attr_reader :master_pool, :slave_pool, :id
-  
+
   def master_for?(sql)
     pool_for(sql) == master_pool
   end
@@ -27,7 +26,6 @@ module ProxyExtensions
   def sticky=(s)
     @sticky = s
   end
-
 end
 
 Makara::Proxy.send(:include, ProxyExtensions)

data/spec/support/schema.rb

@@ -4,6 +4,6 @@ if conn.table_exists? "users"
   conn.execute("TRUNCATE TABLE users")
 else
   conn.create_table "users" do |t|
-    t.string   "name"
+    t.string "name"
   end
 end

data/spec/support/user.rb

@@ -1,5 +1,4 @@
 module Test
   class User < ::ActiveRecord::Base
-
   end
-end
+end