makara 0.4.1 → 0.5.1

data/spec/active_record/connection_adapters/makara_mysql2_adapter_spec.rb

@@ -2,12 +2,10 @@ require 'spec_helper'
 require 'active_record/connection_adapters/mysql2_adapter'
 
 describe 'MakaraMysql2Adapter' do
-
-  let(:db_username){ ENV['TRAVIS'] ? 'travis' : 'root' }
-
   let(:config){
-    base = YAML.load_file(File.expand_path('spec/support/mysql2_database.yml'))['test']
-    base
+    file = File.expand_path('spec/support/mysql2_database.yml')
+    hash = YAML.load(ERB.new(File.read(file)).result)
+    hash['test']
   }
 
   let(:connection) { ActiveRecord::Base.connection }
@@ -18,7 +16,6 @@ describe 'MakaraMysql2Adapter' do
   end
 
   context "unconnected" do
-
     it 'should allow a connection to be established' do
       establish_connection(config)
       expect(ActiveRecord::Base.connection).to be_instance_of(ActiveRecord::ConnectionAdapters::MakaraMysql2Adapter)
@@ -56,7 +53,6 @@ describe 'MakaraMysql2Adapter' do
       expect{
         connection.execute('SET @t1 = 1')
       }.to raise_error(Makara::Errors::NoConnectionsAvailable)
-
     end
 
     context "unconnect afterwards" do
@@ -84,8 +80,7 @@ describe 'MakaraMysql2Adapter' do
         load(File.dirname(__FILE__) + '/../../support/schema.rb')
         change_context
 
-        allow(ActiveRecord::Base).to receive(:mysql2_connection) do |config|
-          config[:username] = db_username
+        allow(ActiveRecord::Base).to receive(:mysql2_connection) do
           original_method.call(config)
         end
 
@@ -102,18 +97,15 @@ describe 'MakaraMysql2Adapter' do
         ActiveRecord::Base.remove_connection
       end
     end
-
   end
 
   context 'with the connection established and schema loaded' do
-
     before do
       establish_connection(config)
       load(File.dirname(__FILE__) + '/../../support/schema.rb')
       change_context
     end
 
-
     it 'should have one master and two slaves' do
       expect(connection.master_pool.connection_count).to eq(1)
       expect(connection.slave_pool.connection_count).to eq(2)
@@ -159,17 +151,14 @@ describe 'MakaraMysql2Adapter' do
     end
 
     it 'should send exists? to slave' do
-      next if ActiveRecord::VERSION::MAJOR == 3 && ActiveRecord::VERSION::MINOR == 0 # query doesn't work?
-
       allow_any_instance_of(Makara::Strategies::RoundRobin).to receive(:single_one?){ true }
       Test::User.exists? # flush other (schema) things that need to happen
-      
+
       con = connection.slave_pool.connections.first
-      if (ActiveRecord::VERSION::MAJOR == 5 && ActiveRecord::VERSION::MINOR <= 0)
-        expect(con).to receive(:execute).with(/SELECT\s+1\s*(AS one)?\s+FROM .?users.?\s+LIMIT\s+.?1/, any_args).once.and_call_original
-      else
-        expect(con).to receive(:exec_query).with(/SELECT\s+1\s*(AS one)?\s+FROM .?users.?\s+LIMIT\s+.?1/, any_args).once.and_call_original
-      end
+      expect(con).to receive(:exec_query) do |query|
+        expect(query).to match(/SELECT\s+1\s*(AS one)?\s+FROM .?users.?\s+LIMIT\s+.?1/)
+      end.once.and_call_original
+
       Test::User.exists?
     end
 
@@ -198,7 +187,6 @@ describe 'MakaraMysql2Adapter' do
         }.to raise_error(Makara::Errors::AllConnectionsBlacklisted)
       end
     end
-
   end
 
   describe 'transaction support' do
@@ -256,5 +244,4 @@ describe 'MakaraMysql2Adapter' do
       it_behaves_like 'a transaction supporter'
     end
   end
-
 end

data/spec/active_record/connection_adapters/makara_postgis_adapter_spec.rb

@@ -1,16 +1,12 @@
 # RGeo doesn't play well with JRuby and to avoid complicated test setup
 # we're only testing ActiveRecord version ~> 4.2
-# also rgeo only works on 2.1+
 
-rmajor, rminor, rpatch = RUBY_VERSION.split(/[^\d]/)[0..2].map(&:to_i)
 require 'active_record'
 
 # TODO: test this in AR 5+ ?
-
 if RUBY_ENGINE == 'ruby' &&
     ActiveRecord::VERSION::MAJOR == 4 &&
