makara 0.5.1 → 0.6.0.pre

data/spec/spec_helper.rb

@@ -19,6 +19,13 @@ if RUBY_VERSION >= "2.7.0"
   Warning[:deprecated] = true
 end
 
+# Delete once Timecop fixes Ruby 3.1 support
+Time.class_eval do
+  class << self
+    ruby2_keywords :new if Module.private_method_defined?(:ruby2_keywords)
+  end
+end
+
 RSpec.configure do |config|
   config.run_all_when_everything_filtered = true
   config.filter_run :focus

data/spec/strategies/priority_failover_spec.rb

@@ -2,9 +2,9 @@ require 'spec_helper'
 
 describe Makara::Strategies::PriorityFailover do
   let(:proxy){ FakeProxy.new({makara: pool_config.merge(makara_config).merge(connections: [])}) }
-  let(:pool){ Makara::Pool.new('master', proxy) }
+  let(:pool){ Makara::Pool.new('primary', proxy) }
   let(:pool_config){ {blacklist_duration: 5} }
-  let(:makara_config) { { master_strategy: 'failover' } }
+  let(:makara_config) { { primary_strategy: 'failover' } }
   let(:strategy) { pool.strategy }
 
   it 'should use the strategy' do

data/spec/strategies/shard_aware_spec.rb

@@ -12,12 +12,12 @@ describe Makara::Strategies::ShardAware do
 
   describe "failover strategy with shard awareness," do
     let(:proxy){ FakeProxy.new({makara: pool_config.merge(makara_config).merge(connections: [])}) }
-    let(:pool){ Makara::Pool.new('master', proxy) }
+    let(:pool){ Makara::Pool.new('primary', proxy) }
     let(:pool_config){ { blacklist_duration: 5} }
     let(:makara_config) { {
-        master_strategy: 'failover',
-        master_shard_aware: true,
-        master_default_shard: 'shard2'
+        primary_strategy: 'failover',
+        primary_shard_aware: true,
+        primary_default_shard: 'shard2'
       } }
     let(:strategy) { pool.strategy }
 
@@ -109,12 +109,12 @@ describe Makara::Strategies::ShardAware do
 
   describe "round_robin strategy with shard awareness," do
     let(:proxy){ FakeProxy.new({makara: pool_config.merge(makara_config).merge(connections: [])}) }
-    let(:pool){ Makara::Pool.new('master', proxy) }
+    let(:pool){ Makara::Pool.new('primary', proxy) }
     let(:pool_config){ { blacklist_duration: 5} }
     let(:makara_config) { {
-        master_strategy: 'round_robin',
-        master_shard_aware: true,
-        master_default_shard: 'shard2'
+        primary_strategy: 'round_robin',
+        primary_shard_aware: true,
+        primary_default_shard: 'shard2'
       } }
     let(:strategy) { pool.strategy }
 
@@ -186,12 +186,12 @@ describe Makara::Strategies::ShardAware do
 
   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(:pool){ Makara::Pool.new('master', proxy) }
+    let(:pool){ Makara::Pool.new('primary', proxy) }
     let(:pool_config){ { blacklist_duration: 5} }
     let(:makara_config) { {
-        master_strategy: 'failover',
-        master_shard_aware: false,
-        master_default_shard: 'shard2'
+        primary_strategy: 'failover',
+        primary_shard_aware: false,
+        primary_default_shard: 'shard2'
       } }
     let(:strategy) { pool.strategy }
 
@@ -202,12 +202,12 @@ describe Makara::Strategies::ShardAware do
 
   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(:pool){ Makara::Pool.new('master', proxy) }
+    let(:pool){ Makara::Pool.new('primary', proxy) }
     let(:pool_config){ { blacklist_duration: 5} }
     let(:makara_config) { {
-        master_strategy: 'round_robin',
-        master_shard_aware: false,
-        master_default_shard: 'shard2'
+        primary_strategy: 'round_robin',
+        primary_shard_aware: false,
+        primary_default_shard: 'shard2'
       } }
     let(:strategy) { pool.strategy }
 

