fresh_connection 2.3.2 → 2.4.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d6bb81775c1ffa074f52f58fad152f9d02d8498
-  data.tar.gz: 622671bc7d23b5a88f92eb8f4430b5b15014d917
+  metadata.gz: d80ccd0fbc035f407e1eecd01e328f47d9651f63
+  data.tar.gz: 6b23a6ca48aae178e84213f12f4358e833317446
 SHA512:
-  metadata.gz: 6a7de0aff8b2b35291005f1236bf5e6d87e4285a5d54b6619eebebf2a1edc5a83f750abfcc2795ee070edc7c97d4aec2796d5e5f3622d7293bdfab58ab829cdb
-  data.tar.gz: 3799709992b9fbd0cb4c8cac11db8db34601fec8333dbe41bd25c51eeddadec36f5153a9fc39aa5548e373e8175e938760e471d11bae77edb04aecb63d63891b
+  metadata.gz: 5875734234572158f582ffba4dcaf7d7fcbc1df4a22459154ae4eea49c90cc9f825b37c4c937d42255a6a96747fc79af92cd59515e52e9d768f035bf912df8df
+  data.tar.gz: fc97dc485d0dfcb4b35fd57ac9242b3c5213619fc3249f9d827485c5d471ba844a7ed66c6dc4d6311f5292ca69cbf7754d1e0ddefd2486a7ae01f2a7d5900ccb

data/.travis.yml

@@ -12,16 +12,13 @@ before_script:
   - psql -c 'create database fresh_connection_test_replica2;' -U postgres
 cache: bundler
 rvm:
-  - 2.1.10
-  - 2.2.6
-  - 2.3.3
-  - 2.4.0
+  - 2.2.7
+  - 2.3.4
+  - 2.4.1
 gemfile:
   - gemfiles/rails42.gemfile
   - gemfiles/rails50.gemfile
+  - gemfiles/rails51.gemfile
 matrix:
-  exclude:
-    - rvm: 2.1.10
-      gemfile: gemfiles/rails50.gemfile
   fast_finish: true
 bundler_args: --jobs 3 --retry 3

data/Appraisals

@@ -1,11 +1,20 @@
 appraise "rails42" do
   gem 'activerecord', '~> 4.2.0'
   gem 'activesupport', '~> 4.2.0'
-  gem 'mysql2', '~> 0.3.13'
+  gem 'mysql2', '>= 0.3.13', '< 0.5'
+  gem 'pg', '~> 0.15'
 end
 
 appraise "rails50" do
   gem 'activerecord', '~> 5.0.0'
   gem 'activesupport', '~> 5.0.0'
   gem 'mysql2', '>= 0.3.18', '< 0.5'
+  gem 'pg', '~> 0.18'
+end
+
+appraise "rails51" do
+  gem 'activerecord', '~> 5.1.0'
+  gem 'activesupport', '~> 5.1.0'
+  gem 'mysql2', '>= 0.3.18', '< 0.5'
+  gem 'pg', '~> 0.18'
 end

data/Rakefile

@@ -4,13 +4,11 @@ require 'rake/testtask'
 desc 'Run mysql2 and postgresql tests'
 task :test do
   Rake::Task["test:mysql2"].invoke
-  Rake::Task["test:mysql2_url"].invoke
   Rake::Task["test:postgresql"].invoke
-  Rake::Task["test:postgresql_url"].invoke
 end
 
 namespace :test do
-  %w(mysql2 postgresql mysql2_url postgresql_url).each do |test_name|
+  %w(mysql2 postgresql).each do |test_name|
     Rake::TestTask.new(test_name) do |t|
       t.libs << "test"
       t.libs << "lib"

data/fresh_connection.gemspec

@@ -19,10 +19,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = '>= 2.1'
+  spec.required_ruby_version = '>= 2.2'
 
-  spec.add_dependency 'activerecord', '>= 4.2.0', '< 5.1'
-  spec.add_dependency 'activesupport', '>= 4.2.0', '< 5.1'
+  spec.add_dependency 'activerecord', '>= 4.2.0', '< 5.2'
+  spec.add_dependency 'activesupport', '>= 4.2.0', '< 5.2'
   spec.add_dependency 'concurrent-ruby', '~> 1.0.0'
 
   spec.add_development_dependency 'mysql2', '>= 0.3.13', '< 0.5'