-    ActiveRecord::VERSION::MINOR >= 2 &&
-    (rmajor > 2 || (rmajor == 2 && rminor >= 1))
+    ActiveRecord::VERSION::MINOR >= 2
 
   require 'spec_helper'
   require 'rgeo'
@@ -18,12 +14,8 @@ if RUBY_ENGINE == 'ruby' &&
   require 'active_record/connection_adapters/postgis_adapter'
 
   describe 'MakaraPostgisAdapter' do
-    let(:db_username){ ENV['TRAVIS'] ? 'postgres' : `whoami`.chomp }
-
     let(:config) do
-      base = YAML.load_file(File.expand_path('spec/support/postgis_database.yml'))['test']
-      base['username'] = db_username
-      base
+      YAML.load_file(File.expand_path('spec/support/postgis_database.yml'))['test']
     end
 
     let(:connection) { ActiveRecord::Base.connection }

data/spec/active_record/connection_adapters/makara_postgresql_adapter_spec.rb

@@ -1,14 +1,10 @@
 require 'spec_helper'
 require 'active_record/connection_adapters/postgresql_adapter'
+require 'active_record/errors'
 
 describe 'MakaraPostgreSQLAdapter' do
-
-  let(:db_username){ ENV['TRAVIS'] ? 'postgres' : `whoami`.chomp }
-
   let(:config) do
-    base = YAML.load_file(File.expand_path('spec/support/postgresql_database.yml'))['test']
-    base['username'] = db_username
-    base
+    YAML.load_file(File.expand_path('spec/support/postgresql_database.yml'))['test']
   end
 
   let(:connection) { ActiveRecord::Base.connection }
@@ -18,21 +14,18 @@ describe 'MakaraPostgreSQLAdapter' do
     change_context
   end
 
-
   it 'should allow a connection to be established' do
     establish_connection(config)
     expect(ActiveRecord::Base.connection).to be_instance_of(ActiveRecord::ConnectionAdapters::MakaraPostgreSQLAdapter)
   end
 
   context 'with the connection established and schema loaded' do
-
     before do
       establish_connection(config)
       load(File.dirname(__FILE__) + '/../../support/schema.rb')
       change_context
     end
 
-
     it 'should have one master and two slaves' do
       expect(connection.master_pool.connection_count).to eq(1)
       expect(connection.slave_pool.connection_count).to eq(2)
@@ -73,18 +66,15 @@ describe 'MakaraPostgreSQLAdapter' do
     end
 
     it 'should send exists? to slave' do
-      next if ActiveRecord::VERSION::MAJOR == 3 && ActiveRecord::VERSION::MINOR == 0 # query doesn't work?
-
       allow_any_instance_of(Makara::Strategies::RoundRobin).to receive(:single_one?){ true }
       Test::User.exists? # flush other (schema) things that need to happen
-      
+
       con = connection.slave_pool.connections.first
-      if (ActiveRecord::VERSION::MAJOR == 4 && ActiveRecord::VERSION::MINOR >= 2) ||
-         (ActiveRecord::VERSION::MAJOR == 5 && ActiveRecord::VERSION::MINOR <= 0)
-        expect(con).to receive(:exec_no_cache).with(/SELECT\s+1\s*(AS one)?\s+FROM .?users.?\s+LIMIT\s+.?1/, any_args).once.and_call_original
-      else
-        expect(con).to receive(:exec_query).with(/SELECT\s+1\s*(AS one)?\s+FROM .?users.?\s+LIMIT\s+.?1/, any_args).once.and_call_original
-      end
+
+      expect(con).to receive(:exec_query) do |query|
+        expect(query).to match(/SELECT\s+1\s*(AS one)?\s+FROM .?users.?\s+LIMIT\s+.?1/)
+      end.once.and_call_original
+
       Test::User.exists?
     end
 
@@ -191,4 +181,58 @@ describe 'MakaraPostgreSQLAdapter' do
       it_behaves_like 'a transaction supporter'
     end
   end
