makara 0.3.8 → 0.5.0

data/gemfiles/ar-head.gemfile

@@ -13,3 +13,12 @@ gem 'mysql2', :platform => :ruby
 gem 'activerecord-jdbcmysql-adapter', :platform => :jruby
 gem 'pg', :platform => :ruby
 gem 'activerecord-jdbcpostgresql-adapter', :platform => :jruby
+
+
+rmajor, rminor, rpatch = RUBY_VERSION.split(/[^\d]/)[0..2].map(&:to_i)
+
+# 2.1 +
+if rmajor > 2 || (rmajor == 2 && rminor >= 1)
+  gem 'activerecord-postgis-adapter', :platform => :ruby
+  gem 'rgeo', :platform => :ruby
+end

data/gemfiles/ar30.gemfile

@@ -26,5 +26,11 @@ end
 if rmajor == 1 && (rminor == 8 || (rminor == 9 && rpatch < 3))
   gem 'pg', '0.17.1', :platform => :ruby
 else
-  gem 'pg', :platform => :ruby
+  gem 'pg', '0.21.0', :platform => :ruby
+end
+
+# 2.1 +
+if rmajor > 2 || (rmajor == 2 && rminor >= 1)
+  gem 'activerecord-postgis-adapter', :platform => :ruby
+  gem 'rgeo', :platform => :ruby
 end

data/gemfiles/ar31.gemfile

@@ -13,6 +13,7 @@ gem 'mysql2', '~> 0.3.10', :platform => :ruby
 gem 'activerecord-jdbcmysql-adapter', :platform => :jruby
 gem 'activerecord-jdbcpostgresql-adapter', :platform => :jruby
 
+
 rmajor, rminor, rpatch = RUBY_VERSION.split(/[^\d]/)[0..2].map(&:to_i)
 
 if rmajor == 1 && rminor == 8
@@ -25,5 +26,11 @@ end
 if rmajor == 1 && (rminor == 8 || (rminor == 9 && rpatch < 3))
   gem 'pg', '0.17.1', :platform => :ruby
 else
-  gem 'pg', :platform => :ruby
+  gem 'pg', '0.21.0', :platform => :ruby
+end
+
+# 2.1 +
+if rmajor > 2 || (rmajor == 2 && rminor >= 1)
+  gem 'activerecord-postgis-adapter', :platform => :ruby
+  gem 'rgeo', :platform => :ruby
 end

data/gemfiles/ar32.gemfile

@@ -13,6 +13,7 @@ gem 'mysql2', '~> 0.3.10', :platform => :ruby
 gem 'activerecord-jdbcmysql-adapter', :platform => :jruby
 gem 'activerecord-jdbcpostgresql-adapter', :platform => :jruby
 
+
 rmajor, rminor, rpatch = RUBY_VERSION.split(/[^\d]/)[0..2].map(&:to_i)
 
 if rmajor == 1 && rminor == 8
@@ -25,5 +26,11 @@ end
 if rmajor == 1 && (rminor == 8 || (rminor == 9 && rpatch < 3))
   gem 'pg', '0.17.1', :platform => :ruby
 else
-  gem 'pg', :platform => :ruby
+  gem 'pg', '0.21.0', :platform => :ruby
+end
+
+# 2.1 +
+if rmajor > 2 || (rmajor == 2 && rminor >= 1)
+  gem 'activerecord-postgis-adapter', :platform => :ruby
+  gem 'rgeo', :platform => :ruby
 end

data/gemfiles/ar40.gemfile

@@ -11,5 +11,14 @@ gem 'rack', '1.6.0'
 gem 'timecop'
 gem 'mysql2', '~> 0.3.10', :platform => :ruby
 gem 'activerecord-jdbcmysql-adapter', :platform => :jruby
-gem 'pg', :platform => :ruby
+gem 'pg', '0.21.0', :platform => :ruby
 gem 'activerecord-jdbcpostgresql-adapter', :platform => :jruby