data/gemfiles/rails42.gemfile

@@ -4,6 +4,7 @@ source "https://rubygems.org"
 
 gem "activerecord", "~> 4.2.0"
 gem "activesupport", "~> 4.2.0"
-gem "mysql2", "~> 0.3.13"
+gem "mysql2", ">= 0.3.13", "< 0.5"
+gem "pg", "~> 0.15"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails50.gemfile

@@ -5,5 +5,6 @@ source "https://rubygems.org"
 gem "activerecord", "~> 5.0.0"
 gem "activesupport", "~> 5.0.0"
 gem "mysql2", ">= 0.3.18", "< 0.5"
+gem "pg", "~> 0.18"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails51.gemfile

@@ -0,0 +1,10 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 5.1.0"
+gem "activesupport", "~> 5.1.0"
+gem "mysql2", ">= 0.3.18", "< 0.5"
+gem "pg", "~> 0.18"
+
+gemspec path: "../"

data/lib/fresh_connection/abstract_connection_manager.rb

@@ -1,4 +1,5 @@
 require 'active_support/deprecation'
+require 'fresh_connection/deprecation'
 
 module FreshConnection
   class AbstractConnectionManager
@@ -12,37 +13,37 @@ module FreshConnection
       end
     end
 
-    attr_reader :replica_group
+    attr_reader :spec_name
 
-    def initialize(replica_group = "replica")
-      replica_group = "replica" if replica_group.to_s == "slave"
-      @replica_group = replica_group.to_s
-      @replica_group = "replica" if @replica_group.empty?
+    def initialize(spec_name = nil)
+      @spec_name = (spec_name || "replica").to_s
     end
 
-    def slave_group
-      ActiveSupport::Deprecation.warn(
-        "'slave_group' is deprecated and will removed from version 2.4.0. use 'replica_group' instead."
-      )
-
-      replica_group
+    def replica_connection
+      raise NotImplementedError
     end
 
-    def replica_connection
+    def put_aside!
+      raise NotImplementedError
     end
-    undef_method :replica_connection
 
     def clear_all_connections!
+      raise NotImplementedError
     end
-    undef_method :clear_all_connections!
 
-    def put_aside!
+    def recovery?
+      raise NotImplementedError
     end
-    undef_method :put_aside!
 
-    def recovery?
+    def replica_group
+      FreshConnection::Deprecation.warn(replica_group: :spec_name)
+      spec_name
+    end
+
+    def slave_group
+      FreshConnection::Deprecation.warn(slave_group: :spec_name)
+      spec_name
     end
-    undef_method :recovery?
   end
 end
 

data/lib/fresh_connection/access_control.rb

@@ -22,7 +22,12 @@ module FreshConnection
         return @catch_exceptions if defined?(@catch_exceptions)
         @catch_exceptions = [ActiveRecord::StatementInvalid]
         @catch_exceptions << ::Mysql2::Error if defined?(::Mysql2)
-        @catch_exceptions += [::PG::Error, ::PGError] if defined?(::PG)
+
+        if defined?(::PG)
+          @catch_exceptions << ::PG::Error
+          @catch_exceptions << ::PGError if defined?(::PGError)
+        end
+
         @catch_exceptions
       end
 

data/lib/fresh_connection/connection_factory.rb

@@ -1,73 +1,24 @@
 require 'active_support/deprecation'
-require 'active_support/core_ext/hash/keys'
-require 'active_support/hash_with_indifferent_access'
-require 'active_support/core_ext/hash/indifferent_access'
+require 'fresh_connection/connection_specification'
 
 module FreshConnection
   class ConnectionFactory
     def initialize(group, modify_spec = nil)
-      @group = group.to_sym
-      @modify_spec = modify_spec || {}.with_indifferent_access
-      @spec = nil
+      deprecation_warn
+      @spec = FreshConnection::ConnectionSpecification.new(group, modify_spec: modify_spec)
     end
 
     def new_connection
-      ActiveRecord::Base.__send__(adapter_method, spec)
+      deprecation_warn
+      ActiveRecord::Base.__send__(@spec.adapter_method, @spec.confg)
     end
 
     private
 