+
+  context 'with two activerecord connection pools' do
+    before :each do
+      class Model1 < ActiveRecord::Base
+      end
+
+      class Model2 < ActiveRecord::Base
+      end
+
+      Model1.establish_connection(config)
+      Model2.establish_connection(config)
+    end
+
+    it 'should not leak raw connection into activerecord pool' do
+      # checkout a connection from Model1 pool and remove from the pool
+      conn = Model1.connection_pool.checkout
+      Model1.connection_pool.remove(conn)
+
+      # assign the connection to Model2 pool
+      conn.pool=Model2.connection_pool
+
+      # now close the connection to return it back to the pool
+      conn.close
+
+      # checkout the connection and make sure it is still a makara proxy
+      expect(Model2.connection).to eq(conn)
+    end
+
+    it 'should be able to steal the connection from a different thread' do
+      conn = Model1.connection_pool.checkout
+      conn.steal!
+      expect(conn.owner).to eq(Thread.current)
+      # steal! is not thread safe. it should be done while holding connection pool's mutex
+      t = Thread.new { conn.steal! }
+      t.join
+      expect(conn.owner).to eq(t)
+    end
+
+    it 'should not be able to expire the connection from same thread' do
+      conn = Model2.connection_pool.checkout
+      # expire is not thread safe. it should be done while holding connection pool's mutex
+      expect {
+        t = Thread.new { conn.expire }
+        t.join
+      }.to raise_error(ActiveRecord::ActiveRecordError)
+    end
+
+    it 'should be able to checkin connection back into activerecord pool' do
+      conn = Model1.connection_pool.checkout
+      Model1.connection_pool.checkin(conn)
+      # checkout the connection again and make sure it is same connection
+      expect(Model1.connection).to eq(conn)
+    end
+  end
 end

data/spec/cache_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe Makara::Cache do
-
   it 'shows a warning' do
     expect(Makara::Logging::Logger).to receive(:log).with(/Setting the Makara::Cache\.store won't have any effects/, :warn)
     described_class.store = :noop

data/spec/config_parser_spec.rb

@@ -1,21 +1,20 @@
 require 'spec_helper'
 
 describe Makara::ConfigParser do
-
   let(:config){
     {
-      :top_level => 'value',
-      :makara => {
-        :connections => [
+      top_level: 'value',
+      makara: {
+        connections: [
           {
-            :role => 'master',
-            :name => 'themaster'
+            role: 'master',
+            name: 'themaster'
           },
           {
-            :name => 'slave1'
+            name: 'slave1'
           },
           {
-            :name => 'slave2'
+            name: 'slave2'
           }
         ]
       }
@@ -25,27 +24,27 @@ describe Makara::ConfigParser do
   context '::merge_and_resolve_default_url_config' do
     let(:config_without_url) do
       {
-        :master_ttl => 5,
-        :blacklist_duration => 30,
-        :sticky => true,
-        :adapter => 'mysql2_makara',
-        :encoding => 'utf8',
-        :host => 'localhost',
-        :database => 'db_name',
-        :username => 'db_username',
-        :password => 'db_password',
-        :port =>     3306
+        master_ttl: 5,
+        blacklist_duration: 30,
+        sticky: true,
+        adapter: 'mysql2_makara',
+        encoding: 'utf8',
+        host: 'localhost',
+        database: 'db_name',
+        username: 'db_username',
+        password: 'db_password',
+        port: 3306
       }
     end
 
     let(:config_with_url) do
       {
-        :master_ttl => 5,
-        :blacklist_duration => 30,
-        :sticky => true,
-        :adapter => 'mysql2_makara',
-        :encoding => 'utf8',
-        :url => 'mysql2://db_username:db_password@localhost:3306/db_name'
+        master_ttl: 5,
+        blacklist_duration: 30,
+        sticky: true,
+        adapter: 'mysql2_makara',
+        encoding: 'utf8',
+        url: 'mysql2://db_username:db_password@localhost:3306/db_name'
       }
     end
 
@@ -76,12 +75,11 @@ describe Makara::ConfigParser do
         ENV['DATABASE_URL'] = database_url
       end
     end
-
   end
 
   it 'should provide a default proxy id based on the recursively sorted config' do
     parsera = described_class.new(config)
-    parserb = described_class.new(config.merge(:other => 'value'))
+    parserb = described_class.new(config.merge(other: 'value'))
     parserc = described_class.new(config)
 
     expect(parsera.id).not_to eq(parserb.id)
@@ -113,27 +111,27 @@ describe Makara::ConfigParser do
       parser = described_class.new(config)
       expect(parser.master_configs).to eq([
         {
-          :name => 'themaster',
-          :top_level => 'value',
-          :sticky => true,
-          :blacklist_duration => 30,
-          :master_ttl => 5
+          name: 'themaster',
+          top_level: 'value',
+          sticky: true,
+          blacklist_duration: 30,
+          master_ttl: 5
         }
       ])
       expect(parser.slave_configs).to eq([
         {
-          :name => 'slave1',
-          :top_level => 'value',
-          :sticky => true,
-          :blacklist_duration => 30,
-          :master_ttl => 5
+          name: 'slave1',
+          top_level: 'value',
+          sticky: true,
+          blacklist_duration: 30,
+          master_ttl: 5
         },
         {
-          :name => 'slave2',
-          :top_level => 'value',
-          :sticky => true,
-          :blacklist_duration => 30,
-          :master_ttl => 5
+          name: 'slave2',
+          top_level: 'value',
+          sticky: true,
+          blacklist_duration: 30,
+          master_ttl: 5
         }
       ])
     end
@@ -146,27 +144,27 @@ describe Makara::ConfigParser do
       parser = described_class.new(config)
       expect(parser.master_configs).to eq([
         {
-          :name => 'themaster',
-          :top_level => 'value',
-          :sticky => true,
-          :blacklist_duration => 456,
-          :master_ttl => 5
+          name: 'themaster',
+          top_level: 'value',
+          sticky: true,
+          blacklist_duration: 456,
+          master_ttl: 5
         }
       ])
       expect(parser.slave_configs).to eq([
         {
-          :name => 'slave1',
-          :top_level => 'slave value',
-          :sticky => true,
-          :blacklist_duration => 123,
-          :master_ttl => 5
+          name: 'slave1',
+          top_level: 'slave value',
+          sticky: true,
+          blacklist_duration: 123,
+          master_ttl: 5
         },
         {
-          :name => 'slave2',
-          :top_level => 'value',
-          :sticky => true,
-          :blacklist_duration => 123,
-          :master_ttl => 5
+          name: 'slave2',
+          top_level: 'value',
+          sticky: true,
+          blacklist_duration: 123,
+          master_ttl: 5
         }
       ])
     end

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

@@ -53,20 +53,20 @@ describe Makara::Cookie do
       Makara::Cookie.store(context_data, headers)
 
       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).gmtime.rfc2822}; HttpOnly")
+      expect(headers['Set-Cookie']).to include("path=/; max-age=10; expires=#{(Time.now + 10).httpdate}; HttpOnly")
     end
 
     it 'expires the cookie if the next context is empty' do
       Makara::Cookie.store({}, headers)
 
-      expect(headers['Set-Cookie']).to eq("#{cookie_key}=; path=/; max-age=0; expires=#{Time.now.gmtime.rfc2822}; HttpOnly")
+      expect(headers['Set-Cookie']).to eq("#{cookie_key}=; path=/; max-age=0; expires=#{Time.now.httpdate}; HttpOnly")
     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).gmtime.rfc2822}; secure; HttpOnly")
+      expect(headers['Set-Cookie']).to include("path=/; max-age=10; expires=#{(Time.now + 10).httpdate}; secure; HttpOnly")
     end
   end
 end

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 }
 