data/spec/support/helpers.rb

@@ -3,20 +3,20 @@ module SpecHelpers
     connection = ActiveRecord::Base.establish_connection(config)
 
     # make sure these are all reset to not be blacklisted
-    ActiveRecord::Base.connection.slave_pool.connections.each(&:_makara_whitelist!)
-    ActiveRecord::Base.connection.master_pool.connections.each(&:_makara_whitelist!)
+    ActiveRecord::Base.connection.replica_pool.connections.each(&:_makara_whitelist!)
+    ActiveRecord::Base.connection.primary_pool.connections.each(&:_makara_whitelist!)
 
     ActiveRecord::Base.connection
   end
 
-  def config(masters = 1, slaves = 2)
+  def config(primaries = 1, replicas = 2)
     connections = []
-    masters.times{ connections << {role: 'master'} }
-    slaves.times{ connections << {role: 'slave'} }
+    primaries.times{ connections << {role: 'primary'} }
+    replicas.times{ connections << {role: 'replica'} }
     {
       makara: {
         # Defaults:
-        # :master_ttl => 5,
+        # :primary_ttl => 5,
         # :blacklist_duration => 30,
         # :sticky => true
         id: 'mock_mysql',

data/spec/support/mock_objects.rb

@@ -56,7 +56,7 @@ class FakeProxy < Makara::Proxy
     FakeConnection.new(config)
   end
 
-  def needs_master?(method_name, args)
+  def needs_primary?(method_name, args)
     return false if args.first =~ /^select/
 
     true

data/spec/support/mysql2_database.yml

@@ -11,8 +11,8 @@ test:
 
   makara:
     blacklist_duration: 2
-    master_ttl: 5
+    primary_ttl: 5
     connections:
-      - role: master
-      - role: slave
-      - role: slave
+      - role: primary
+      - role: replica
+      - role: replica

data/spec/support/mysql2_database_with_custom_errors.yml

@@ -11,11 +11,11 @@ test:
 
   makara:
     blacklist_duration: 2
-    master_ttl: 5
+    primary_ttl: 5
     connections:
-      - role: master
-      - role: slave
-      - role: slave
+      - role: primary
+      - role: replica
+      - role: replica
     connection_error_matchers:
       - !ruby/regexp '/^ActiveRecord::StatementInvalid: Mysql2::Error: Unknown command1:/'
       - "/^ActiveRecord::StatementInvalid: Mysql2::Error: Unknown command2:/i"

data/spec/support/postgis_database.yml

@@ -8,8 +8,8 @@ test:
 
   makara:
     blacklist_duration: 2
-    master_ttl: 5
+    primary_ttl: 5
     connections:
-      - role: master
-      - role: slave
-      - role: slave
+      - role: primary
+      - role: replica
+      - role: replica

data/spec/support/postgresql_database.yml

@@ -6,8 +6,8 @@ test:
 
   makara:
     blacklist_duration: 2
-    master_ttl: 5
+    primary_ttl: 5
     connections:
-      - role: master
-      - role: slave
-      - role: slave
+      - role: primary
+      - role: replica
+      - role: replica

data/spec/support/proxy_extensions.rb

@@ -1,8 +1,8 @@
 module ProxyExtensions
-  attr_reader :master_pool, :slave_pool, :id
+  attr_reader :primary_pool, :replica_pool, :id
 
-  def master_for?(sql)
-    pool_for(sql) == master_pool
+  def primary_for?(sql)
+    pool_for(sql) == primary_pool
   end
 
   def would_stick?(sql)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: makara
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0.pre
 platform: ruby
 authors:
 - Mike Nelson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-04 00:00:00.000000000 Z
+date: 2021-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -268,11 +268,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: Read-write split your DB yo