-    def adapter_method
-      @adapter_method ||= ar_spec.adapter_method
-    end
-
-    def spec
-      @spec ||= build_spec
-    end
-
-    # when building a spec from envars, there may be no database.yml file, so
-    # be careful to avoid implicit dependency on it or derived contents.
-
-    def build_spec
-      url = database_group_url(@group.to_s)
-      if url
-        build_group_spec_from_url(url)
-      else
-        build_spec_from_config
-      end
-    end
-
-    def database_group_url(group)
-      ENV['DATABASE_' + group.upcase + '_URL']
-    end
-
-    def build_group_spec_from_url(url)
-      config = ar_spec.config.with_indifferent_access
-      spec = build_spec_from_url(url)
-      group_config = (config[@group] ||= {}.with_indifferent_access)
-      config.merge(group_config).merge(spec).merge(@modify_spec)
-    end
-
-    def build_spec_from_url(url)
-      ActiveRecord::ConnectionAdapters::ConnectionSpecification::ConnectionUrlResolver.new(url).to_hash
-    end
-
-    def build_spec_from_config
-      config = ar_spec.config.with_indifferent_access
-      group_config = config[@group] || {}.with_indifferent_access
-
-      if group_config.size == 0 && @group == :replica && config.key?(:slave)
-        # provide backward-compatibility with :slave profile
-        ActiveSupport::Deprecation.warn(
-          "'slave' in database.yml is deprecated and will ignored from version 2.4.0. use 'replica' instead."
-        )
-        group_config = (config[:slave] || {}).with_indifferent_access
-      end
-      config.merge(group_config).merge(@modify_spec)
-    end
-
-    def ar_spec
-      ActiveRecord::Base.connection_pool.spec
+    def deprecation_warn
+      ActiveSupport::Deprecation.warn(
+        "`FreshConnection::ConnectionFactory` class is deprecated and will removed from version 2.5.0."
+      )
     end
   end
 end

data/lib/fresh_connection/connection_manager.rb

@@ -1,31 +1,32 @@
-require 'concurrent'
 require 'fresh_connection/abstract_connection_manager'
-require 'fresh_connection/connection_factory'
+require 'fresh_connection/connection_specification'
 
 module FreshConnection
   class ConnectionManager < AbstractConnectionManager
     def initialize(*args)
       super
-      @connections = Concurrent::Map.new
+
+      spec = FreshConnection::ConnectionSpecification.new(spec_name).spec
+      @pool = ActiveRecord::ConnectionAdapters::ConnectionPool.new(spec)
     end
 
     def replica_connection
-      @connections.fetch_or_store(current_thread_id) do |_|
-        connection_factory.new_connection
-      end
+      @pool.connection
     end
 
     def put_aside!
-      conn = @connections.delete(current_thread_id)
-      return unless conn
-      conn && conn.disconnect! rescue nil
+      return unless @pool.active_connection?
+
+      conn = replica_connection
+      return if conn.transaction_open?
+
+      @pool.release_connection
+      @pool.remove(conn)
+      conn.disconnect!
     end
 
     def clear_all_connections!
-      @connections.each_value do |conn|
-        conn.disconnect! rescue nil
-      end
-      @connections.clear
+      @pool.disconnect!
     end
 
     def recovery?
@@ -33,15 +34,5 @@ module FreshConnection
       put_aside!
       true
     end
-
-    private
-
-    def connection_factory
-      @connection_factory ||= ConnectionFactory.new(@replica_group)
-    end
-
-    def current_thread_id
-      Thread.current.object_id
-    end
   end
 end

data/lib/fresh_connection/connection_specification.rb