+
+
+rmajor, rminor, rpatch = RUBY_VERSION.split(/[^\d]/)[0..2].map(&:to_i)
+
+# 2.1 +
+if rmajor > 2 || (rmajor == 2 && rminor >= 1)
+  gem 'activerecord-postgis-adapter', :platform => :ruby
+  gem 'rgeo', :platform => :ruby
+end

data/gemfiles/ar41.gemfile

@@ -11,5 +11,14 @@ gem 'rack', '1.6.0'
 gem 'timecop'
 gem 'mysql2', '~> 0.3.10', :platform => :ruby
 gem 'activerecord-jdbcmysql-adapter', :platform => :jruby
-gem 'pg', :platform => :ruby
+gem 'pg', '0.21.0', :platform => :ruby
 gem 'activerecord-jdbcpostgresql-adapter', :platform => :jruby
+
+
+rmajor, rminor, rpatch = RUBY_VERSION.split(/[^\d]/)[0..2].map(&:to_i)
+
+# 2.1 +
+if rmajor > 2 || (rmajor == 2 && rminor >= 1)
+  gem 'activerecord-postgis-adapter', :platform => :ruby
+  gem 'rgeo', :platform => :ruby
+end

data/gemfiles/ar42.gemfile

@@ -11,5 +11,14 @@ gem 'rack', '1.6.0'
 gem 'timecop'
 gem 'mysql2', '~> 0.3.10', :platform => :ruby
 gem 'activerecord-jdbcmysql-adapter', :platform => :jruby
-gem 'pg', :platform => :ruby
+gem 'pg', '0.21.0', :platform => :ruby
 gem 'activerecord-jdbcpostgresql-adapter', :platform => :jruby
+
+
+rmajor, rminor, rpatch = RUBY_VERSION.split(/[^\d]/)[0..2].map(&:to_i)
+
+# 2.1 +
+if rmajor > 2 || (rmajor == 2 && rminor >= 1)
+  gem 'activerecord-postgis-adapter', :platform => :ruby
+  gem 'rgeo', :platform => :ruby
+end

data/gemfiles/ar50.gemfile

@@ -9,7 +9,16 @@ gem 'activerecord', '~> 5.0.0'
 gem 'rspec'
 gem 'rack'
 gem 'timecop'
-gem 'mysql2', :platform => :ruby
+gem 'mysql2', '~> 0.4.10', :platform => :ruby
 gem 'activerecord-jdbcmysql-adapter', :platform => :jruby
-gem 'pg', :platform => :ruby
+gem 'pg', '0.21.0', :platform => :ruby
 gem 'activerecord-jdbcpostgresql-adapter', :platform => :jruby
+
+
+rmajor, rminor, rpatch = RUBY_VERSION.split(/[^\d]/)[0..2].map(&:to_i)
+
+# 2.1 +
+if rmajor > 2 || (rmajor == 2 && rminor >= 1)
+  gem 'activerecord-postgis-adapter', :platform => :ruby
+  gem 'rgeo', :platform => :ruby
+end

data/gemfiles/ar51.gemfile

@@ -9,7 +9,16 @@ gem 'activerecord', '~> 5.1.0'
 gem 'rspec'
 gem 'rack'
 gem 'timecop'
-gem 'mysql2', :platform => :ruby
+gem 'mysql2', '~> 0.4.10', :platform => :ruby
 gem 'activerecord-jdbcmysql-adapter', :platform => :jruby
-gem 'pg', :platform => :ruby
+gem 'pg', '0.21.0', :platform => :ruby
 gem 'activerecord-jdbcpostgresql-adapter', :platform => :jruby
+
+
+rmajor, rminor, rpatch = RUBY_VERSION.split(/[^\d]/)[0..2].map(&:to_i)
+
+# 2.1 +
+if rmajor > 2 || (rmajor == 2 && rminor >= 1)
+  gem 'activerecord-postgis-adapter', :platform => :ruby
+  gem 'rgeo', :platform => :ruby
+end

data/gemfiles/ar52.gemfile

