fresh_connection 3.0.0 → 3.0.1.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b67bc1788b59977212ab408786a2c50de89e59834dcb7eabfd45fd5a8b556aa
-  data.tar.gz: '0555593d5a5e54322e767ea4475d86263ea87c48d2aa618156ace835e5881389'
+  metadata.gz: eebb00ba4ca2e191f447c993f17e4f4f8977c5b3c55fe02656ba49b7c1432f29
+  data.tar.gz: 9d5e1ccd79082c4f6d726660f253d4668501db8c994ab317f16d6ff7e2f920c7
 SHA512:
-  metadata.gz: e20fade2abed85117b4dc3e55c7188ee85cdf723a0a65a270f3b53105812ff416d0d4afe94a366f87fd24dc51352d332d766b1a7622d974ec19426b0008e4087
-  data.tar.gz: 3de5c92aac34aa8fa73f556e53e0063857020724578779d8eb0f197865baf230e09c348666f49685281971d2239eb41ad7449fc2d783f16026a250f21a1d14f1
+  metadata.gz: 1bef0f2714efabf655bc0053a5b9e9996be94889384ff991faebcaf304d43b26bc8faf6cb3c6a5e5d475f9d2f3549b58d0b6c344fcff16cf26640ba0386736c8
+  data.tar.gz: 724ec092bf65e49f6832b7d78683c585ca7f2a3052658f50b36a5428e595a2dd12057543813aff4e99902d7183a2bd86ea48a976dd5b67419b86874c95978557

data/lib/fresh_connection/extend/adapters/base_adapter.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module FreshConnection
+  module Extend
+    module BaseAdapter
+      def self.prepended(base)
+        base.send :attr_writer, :model_class
+      end
+
+      def log(*args)
+        args[1] = "[#{__replica_spec_name}] #{args[1]}" if __replica_spec_name
+        super
+      end
+
+      def select_all(*args)
+        __change_connection { super }
+      end
+
+      def select_value(*args)
+        __change_connection { super }
+      end
+
+      private
+
+      def __replica_spec_name
+        return nil if !defined?(@model_class) || !@model_class
+        return nil unless FreshConnection::AccessControl.replica_access?
+        @model_class.replica_spec_name
+      end
+    end
+  end
+end

data/lib/fresh_connection/extend/adapters/m2_adapter.rb

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
+require 'fresh_connection/extend/adapters/base_adapter'
 
 module FreshConnection
   module Extend
     module M2Adapter
       private
 
-      def change_connection
+      def __change_connection
         return yield unless FreshConnection::AccessControl.replica_access?
 
         master_connection = @connection

data/lib/fresh_connection/extend/adapters/pg_adapter.rb

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
+require 'fresh_connection/extend/adapters/base_adapter'
 
 module FreshConnection
   module Extend
     module PgAdapter
       private
 
-      def change_connection
+      def __change_connection
         return yield unless FreshConnection::AccessControl.replica_access?
 
         master_connection = @connection

data/lib/fresh_connection/extend/ar_base.rb

@@ -34,7 +34,7 @@ module FreshConnection
         spec_name = "replica" if spec_name.empty?
         @_replica_spec_name = spec_name
 
-        __replica_handler.establish_connection(replica_spec_name)
+        __replica_handler.refresh_connection(replica_spec_name)
       end
 
       def master_db_only!

data/lib/fresh_connection/extend/ar_resolver.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module FreshConnection
+  module Extend
+    module ArResolver
+      def spec(*args)
+        specification = super
+
+        case specification.config[:adapter].to_s
+        when "mysql2"
+          require 'fresh_connection/extend/adapters/m2_adapter'
+          __extend_adapter_by_fc(::ActiveRecord::ConnectionAdapters::Mysql2Adapter, M2Adapter)
+        when "postgresql"
+          require 'fresh_connection/extend/adapters/pg_adapter'
+          __extend_adapter_by_fc(::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter, PgAdapter)
+        end
+
+        specification
+      end
+
+      def __extend_adapter_by_fc(klass, extend_adapter)
+        return if klass.include?(extend_adapter)
+        klass.prepend BaseAdapter
+        klass.prepend extend_adapter
+      end
+    end
+  end
+end

data/lib/fresh_connection/extend.rb

@@ -6,11 +6,13 @@ ActiveSupport.on_load(:active_record) do
   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'
+  require 'fresh_connection/extend/ar_resolver'
 
   ActiveRecord::Base.extend FreshConnection::Extend::ArBase
   ActiveRecord::Relation.prepend FreshConnection::Extend::ArRelation
   ActiveRecord::Relation::Merger.prepend FreshConnection::Extend::ArRelationMerger
   ActiveRecord::StatementCache.prepend FreshConnection::Extend::ArStatementCache
-  ActiveRecord::ConnectionAdapters::AbstractAdapter.extend FreshConnection::Extend::ArAbstractAdapter
+  ActiveRecord::ConnectionAdapters::ConnectionSpecification::Resolver.prepend(
+    FreshConnection::Extend::ArResolver
+  )
 end

data/lib/fresh_connection/replica_connection_handler.rb

@@ -12,19 +12,12 @@ module FreshConnection
       end
     end
 