@@ -0,0 +1,64 @@
+require 'active_support'
+require 'active_support/core_ext'
+
+module FreshConnection
+  class ConnectionSpecification
+    def initialize(spec_name, modify_spec: nil)
+      @spec_name = spec_name.to_s
+      @modify_spec = modify_spec.with_indifferent_access if modify_spec
+    end
+
+    def spec
+      resolver.spec(@spec_name.to_sym)
+    end
+
+    private
+
+    def resolver
+      ActiveRecord::ConnectionAdapters::ConnectionSpecification::Resolver.new(@spec_name => build_config)
+    end
+
+    # when building a spec from envars, there may be no database.yml file, so
+    # be careful to avoid implicit dependency on it or derived contents.
+
+    def build_config
+      config = base_config.with_indifferent_access
+
+      s_config = replica_config(config)
+      config = config.merge(s_config) if s_config
+
+      config = config.merge(@modify_spec) if defined?(@modify_spec)
+      config
+    end
+
+    def replica_config(config)
+      if database_group_url
+        config_from_url
+      else
+        c = config[@spec_name]
+
+        if !c && @spec_name == "replica" && config.key?("slave")
+          # provide backward-compatibility with :slave profile
+          ActiveSupport::Deprecation.warn(
+            "'slave' in database.yml is deprecated and will ignored from version 2.5.0. use 'replica' instead."
+          )
+          c = config["slave"]
+        end
+
+        c
+      end
+    end
+
+    def config_from_url
+      ActiveRecord::ConnectionAdapters::ConnectionSpecification::ConnectionUrlResolver.new(database_group_url).to_hash
+    end
+
+    def base_config
+      ActiveRecord::Base.connection_pool.spec.config
+    end
+
+    def database_group_url
+      ENV["DATABASE_#{@spec_name.upcase}_URL"]
+    end
+  end
+end

data/lib/fresh_connection/deprecation.rb

@@ -0,0 +1,15 @@
+require 'active_support/deprecation'
+
+module FreshConnection
+  class Deprecation
+    class << self
+      def warn(list = {})
+        list.each do |new_method, old_method|
+          ActiveSupport::Deprecation.warn(
+            "'#{old_method}' is deprecated and will removed from version 2.5.0. use '#{new_method}' instead."
+          )
+        end
+      end
+    end
+  end
+end

data/lib/fresh_connection/executor_hook.rb

@@ -0,0 +1,16 @@
+module FreshConnection
+  class ExecutorHook
+    class << self
+      def run
+      end
+
+      def complete(*args)
+        ReplicaConnectionHandler.instance.put_aside!
+      end
+
+      def install_executor_hooks
+        ActiveSupport::Executor.register_hook(self)
+      end
+    end
+  end
+end

data/lib/fresh_connection/extend/ar_abstract_adapter.rb

@@ -2,12 +2,11 @@ module FreshConnection
   module Extend
     module ArAbstractAdapter
       def self.prepended(base)
-        base.send :attr_writer, :replica_group
-        base.send :attr_accessor, :master_connection
+        base.send :attr_accessor, :replica_spec_name, :master_connection
       end
 
       def log(*args)
-        args[1] = "[#{@replica_group}] #{args[1]}" if defined?(@replica_group)
+        args[1] = "[#{@replica_spec_name}] #{args[1]}" if defined?(@replica_spec_name)
         super
       end
 

data/lib/fresh_connection/extend/ar_base.rb

@@ -1,17 +1,36 @@
-require 'active_support/deprecation'
+require 'fresh_connection/deprecation'
 require 'fresh_connection/access_control'
 require 'fresh_connection/replica_connection_handler'
 
 module FreshConnection
   module Extend
     module ArBase
+      def replica_connection_specification_name
+        if defined?(@replica_connection_specification_name)
+          return @replica_connection_specification_name
+        end
+
+        if self == ActiveRecord::Base
+          "replica"
+        else
+          superclass.replica_connection_specification_name
+        end
+      end
+
+      def replica_connection_specification_name=(spec_name)
+        spec_name = spec_name.to_s
+        spec_name = "replica" if spec_name.empty? || spec_name == "slave"
+
+        @replica_connection_specification_name = spec_name
+      end
+
       def connection
         master_c = super
         return master_c unless FreshConnection::AccessControl.replica_access?
 
         replica_c = replica_connection
         replica_c.master_connection = master_c
-        replica_c.replica_group = replica_group if logger && logger.debug?
+        replica_c.replica_spec_name = replica_connection_specification_name if logger && logger.debug?
         replica_c
       end
 
@@ -23,34 +42,19 @@ module FreshConnection
         all.manage_access(false, &block)
       end
 