@@ -0,0 +1,24 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in makara.gemspec
+gemspec :path => '../'
+
+
+gem 'rake'
+gem 'activerecord', '~> 5.2.0'
+gem 'rspec'
+gem 'rack'
+gem 'timecop'
+gem 'mysql2', '~> 0.4.10', :platform => :ruby
+gem 'activerecord-jdbcmysql-adapter', :platform => :jruby
+gem 'pg', '0.21.0', :platform => :ruby
+gem 'activerecord-jdbcpostgresql-adapter', :platform => :jruby
+
+
+rmajor, rminor, rpatch = RUBY_VERSION.split(/[^\d]/)[0..2].map(&:to_i)
+
+# 2.1 +
+if rmajor > 2 || (rmajor == 2 && rminor >= 1)
+  gem 'activerecord-postgis-adapter', :platform => :ruby
+  gem 'rgeo', :platform => :ruby
+end

data/gemfiles/ar60.gemfile

@@ -0,0 +1,24 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in makara.gemspec
+gemspec :path => '../'
+
+
+gem 'rake'
+gem 'activerecord', '~> 6.0.0'
+gem 'rspec'
+gem 'rack'
+gem 'timecop'
+gem 'mysql2', '~> 0.4.10', :platform => :ruby
+gem 'activerecord-jdbcmysql-adapter', :platform => :jruby
+gem 'pg', '0.21.0', :platform => :ruby
+gem 'activerecord-jdbcpostgresql-adapter', :platform => :jruby
+
+
+rmajor, rminor, rpatch = RUBY_VERSION.split(/[^\d]/)[0..2].map(&:to_i)
+
+# 2.1 +
+if rmajor > 2 || (rmajor == 2 && rminor >= 1)
+  gem 'activerecord-postgis-adapter', :platform => :ruby
+  gem 'rgeo', :platform => :ruby
+end

data/lib/active_record/connection_adapters/makara_abstract_adapter.rb

@@ -1,4 +1,5 @@
 require 'active_record'
+require 'makara'
 
 module ActiveRecord
   module ConnectionAdapters
@@ -105,11 +106,15 @@ module ActiveRecord
       end
 
 
-      hijack_method :execute, :select_rows, :exec_query, :transaction
+      hijack_method :execute, :exec_query, :exec_no_cache, :exec_cache, :transaction
       send_to_all :connect, :reconnect!, :verify!, :clear_cache!, :reset!
 
-      SQL_MASTER_MATCHERS           = [/\A\s*select.+for update\Z/i, /select.+lock in share mode\Z/i].map(&:freeze).freeze
-      SQL_SLAVE_MATCHERS            = [/\A\s*select\s/i].map(&:freeze).freeze
+      control_method :close, :steal!, :expire, :lease, :in_use?, :owner, :schema_cache, :pool=, :pool,
+         :schema_cache=, :lock, :seconds_idle, :==
+
+
+      SQL_MASTER_MATCHERS           = [/\A\s*select.+for update\Z/i, /select.+lock in share mode\Z/i, /\A\s*select.+(nextval|currval|lastval|get_lock|release_lock|pg_advisory_lock|pg_advisory_unlock)\(/i].map(&:freeze).freeze
+      SQL_SLAVE_MATCHERS            = [/\A\s*(select|with.+\)\s*select)\s/i].map(&:freeze).freeze
       SQL_ALL_MATCHERS              = [/\A\s*set\s/i].map(&:freeze).freeze
       SQL_SKIP_STICKINESS_MATCHERS  = [/\A\s*show\s([\w]+\s)?(field|table|database|schema|view|index)(es|s)?/i, /\A\s*(set|describe|explain|pragma)\s/i].map(&:freeze).freeze
 
@@ -136,6 +141,7 @@ module ActiveRecord
 
       def initialize(config)
         @error_handler = ::ActiveRecord::ConnectionAdapters::MakaraAbstractAdapter::ErrorHandler.new
+        @control = ActiveRecordPoolControl.new(self)
         super(config)
       end
 