-    def establish_connection(spec_name)
-      spec_name = spec_name.to_s
-      remove_connection(spec_name)
-
-      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
+    def refresh_all
+      owner_to_pool.clear
+    end
+
+    def refresh_connection(spec_name)
+      remove_connection(spec_name.to_s)
     end
 
     def connection(spec_name)
@@ -64,7 +57,17 @@ module FreshConnection
 
     def detect_connection_manager(spec_name)
       owner_to_pool.fetch(spec_name.to_s) do
-        establish_connection(spec_name)
+        refresh_connection(spec_name)
+
+        message_bus = ActiveSupport::Notifications.instrumenter
+        payload = {
+          connection_id: object_id,
+          spec_name: spec_name
+        }
+
+        message_bus.instrument("!connection.active_record", payload) do
+          FreshConnection.connection_manager.new(spec_name)
+        end
       end
     end
 

data/lib/fresh_connection/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module FreshConnection
-  VERSION = "3.0.0"
+  VERSION = "3.0.1.rc1"
 end
 

data/lib/fresh_connection.rb

@@ -1,23 +1,28 @@
 # frozen_string_literal: true
-require 'fresh_connection/connection_manager'
 
 module FreshConnection
   class << self
-    attr_writer :connection_manager
-
     def connection_manager
       if defined?(@connection_manager)
         @connection_manager
       else
+        require 'fresh_connection/connection_manager'
         ConnectionManager
       end
     end
 
+    def connection_manager=(mgr)
+      FreshConnection::ReplicaConnectionHandler.instance.refresh_all
+      @connection_manager = mgr
+    end
+
     def rails_52?
       [ActiveRecord::VERSION::MAJOR, ActiveRecord::VERSION::MINOR] == [5, 2]
     end
   end
 end
 
+require 'fresh_connection/abstract_connection_manager'
+require 'fresh_connection/connection_specification'
 require 'fresh_connection/extend'
 require 'fresh_connection/railtie' if defined?(Rails)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fresh_connection
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1.rc1
 platform: ruby
 authors:
 - Tsukasa OISHI
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-20 00:00:00.000000000 Z
+date: 2018-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -220,17 +220,17 @@ files:
 - lib/fresh_connection.rb
 - lib/fresh_connection/abstract_connection_manager.rb
 - lib/fresh_connection/access_control.rb
-- lib/fresh_connection/check_adapter.rb
 - lib/fresh_connection/connection_manager.rb
 - lib/fresh_connection/connection_specification.rb
 - lib/fresh_connection/executor_hook.rb
 - lib/fresh_connection/extend.rb
+- lib/fresh_connection/extend/adapters/base_adapter.rb
 - lib/fresh_connection/extend/adapters/m2_adapter.rb
 - lib/fresh_connection/extend/adapters/pg_adapter.rb
-- lib/fresh_connection/extend/ar_abstract_adapter.rb
 - lib/fresh_connection/extend/ar_base.rb
 - lib/fresh_connection/extend/ar_relation.rb
 - lib/fresh_connection/extend/ar_relation_merger.rb
+- lib/fresh_connection/extend/ar_resolver.rb
 - lib/fresh_connection/extend/ar_statement_cache.rb
 - lib/fresh_connection/railtie.rb
 - lib/fresh_connection/replica_connection_handler.rb
@@ -251,9 +251,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       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.7.6

data/lib/fresh_connection/check_adapter.rb

@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-
-module FreshConnection
-  module CheckAdapter
-    class << self
-      def check(klass)
-        if mysql?(klass)
-          :mysql
-        elsif postgresql?(klass)
-          :postgresql
-        end
-      end
-
-      def mysql?(klass)
-        if defined?(::ActiveRecord::ConnectionAdapters::Mysql2Adapter)
-          klass == ::ActiveRecord::ConnectionAdapters::Mysql2Adapter
-        else
-          false
-        end
-      end
-
-      def postgresql?(klass)
-        if defined?(::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter)
-          klass == ::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter
-        else
-          false
-        end
-      end
-    end
-  end
-end

data/lib/fresh_connection/extend/ar_abstract_adapter.rb

@@ -1,47 +0,0 @@
-# frozen_string_literal: true
-require 'fresh_connection/check_adapter'
-
-module FreshConnection
-  module Extend
-    module ArAbstractAdapter
-      def inherited(klass)
-        case FreshConnection::CheckAdapter.check(klass)
-        when :mysql
-          klass.prepend BaseAdapter
-          require 'fresh_connection/extend/adapters/m2_adapter'
-          klass.prepend M2Adapter
-        when :postgresql
-          klass.prepend BaseAdapter
-          require 'fresh_connection/extend/adapters/pg_adapter'
-          klass.prepend PgAdapter
-        end
-      end
-    end
-
-    module BaseAdapter
-      def self.prepended(base)
-        base.send :attr_writer, :model_class
-      end
-
-      def log(*args)
-        args[1] = "[#{__replica_spec_name}] #{args[1]}" if __replica_spec_name
-        super
-      end
-
-      def select_all(*args)
-        change_connection { super }
-      end
-
-      def select_value(*args)
-        change_connection { super }
-      end
-
-      private
-
-      def __replica_spec_name
-        return nil if !defined?(@model_class) || !@model_class
-        @model_class.replica_spec_name
-      end
-    end
-  end
-end