-      def establish_fresh_connection(replica_group = "replica")
-        replica_connection_handler.establish_connection(name, replica_group)
+      def establish_fresh_connection(spec_name = "replica")
+        self.replica_connection_specification_name = spec_name
+        replica_connection_handler.establish_connection(replica_connection_specification_name)
       end
 
       def replica_connection
-        replica_connection_handler.connection(self)
-      end
-
-      def slave_connection
-        ActiveSupport::Deprecation.warn(
-          "'slave_connection' is deprecated and will removed from version 2.4.0. use 'replica_connection' instead."
-        )
-
-        replica_connection
+        replica_connection_handler.connection(replica_connection_specification_name)
       end
 
       def clear_all_replica_connections!
         replica_connection_handler.clear_all_connections!
       end
 
-      def clear_all_slave_connections!
-        ActiveSupport::Deprecation.warn(
-          "'clear_all_slave_connections!' is deprecated and will removed from version 2.4.0. use 'clear_all_replica_connections!' instead."
-        )
-
-        clear_all_replica_connections!
-      end
-
       def master_db_only!
         @_fresh_connection_master_only = true
       end
@@ -64,42 +68,44 @@ module FreshConnection
         replica_connection_handler.put_aside!
       end
 
-      def slave_connection_put_aside!
-        ActiveSupport::Deprecation.warn(
-          "'slave_connection_put_aside!' is deprecated and will removed from version 2.4.0. use 'replica_connection_put_aside!' instead."
-        )
+      def replica_connection_recovery?
+        replica_connection_handler.recovery?(replica_connection_specification_name)
+      end
 
-        replica_connection_put_aside!
+      def slave_connection
+        FreshConnection::Deprecation.warn(slave_connection: :replica_connection)
+        replica_connection
       end
 
-      def replica_connection_recovery?
-        replica_connection_handler.recovery?(self)
+      def clear_all_slave_connections
+        FreshConnection::Deprecation.warn(clear_all_slave_connections!: :clear_all_replica_connections!)
+        clear_all_replica_connections!
       end
 
-      def slave_connection_recovery?
-        ActiveSupport::Deprecation.warn(
-          "'slave_connection_recovery?' is deprecated and will removed from version 2.4.0. use 'replica_connection_recovery?' instead."
-        )
+      def slave_connection_put_aside!
+        FreshConnection::Deprecation.warn(slave_connection_put_aside!: :replica_connection_put_aside!)
+        replica_connection_put_aside!
+      end
 
+      def slave_connection_recovery?
+        FreshConnection::Deprecation.warn(slave_connection_recovery?: :replica_connection_recovery?)
         replica_connection_recovery?
       end
 
       def replica_group
-        replica_connection_handler.replica_group(self)
+        FreshConnection::Deprecation.warn(replica_group: :replica_connection_specification_name)
+        replica_connection_specification_name
       end
 
       def slave_group
-        ActiveSupport::Deprecation.warn(
-          "'slave_connection_recovery?' is deprecated and will removed from version 2.4.0. use 'replica_connection_recovery?' instead."
-        )
-
-        replica_group
+        FreshConnection::Deprecation.warn(slave_group: :replica_connection_specification_name)
+        replica_connection_specification_name
       end
 
       private
 
       def replica_connection_handler
-        @@replica_connection_handler ||= FreshConnection::ReplicaConnectionHandler.new
+        FreshConnection::ReplicaConnectionHandler.instance
       end
     end
   end

data/lib/fresh_connection/extend/ar_relation.rb

@@ -1,4 +1,4 @@
-require 'active_support/deprecation'
+require 'fresh_connection/deprecation'
 
 module FreshConnection
   module Extend
@@ -59,10 +59,7 @@ module FreshConnection
       end
 
       def enable_slave_access
-        ActiveSupport::Deprecation.warn(
-          "'enable_slave_access' is deprecated and will removed from version 2.4.0. use 'enable_replica_access' instead."
-        )
-
+        FreshConnection::Deprecation.warn(enable_slave_access: :enable_replica_access)
         enable_replica_access
       end
 

data/lib/fresh_connection/extend.rb