@@ -205,7 +211,107 @@ module ActiveRecord
         raise NotImplementedError
       end
 
+      class ActiveRecordPoolControl
+        attr_reader :owner
+        alias :in_use? :owner
+
+        def initialize(proxy)
+          @proxy = proxy
+          @owner = nil
+          @pool = nil
+          @schema_cache = ActiveRecord::ConnectionAdapters::SchemaCache.new @proxy
+          @idle_since = Concurrent.monotonic_time
+          @adapter = ActiveRecord::ConnectionAdapters::AbstractAdapter.new(@proxy)
+        end
+
+        def close(*args)
+          @pool.checkin @proxy
+        end
+
+        # this method must only be called while holding connection pool's mutex
+        def lease(*args)
+          if in_use?
+            msg = +"Cannot lease connection, "
+            if @owner == Thread.current
+              msg << "it is already leased by the current thread."
+            else
+              msg << "it is already in use by a different thread: #{@owner}. " \
+                    "Current thread: #{Thread.current}."
+            end
+            raise ActiveRecordError, msg
+          end
+          @owner = Thread.current
+        end
+
+        # this method must only be called while holding connection pool's mutex
+        def expire(*args)
+          if in_use?
+            if @owner != Thread.current
+              raise ActiveRecordError, "Cannot expire connection, " \
+                "it is owned by a different thread: #{@owner}. " \
+                "Current thread: #{Thread.current}."
+            end
+
+            @idle_since = Concurrent.monotonic_time
+            @owner = nil
+          else
+            raise ActiveRecordError, "Cannot expire connection, it is not currently leased."
+          end
+        end
+
+        # Seconds since this connection was returned to the pool
+        def seconds_idle(*args)
+          return 0 if in_use?
+
+          Concurrent.monotonic_time - @idle_since
+        end
+
+        # this method must only be called while holding connection pool's mutex (and a desire for segfaults)
+        def steal!(*args)
+          if in_use?
+            if @owner != Thread.current
+              @pool.send :remove_connection_from_thread_cache, @proxy, @owner
+              @owner = Thread.current
+            end
+          else
+            raise ActiveRecordError, "Cannot steal connection, it is not currently leased."
+          end
+        end
+
+        def schema_cache(*args)
+          if @pool.respond_to?(:get_schema_cache) # AR6
+            @pool.get_schema_cache(@proxy)
+          else
+            @schema_cache
+          end
+        end
+
+        def schema_cache=(*args)
+          cache = args[0]
+          cache.connection = @proxy
+          if @pool.respond_to?(:set_schema_cache) # AR6
+            @pool.set_schema_cache(cache)
+          else
+            @schema_cache = cache
+          end
+        end
+
+        def lock(*args)
+          @adapter.lock
+        end
+
+        def pool=(*args)
+          @pool = args[0]
+        end
+
+        def pool(*args)
+          @pool
+        end
 
+        def ==(*args)
+          @proxy.object_id == args[0].object_id
+        end
+      end
     end
   end
 end

data/lib/active_record/connection_adapters/makara_postgis_adapter.rb

@@ -0,0 +1,41 @@
+require 'active_record/connection_adapters/makara_abstract_adapter'
+require 'active_record/connection_adapters/postgis_adapter'
+
+if ActiveRecord::VERSION::MAJOR >= 4
+
+  module ActiveRecord
+    module ConnectionHandling
+      def makara_postgis_connection(config)
+        ActiveRecord::ConnectionAdapters::MakaraPostgisAdapter.new(config)
+      end
+    end
+  end
+
+else
+
+  module ActiveRecord
+    class Base
+      def self.makara_postgis_connection(config)
+        ActiveRecord::ConnectionAdapters::MakaraPostgisAdapter.new(config)
+      end
+    end
+  end
+
+end
+
+
+module ActiveRecord
+  module ConnectionAdapters
+    class MakaraPostgisAdapter < ActiveRecord::ConnectionAdapters::MakaraAbstractAdapter
+      def self.visitor_for(*args)
+        ActiveRecord::ConnectionAdapters::PostGISAdapter.visitor_for(*args)
+      end
+
+      protected
+
+      def active_record_connection_for(config)
+        ::ActiveRecord::Base.postgis_connection(config)
+      end
+    end
+  end
+end

