makara 0.5.0 → 0.5.1

data/lib/makara/errors/blacklist_connection.rb

@@ -1,14 +1,12 @@
 module Makara
   module Errors
     class BlacklistConnection < MakaraError
-
       attr_reader :original_error
 
       def initialize(connection, error)
         @original_error = error
         super "[Makara/#{connection._makara_name}] #{error.message}"
       end
-
     end
   end
 end

data/lib/makara/errors/blacklisted_while_in_transaction.rb

@@ -1,14 +1,12 @@
 module Makara
   module Errors
     class BlacklistedWhileInTransaction < MakaraError
-
       attr_reader :role
 
       def initialize(role)
         @role = role
         super "[Makara] Blacklisted while in transaction in the #{role} pool"
       end
-
     end
   end
 end

data/lib/makara/errors/invalid_shard.rb

@@ -1,7 +1,6 @@
 module Makara
   module Errors
     class InvalidShard < MakaraError
-
       attr_reader :role
       attr_reader :shard_id
 
@@ -10,7 +9,6 @@ module Makara
         @shard_id = shard_id
         super "[Makara] Invalid shard_id #{shard_id} for the #{role} pool"
       end
-
     end
   end
-end
+end

data/lib/makara/errors/makara_error.rb

@@ -1,7 +1,6 @@
 module Makara
   module Errors
     class MakaraError < ::ActiveRecord::ActiveRecordError
-
     end
   end
 end

data/lib/makara/errors/no_connections_available.rb

@@ -1,14 +1,12 @@
 module Makara
   module Errors
     class NoConnectionsAvailable < MakaraError
-
       attr_reader :role
 
       def initialize(role)
         @role = role
         super "[Makara] No connections are available in the #{role} pool"
       end
-
     end
   end
 end

data/lib/makara/logging/logger.rb

@@ -1,9 +1,7 @@
 module Makara
   module Logging
     class Logger
-
       class << self
-
         def log(msg, format = :error)
           logger.send(format, "[Makara] #{msg}") if logger
         end
@@ -15,9 +13,7 @@ module Makara
         def logger=(l)
           @logger = l
         end
-
       end
-
     end
   end
 end

data/lib/makara/logging/subscriber.rb

@@ -1,6 +1,5 @@
 module Makara
   module Logging
-
     module Subscriber
       IGNORE_PAYLOAD_NAMES = ["SCHEMA", "EXPLAIN"]
 
@@ -33,6 +32,5 @@ module Makara
         "[#{adapter._makara_name}]"
       end
     end
-
   end
 end

data/lib/makara/middleware.rb

@@ -3,7 +3,6 @@ require 'rack'
 # Persists the Makara::Context across requests ensuring the same master pool is used on subsequent requests.
 module Makara
   class Middleware
-
     def initialize(app, cookie_options = {})
       @app = app
       @cookie_options = cookie_options
@@ -11,6 +10,7 @@ module Makara
 
     def call(env)
       return @app.call(env) if ignore_request?(env)
+
       set_current_context(env)
 
       status, headers, body = @app.call(env)
@@ -19,7 +19,6 @@ module Makara
       [status, headers, body]
     end
 
-
     protected
 
     def set_current_context(env)

data/lib/makara/pool.rb

@@ -6,7 +6,6 @@ require 'makara/strategies/shard_aware'
 
 module Makara
   class Pool
-
     # there are cases when we understand the pool is busted and we essentially want to skip
     # all execution
     attr_accessor :disabled
@@ -32,7 +31,6 @@ module Makara
       end
     end
 
-
     def completely_blacklisted?
       @connections.each do |connection|
         return false unless connection._makara_blacklisted?
@@ -40,7 +38,6 @@ module Makara
       true
     end
 
-
     # Add a connection to this pool, wrapping the connection with a Makara::ConnectionWrapper
     def add(config)
       config[:name] ||= "#{@role}/#{@connections.length + 1}"
@@ -70,6 +67,7 @@ module Makara
 
       @connections.each do |con|
         next if con._makara_blacklisted?
+
         begin
           ret = @proxy.error_handler.handle(con) do
             if block
@@ -130,6 +128,7 @@ module Makara
         in_transaction = self.role == "master" && provided_connection._makara_in_transaction?
         provided_connection._makara_blacklist!
         raise Makara::Errors::BlacklistedWhileInTransaction.new(@role) if in_transaction
+
         attempt += 1
         if attempt < @connections.length
           retry
@@ -143,17 +142,13 @@ module Makara
       end
     end
 