@@ -1,20 +1,15 @@
-require 'active_record'
-require 'fresh_connection/extend/ar_base'
-require 'fresh_connection/extend/ar_relation'
-require 'fresh_connection/extend/ar_relation_merger'
-require 'fresh_connection/extend/ar_abstract_adapter'
-
-module ActiveRecord
-  Base.extend FreshConnection::Extend::ArBase
-  Relation.send :prepend, FreshConnection::Extend::ArRelation
-  Relation::Merger.send :prepend, FreshConnection::Extend::ArRelationMerger
-
-  if defined?(StatementCache)
-    require 'fresh_connection/extend/ar_statement_cache'
-    StatementCache.send :prepend, FreshConnection::Extend::ArStatementCache
-  end
-
-  ConnectionAdapters::AbstractAdapter.send :prepend, FreshConnection::Extend::ArAbstractAdapter
-
-  Base.establish_fresh_connection
+require 'active_support'
+
+ActiveSupport.on_load(:active_record) do
+  require 'fresh_connection/extend/ar_base'
+  require 'fresh_connection/extend/ar_relation'
+  require 'fresh_connection/extend/ar_relation_merger'
+  require 'fresh_connection/extend/ar_statement_cache'
+  require 'fresh_connection/extend/ar_abstract_adapter'
+
+  ActiveRecord::Base.extend FreshConnection::Extend::ArBase
+  ActiveRecord::Relation.send :prepend, FreshConnection::Extend::ArRelation
+  ActiveRecord::Relation::Merger.send :prepend, FreshConnection::Extend::ArRelationMerger
+  ActiveRecord::StatementCache.send :prepend, FreshConnection::Extend::ArStatementCache
+  ActiveRecord::ConnectionAdapters::AbstractAdapter.send :prepend, FreshConnection::Extend::ArAbstractAdapter
 end

data/lib/fresh_connection/railtie.rb

@@ -1,18 +1,16 @@
-require 'fresh_connection/rack/connection_management'
+require 'fresh_connection/executor_hook'
 
 module FreshConnection
   class Railtie < Rails::Railtie
     initializer "fresh_connection.configure_rails_initialization" do |app|
-      if defined?(ActiveRecord::ConnectionAdapters::ConnectionManagement)
-        app.config.app_middleware.insert_before(
-          ActiveRecord::ConnectionAdapters::ConnectionManagement,
-          FreshConnection::Rack::ConnectionManagement
-        )
-      else
-        app.config.app_middleware.insert_before(
-          ActionDispatch::Executor,
-          FreshConnection::Rack::ConnectionManagement
-        )
+      ActiveSupport.on_load(:active_record) do
+        FreshConnection::ExecutorHook.install_executor_hooks
+      end
+    end
+
+    initializer "fresh_connection.initialize_database", after: "active_record.initialize_database" do
+      ActiveSupport.on_load(:active_record) do
+        ActiveRecord::Base.establish_fresh_connection
       end
     end
   end

data/lib/fresh_connection/railtie_for_rails4.rb

@@ -0,0 +1,12 @@
+require 'fresh_connection/rack/connection_management'
+
+module FreshConnection
+  class Railtie < Rails::Railtie
+    initializer "fresh_connection.configure_rails_initialization" do |app|
+      app.config.app_middleware.insert_before(
+        ActiveRecord::ConnectionAdapters::ConnectionManagement,
+        FreshConnection::Rack::ConnectionManagement
+      )
+    end
+  end
+end

data/lib/fresh_connection/replica_connection_handler.rb

@@ -1,23 +1,33 @@
 require 'concurrent'
+require 'singleton'
 
 module FreshConnection
   class ReplicaConnectionHandler
+    include Singleton
+
     def initialize
-      @replica_group_to_pool = Concurrent::Map.new
-      @class_to_pool = Concurrent::Map.new
+      @owner_to_pool = Concurrent::Map.new(initial_capacity: 2) do |h, k|
+        h[k] = Concurrent::Map.new(initial_capacity: 2)
+      end
     end
 
-    def establish_connection(name, replica_group)
-      if cm = @class_to_pool[name]
-        cm.put_aside!
-        @class_to_pool.delete(name)
-      end
+    def establish_connection(spec_name)
+      spec_name = spec_name.to_s
+      remove_connection(spec_name)
 