@@ -49,7 +49,7 @@ describe Makara::Middleware do
 
     _, headers, body = middleware.call(env)
 
-    expect(headers['Set-Cookie']).to eq("#{key}=mock_mysql%3A#{(now + 5).to_f}; path=/; max-age=10; expires=#{(Time.now + 10).gmtime.rfc2822}; secure; HttpOnly")
+    expect(headers['Set-Cookie']).to eq("#{key}=mock_mysql%3A#{(now + 5).to_f}; path=/; max-age=10; expires=#{(Time.now + 10).httpdate}; secure; HttpOnly")
     expect(body).to eq('master/1')
   end
 end

data/spec/pool_spec.rb

@@ -1,10 +1,10 @@
 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
     expect(pool.connections).to be_empty
@@ -12,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")
@@ -28,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 }
 
@@ -40,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
 
@@ -51,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
@@ -71,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')
 
@@ -95,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
@@ -125,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 }
 
@@ -134,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'))
@@ -146,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 }
 
@@ -154,7 +144,28 @@ 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
+    wrapper_a = master_pool.add(pool_config){ FakeConnection.new(open_transactions: 1) }
+    master_pool.add(pool_config){ FakeConnection.new }
+    expect {
+      master_pool.provide do |connection|
+        if connection == wrapper_a
+          raise Makara::Errors::BlacklistConnection.new(wrapper_a, StandardError.new('failure'))
+        end
+      end
+    }.to raise_error(Makara::Errors::BlacklistedWhileInTransaction)
   end
 
+  it 'skips blacklisted connections in master pool when not in transaction' do
+    wrapper_a = master_pool.add(pool_config){ FakeConnection.new(open_transactions: 0) }
+    master_pool.add(pool_config){ FakeConnection.new }
+    master_pool.provide do |connection|
+      if connection == wrapper_a
+        raise Makara::Errors::BlacklistConnection.new(wrapper_a, StandardError.new('failure'))
+      end
+    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

@@ -1,3 +1,4 @@
+require 'uri'
 require 'active_record'
 require 'makara'
 require 'timecop'
@@ -5,7 +6,7 @@ require 'yaml'
 require 'rack'
 
 begin
-  require 'byebug'
+  require 'pry'
 rescue LoadError
 end
 
@@ -14,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