-
-
     protected
 
-
     # have we connected to any of the underlying connections.
     def connection_made?
       @connections.any?(&:_makara_connected?)
     end
 
-
     # Get the next non-blacklisted connection. If the proxy is setup
     # to be sticky, provide back the current connection assuming it is
     # not blacklisted.

data/lib/makara/proxy.rb

@@ -11,7 +11,6 @@ require 'active_support/core_ext/string/inflections'
 
 module Makara
   class Proxy < ::SimpleDelegator
-
     METHOD_MISSING_SKIP = [ :byebug, :puts ]
 
     class_attribute :hijack_methods, :control_methods
@@ -24,19 +23,23 @@ module Makara
         self.hijack_methods |= method_names
 
         method_names.each do |method_name|
-          define_method method_name do |*args, &block|
+          define_method(method_name) do |*args, &block|
             appropriate_connection(method_name, args) do |con|
               con.send(method_name, *args, &block)
             end
           end
+
+          ruby2_keywords method_name if Module.private_method_defined?(:ruby2_keywords)
         end
       end
 
       def send_to_all(*method_names)
         method_names.each do |method_name|
-          define_method method_name do |*args|
-            send_to_all method_name, *args
+          define_method(method_name) do |*args|
+            send_to_all(method_name, *args)
           end
+
+          ruby2_keywords method_name if Module.private_method_defined?(:ruby2_keywords)
         end
       end
 
@@ -45,14 +48,15 @@ module Makara
         self.control_methods |= method_names
 
         method_names.each do |method_name|
-          define_method method_name do |*args, &block|
+          define_method(method_name) do |*args, &block|
             control&.send(method_name, *args, &block)
           end
+
+          ruby2_keywords method_name if Module.private_method_defined?(:ruby2_keywords)
         end
       end
     end
 
-
     attr_reader :error_handler
     attr_reader :sticky
     attr_reader :config_parser
@@ -118,27 +122,25 @@ module Makara
 
     def method_missing(m, *args, &block)
       if METHOD_MISSING_SKIP.include?(m)
-        return super(m, *args, &block)
+        return super
       end
 
       any_connection do |con|
-        if con.respond_to?(m)
-          con.public_send(m, *args, &block)
-        elsif con.respond_to?(m, true)
-          con.__send__(m, *args, &block)
+        if con.respond_to?(m, true)
+          con.send(m, *args, &block)
         else
-          super(m, *args, &block)
+          super
         end
       end
     end
 
-    class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
-      def respond_to#{RUBY_VERSION.to_s =~ /^1.8/ ? nil : '_missing'}?(m, include_private = false)
-        any_connection do |con|
-          con._makara_connection.respond_to?(m, true)
-        end
+    ruby2_keywords :method_missing if Module.private_method_defined?(:ruby2_keywords)
+
+    def respond_to_missing?(m, include_private = false)
+      any_connection do |con|
+        con._makara_connection.respond_to?(m, true)
       end
-    RUBY_EVAL
+    end
 
     def graceful_connection_for(config)
       fake_wrapper = Makara::ConnectionWrapper.new(self, nil, config)
@@ -159,15 +161,16 @@ module Makara
 
     protected
 
-
     def send_to_all(method_name, *args)
       # slave pool must run first to allow for slave-->master failover without running operations on master twice.
       handling_an_all_execution(method_name) do
-        @slave_pool.send_to_all method_name, *args
-        @master_pool.send_to_all method_name, *args
+        @slave_pool.send_to_all(method_name, *args)
+        @master_pool.send_to_all(method_name, *args)
       end
     end
 
+    ruby2_keywords :send_to_all if Module.private_method_defined?(:ruby2_keywords)
+
     def any_connection
       if @master_pool.disabled
         @slave_pool.provide do |con|
@@ -202,14 +205,11 @@ module Makara
       end
     end
 
-
     # master or slave
     def appropriate_pool(method_name, args)
-
       # for testing purposes
       pool = _appropriate_pool(method_name, args)
       yield pool
-
     rescue ::Makara::Errors::AllConnectionsBlacklisted, ::Makara::Errors::NoConnectionsAvailable => e
       if pool == @master_pool
         @master_pool.connections.each(&:_makara_whitelist!)
@@ -268,7 +268,6 @@ module Makara
       @hijacked = false
     end
 
-
     def stuck_to_master?
       sticky? && Makara::Context.stuck?(@id)
     end
@@ -316,16 +315,15 @@ module Makara
         # this means slave connections are good.
         return
       end