-      @replica_group_to_pool[name] = replica_group
+      message_bus = ActiveSupport::Notifications.instrumenter
+      payload = {
+        connection_id: object_id,
+        spec_name: spec_name
+      }
+
+      message_bus.instrument("!connection.active_record", payload) do
+        owner_to_pool[spec_name] = FreshConnection.connection_manager.new(spec_name)
+      end
     end
 
-    def connection(klass)
-      detect_connection_manager(klass).replica_connection
+    def connection(spec_name)
+      detect_connection_manager(spec_name).replica_connection
     end
 
     def clear_all_connections!
@@ -26,8 +36,8 @@ module FreshConnection
       end
     end
 
-    def recovery?(klass)
-      detect_connection_manager(klass).recovery?
+    def recovery?(spec_name)
+      detect_connection_manager(spec_name).recovery?
     end
 
     def put_aside!
@@ -36,30 +46,27 @@ module FreshConnection
       end
     end
 
-    def replica_group(klass)
-      detect_connection_manager(klass).replica_group
-    end
-
     private
 
+    def remove_connection(spec_name)
+      pool = owner_to_pool.delete(spec_name.to_s)
+      return unless pool
+
+      pool.clear_all_connections!
+    end
+
     def all_connection_managers
-      @class_to_pool.each_value do |connection_manager|
+      owner_to_pool.each_value do |connection_manager|
         yield(connection_manager)
       end
     end
 
-    def detect_connection_manager(klass)
-      c = class_to_pool(klass.name)
-      return c if c
-      return nil if ActiveRecord::Base == klass
-      detect_connection_manager(klass.superclass)
+    def detect_connection_manager(spec_name)
+      owner_to_pool[spec_name.to_s]
     end
 
-    def class_to_pool(name)
-      return @class_to_pool[name] if @class_to_pool.key?(name)
-      g = @replica_group_to_pool[name]
-      return nil unless g
-      @class_to_pool[name] = FreshConnection.connection_manager.new(g)
+    def owner_to_pool
+      @owner_to_pool[Process.pid]
     end
   end
 end

data/lib/fresh_connection/version.rb

@@ -1,4 +1,4 @@
 module FreshConnection
-  VERSION = "2.3.2"
+  VERSION = "2.4.0.rc1"
 end
 

data/lib/fresh_connection.rb

@@ -15,4 +15,11 @@ module FreshConnection
 end
 
 require 'fresh_connection/extend'
-require 'fresh_connection/railtie' if defined?(Rails)
+
+if defined?(Rails)
+  if Rails::VERSION::MAJOR == "4"
+    require 'fresh_connection/railtie_for_rails4'
+  else
+    require 'fresh_connection/railtie'
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fresh_connection
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 2.4.0.rc1
 platform: ruby
 authors:
 - Tsukasa OISHI
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-27 00:00:00.000000000 Z
+date: 2017-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -19,7 +19,7 @@ dependencies:
         version: 4.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: 4.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +39,7 @@ dependencies:
         version: 4.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
         version: 4.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -210,11 +210,15 @@ files:
 - fresh_connection.gemspec
 - gemfiles/rails42.gemfile
 - gemfiles/rails50.gemfile
+- gemfiles/rails51.gemfile
 - lib/fresh_connection.rb
 - lib/fresh_connection/abstract_connection_manager.rb
 - lib/fresh_connection/access_control.rb
 - lib/fresh_connection/connection_factory.rb
 - lib/fresh_connection/connection_manager.rb
+- lib/fresh_connection/connection_specification.rb
+- lib/fresh_connection/deprecation.rb
+- lib/fresh_connection/executor_hook.rb
 - lib/fresh_connection/extend.rb
 - lib/fresh_connection/extend/ar_abstract_adapter.rb
 - lib/fresh_connection/extend/ar_base.rb
@@ -223,6 +227,7 @@ files:
 - lib/fresh_connection/extend/ar_statement_cache.rb
 - lib/fresh_connection/rack/connection_management.rb
 - lib/fresh_connection/railtie.rb
+- lib/fresh_connection/railtie_for_rails4.rb
 - lib/fresh_connection/replica_connection_handler.rb
 - lib/fresh_connection/version.rb
 - log/.gitkeep
@@ -238,15 +243,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: FreshConnection supports connections with configured replica servers.