data/lib/makara.rb

@@ -1,3 +1,4 @@
+require 'active_support'
 require 'makara/version'
 require 'makara/railtie' if defined?(Rails)
 module Makara
@@ -6,16 +7,19 @@ module Makara
   autoload :ConfigParser,       'makara/config_parser'
   autoload :ConnectionWrapper,  'makara/connection_wrapper'
   autoload :Context,            'makara/context'
+  autoload :Cookie,             'makara/cookie'
   autoload :ErrorHandler,       'makara/error_handler'
   autoload :Middleware,         'makara/middleware'
   autoload :Pool,               'makara/pool'
   autoload :Proxy,              'makara/proxy'
 
   module Errors
-    autoload :MakaraError,                'makara/errors/makara_error'
-    autoload :AllConnectionsBlacklisted,  'makara/errors/all_connections_blacklisted'
-    autoload :BlacklistConnection,        'makara/errors/blacklist_connection'
-    autoload :NoConnectionsAvailable,     'makara/errors/no_connections_available'
+    autoload :MakaraError,                   'makara/errors/makara_error'
+    autoload :AllConnectionsBlacklisted,     'makara/errors/all_connections_blacklisted'
+    autoload :BlacklistConnection,           'makara/errors/blacklist_connection'
+    autoload :NoConnectionsAvailable,        'makara/errors/no_connections_available'
+    autoload :BlacklistedWhileInTransaction, 'makara/errors/blacklisted_while_in_transaction'
+    autoload :InvalidShard,                  'makara/errors/invalid_shard'
   end
 
   module Logging
@@ -27,6 +31,13 @@ module Makara
     autoload :Abstract,         'makara/strategies/abstract'
     autoload :RoundRobin,       'makara/strategies/round_robin'
     autoload :PriorityFailover, 'makara/strategies/priority_failover'
+    autoload :ShardAware,       'makara/strategies/shard_aware'
   end
 
 end
+
+ActiveSupport.on_load(:active_record) do
+  ActiveRecord::LogSubscriber.log_subscribers.each do |subscriber|
+    subscriber.extend ::Makara::Logging::Subscriber
+  end
+end

data/lib/makara/cache.rb

@@ -1,53 +1,17 @@
-require 'active_support/core_ext/object/try'
-
-# The Makara Cache should have access to your centralized cache store.
-# It serves the purpose of storing the Makara::Context across requests, servers, etc.
-
 module Makara
   module Cache
 
-    autoload :MemoryStore, 'makara/cache/memory_store'
-    autoload :NoopStore,   'makara/cache/noop_store'
-
     class << self
 
       def store=(store)
-        @store = store
+        Makara::Logging::Logger.log deprecation_warning, :warn
       end
 
-      def read(key)
-        store.try(:read, key)
-      end
+      private
 
-      def write(key, value, ttl)
-        store.try(:write, key, value, :expires_in => ttl.to_i)
+      def deprecation_warning
+        "Makara's context is no longer persisted in a backend cache, a cookie store is used by default.\nSetting the Makara::Cache.store won't have any effects."
       end
-
-      protected
-
-      def store
-        case @store
-        when :noop, :null
-          @store = Makara::Cache::NoopStore.new
-        when :memory
-          @store = Makara::Cache::MemoryStore.new
-        else
-          if defined?(Rails)
-
-            # in AR3 RAILS_CACHE may not be loaded if the full env is not present
-            # Rails.cache will throw an error because of it.
-            if ActiveRecord::VERSION::MAJOR < 4
-              @store ||= Rails.cache if defined?(RAILS_CACHE)
-            else
-              @store ||= Rails.cache if defined?(Rails)
-            end
-          end
-        end
-
-        @store
-      end
-
     end
-
   end
 end