+
       @slave_pool.disabled = true
       yield
     ensure
       @slave_pool.disabled = false
     end
 
-
     def connection_for(config)
       Kernel.raise NotImplementedError
     end
-
   end
 end

data/lib/makara/railtie.rb

@@ -1,9 +1,7 @@
 module Makara
   class Railtie < ::Rails::Railtie
-
     initializer "makara.configure_rails_initialization" do |app|
       app.middleware.use Makara::Middleware
     end
-
   end
 end

data/lib/makara/strategies/abstract.rb

@@ -2,6 +2,7 @@ module Makara
   module Strategies
     class Abstract
       attr_reader :pool
+
       def initialize(pool)
         @pool = pool
         init

data/lib/makara/strategies/priority_failover.rb

@@ -27,6 +27,7 @@ module Makara
         @weighted_connections.each_with_index do |con, index|
           check = safe_value(index)
           next unless check
+
           @current_idx = index
           return check
         end
@@ -41,6 +42,7 @@ module Makara
         con = @weighted_connections[idx]
         return nil unless con
         return nil if con._makara_blacklisted?
+
         con
       end
     end

data/lib/makara/strategies/round_robin.rb

@@ -26,8 +26,8 @@ module Makara
         return safe_value(0, true) if single_one?
 
         idx = @current_idx
-        begin
 
+        begin
           idx = next_index(idx)
 
           # if we've looped all the way around, return our safe value
@@ -48,7 +48,6 @@ module Makara
         idx
       end
 
-
       # return the connection if it's not blacklisted
       # otherwise return nil
       # optionally, store the position and context we're returning
@@ -64,7 +63,6 @@ module Makara
         con
       end
 
-
       # stub in test mode to ensure consistency
       def should_shuffle?
         true

data/lib/makara/strategies/shard_aware.rb

@@ -3,7 +3,6 @@ require 'makara/errors/invalid_shard'
 module Makara
   module Strategies
     class ShardAware < ::Makara::Strategies::Abstract
-
       def init
         @shards = {}
         @default_shard = pool.default_shard
@@ -41,7 +40,6 @@ module Makara
       def shard_id
         Thread.current['makara_shard_id'] || pool.default_shard
       end
-
     end
   end
 end

data/lib/makara/version.rb

@@ -1,15 +1,13 @@
 module Makara
   module VERSION
-
     MAJOR = 0
     MINOR = 5
-    PATCH = 0
+    PATCH = 1
     PRE = nil
 
     def self.to_s
       [MAJOR, MINOR, PATCH, PRE].compact.join('.')
     end
-
   end unless defined?(::Makara::VERSION)
   ::Makara::VERSION
 end

data/makara.gemspec

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 require File.expand_path('../lib/makara/version', __FILE__)
 
 Gem::Specification.new do |gem|
@@ -6,11 +5,11 @@ Gem::Specification.new do |gem|
   gem.email         = ["mike@mikeonrails.com"]
   gem.description   = %q{Read-write split your DB yo}
   gem.summary       = %q{Read-write split your DB yo}
-  gem.homepage      = "https://github.com/taskrabbit/makara"
+  gem.homepage      = "https://github.com/instacart/makara"
   gem.licenses      = ['MIT']
   gem.metadata      = {
-                        "source_code_uri" => 'https://github.com/taskrabbit/makara'
-                      }
+    "source_code_uri" => 'https://github.com/instacart/makara'
+  }
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
@@ -19,5 +18,25 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Makara::VERSION
 
-  gem.add_dependency 'activerecord', '>= 3.0.0'
+  gem.required_ruby_version = ">= 2.5.0"
+
+  gem.add_dependency "activerecord", ">= 5.2.0"
+
+  gem.add_development_dependency "rack"
+  gem.add_development_dependency "rake", "~> 13.0"
+  gem.add_development_dependency "rspec", "~> 3.9"
+  gem.add_development_dependency "timecop"
+  gem.add_development_dependency "rubocop", "~> 1.9.1"
+
+  if RUBY_ENGINE == "jruby"
+    gem.add_development_dependency "activerecord-jdbcmysql-adapter"
+    gem.add_development_dependency "activerecord-jdbcpostgresql-adapter"
+    gem.add_development_dependency "ruby-debug"
+  else
+    gem.add_development_dependency "activerecord-postgis-adapter"
+    gem.add_development_dependency "pry-byebug"
+    gem.add_development_dependency "mysql2"
+    gem.add_development_dependency "pg"
+    gem.add_development_dependency "rgeo"
+  end
 end