fresh_connection 3.0.0.rc1 → 3.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f071f5d9fa46ddea60fe9aaa63b65c7d8093e89cf39b46572ca163031ff8a3f0
-  data.tar.gz: a7b476a6274122a2010437b290d2ea664481ca85d10b8e81317bd40ba3c12c1c
+  metadata.gz: 9647d59e3a6fcfa7c194109a6797bc0962f42a491ff226bbe140a093a3c71c28
+  data.tar.gz: 133f4e76f9e4f369b69241e18e331f503b2e00bc337c7778f3c026aee8a08796
 SHA512:
-  metadata.gz: 2d97fd00f930e1fa5c1bac79422fb8e7fc183abf3d7b5b44dc6c00095d68268b4e62bd62c2e7205d2c34b063b7aa650aed69c20d97e7c728194ec089158c2673
-  data.tar.gz: 5d7f25ab66ccc092f506d83702cb9d74f64582e4ea71ed3ce220950fd569dd6f00bb4cb25238e8208b73a69f7e752ab25a4f15e11b266252f7a9d30feb85f497
+  metadata.gz: d5a063f3414c1e2251410930a06e09966af1db29920ec46d25908465dfef59c43feaf458aa3d71e6e04e82d343b2bca5f5caeb54a05be5947cd6800330a5ab12
+  data.tar.gz: 6d626b364389c7d63b687e1a6b6d2c551d1f66f73d32b782bb43505f5e44cec268d87779234c56929d678375cd929ca5ac13ed48557c12515e55e35c2097a1f9

data/Appraisals

@@ -13,9 +13,8 @@ appraise "rails51" do
 end
 
 appraise "rails52" do
-  gem 'activerecord', '5.2.0.rc2'
-  gem 'activesupport', '5.2.0.rc2'
-  #gem 'mysql2', '>= 0.4.4', '< 0.6.0'
-  gem 'mysql2', '~> 0.4.4'
+  gem 'activerecord', '5.2.0'
+  gem 'activesupport', '5.2.0'
+  gem 'mysql2', '>= 0.4.4', '< 0.6.0'
   gem 'pg', '>= 0.18', '< 2.0'
 end

data/gemfiles/rails52.gemfile

@@ -2,9 +2,9 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "5.2.0.rc2"
-gem "activesupport", "5.2.0.rc2"
-gem "mysql2", "~> 0.4.4"
+gem "activerecord", "5.2.0"
+gem "activesupport", "5.2.0"
+gem "mysql2", ">= 0.4.4", "< 0.6.0"
 gem "pg", ">= 0.18", "< 2.0"
 
 gemspec path: "../"

data/lib/fresh_connection/access_control.rb

@@ -3,16 +3,22 @@
 module FreshConnection
   class AccessControl
     class << self
-      def force_master_access(&block)
-        switch_to(:master, &block)
-      end
+      RETRY_LIMIT = 3
+      private_constant :RETRY_LIMIT
+
+      def manage_access(model:, replica_access:, &block)
+        return force_master_access(&block) if model.master_db_only?
+
+        retry_count = 0
+        begin
+          access(replica_access, &block)
+        rescue *catch_exceptions
+          if recovery?(model.replica_spec_name)
+            retry_count += 1
+            retry if retry_count < RETRY_LIMIT
+          end
 
-      def access(enable_replica_access, &block)
-        if access_db
-          block.call
-        else
-          db = enable_replica_access ? :replica : :master
-          switch_to(db, &block)
+          raise
         end
       end
 
@@ -20,20 +26,18 @@ module FreshConnection
         access_db == :replica
       end
 
-      def catch_exceptions
-        return @catch_exceptions if defined?(@catch_exceptions)
-        @catch_exceptions = [ActiveRecord::StatementInvalid]
-        @catch_exceptions << ::Mysql2::Error if defined?(::Mysql2)
-
-        if defined?(::PG)
-          @catch_exceptions << ::PG::Error
-          @catch_exceptions << ::PGError if defined?(::PGError)
-        end
+      private
 
-        @catch_exceptions
+      def force_master_access(&block)
+        switch_to(:master, &block)
       end
 
-      private
+      def access(replica_access, &block)
+        return yield if access_db
+
+        db = replica_access ? :replica : :master
+        switch_to(db, &block)
+      end
 
       def switch_to(new_db)
         old_db = access_db
@@ -50,6 +54,23 @@ module FreshConnection
       def access_to(db)
         Thread.current[:fresh_connection_access_target] = db
       end
+
+      def recovery?(spec_name)
+        FreshConnection::ReplicaConnectionHandler.instance.recovery?(spec_name)
+      end
+
+      def catch_exceptions
+        return @catch_exceptions if defined?(@catch_exceptions)
+        @catch_exceptions = [ActiveRecord::StatementInvalid]
+        @catch_exceptions << ::Mysql2::Error if defined?(::Mysql2)
+
+        if defined?(::PG)
+          @catch_exceptions << ::PG::Error
+          @catch_exceptions << ::PGError if defined?(::PGError)
+        end
+
+        @catch_exceptions
+      end
     end
   end
 end

data/lib/fresh_connection/check_adapter.rb

@@ -2,24 +2,30 @@
 
 module FreshConnection
   module CheckAdapter
-    def self.check(klass)
-      if mysql?(klass)
-        :mysql
-      elsif postgresql?(klass)
-        :postgresql
-      else
-        nil
+    class << self
+      def check(klass)
+        if mysql?(klass)
+          :mysql
+        elsif postgresql?(klass)
+          :postgresql
+        end
       end
-    end
 
-    def self.mysql?(klass)
-      return false unless defined?(::ActiveRecord::ConnectionAdapters::Mysql2Adapter)
-      klass == ::ActiveRecord::ConnectionAdapters::Mysql2Adapter
-    end
+      def mysql?(klass)
+        if defined?(::ActiveRecord::ConnectionAdapters::Mysql2Adapter)
+          klass == ::ActiveRecord::ConnectionAdapters::Mysql2Adapter
+        else
+          false
+        end
+      end
 
-    def self.postgresql?(klass)
-      return false unless defined?(::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter)
-      klass == ::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter
+      def postgresql?(klass)
+        if defined?(::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter)
+          klass == ::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter
+        else
+          false
+        end
+      end
     end
   end
 end

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

@@ -3,14 +3,6 @@
 module FreshConnection
   module Extend
     module M2Adapter
-      def select_all(*args)
-        change_connection { super }
-      end
-
-      def select_rows(*args)
-        change_connection { super }
-      end
-
       private
 
       def change_connection

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

@@ -3,22 +3,6 @@
 module FreshConnection
   module Extend
     module PgAdapter
-      def select_all(*args)
-        change_connection { super }
-      end
-
-      def select_rows(*args)
-        change_connection { super }
-      end
-
-      def select_values(*args)
-        change_connection { super }
-      end
-
-      def select_value(*args)
-        change_connection { super }
-      end
-
       private
 
       def change_connection

data/lib/fresh_connection/extend/ar_abstract_adapter.rb

@@ -5,13 +5,13 @@ module FreshConnection
   module Extend
     module ArAbstractAdapter
       def inherited(klass)
-        klass.prepend BaseAdapter
-
         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
@@ -24,13 +24,23 @@ module FreshConnection
       end
 
       def log(*args)
-        args[1] = "[#{replica_spec_name}] #{args[1]}" if replica_spec_name
+        args[1] = "[#{__replica_spec_name}] #{args[1]}" if __replica_spec_name
         super
       end
 
-      def replica_spec_name
+      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_connection_specification_name
+        @model_class.replica_spec_name
       end
     end
   end

data/lib/fresh_connection/extend/ar_base.rb

@@ -5,50 +5,36 @@ 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?
-
-        @replica_connection_specification_name = spec_name
-      end
-
-      def connection
-        c = super
-        c.model_class = self
-        c
-      end
-
       def read_master
         all.read_master
       end
 
       def with_master(&block)
-        all.manage_access(false, &block)
+        FreshConnection::AccessControl.manage_access(
+          model: self,
+          replica_access: false,
+          &block
+        )
       end
 
-      def establish_fresh_connection(spec_name = "replica")
-        self.replica_connection_specification_name = spec_name
-        replica_connection_handler.establish_connection(replica_connection_specification_name)
+      def connection
+        super.tap {|c| c.model_class = self }
       end
 
       def replica_connection
-        replica_connection_handler.connection(replica_connection_specification_name)
+        __replica_handler.connection(replica_spec_name)
       end
 
       def clear_all_replica_connections!
-        replica_connection_handler.clear_all_connections!
+        __replica_handler.clear_all_connections!
+      end
+
+      def establish_fresh_connection(spec_name = nil)
+        spec_name = spec_name.to_s
+        spec_name = "replica" if spec_name.empty?
+        @_replica_spec_name = spec_name
+
+        __replica_handler.establish_connection(replica_spec_name)
       end
 
       def master_db_only!
@@ -60,17 +46,21 @@ module FreshConnection
           (self != ActiveRecord::Base && superclass.master_db_only?)
       end
 
-      def replica_connection_put_aside!
-        replica_connection_handler.put_aside!
-      end
-
-      def replica_connection_recovery?
-        replica_connection_handler.recovery?(replica_connection_specification_name)
+      def replica_spec_name
+        @_replica_spec_name ||= __search_replica_spec_name
       end
 
       private
 
-      def replica_connection_handler
+      def __search_replica_spec_name
+        if self == ActiveRecord::Base
+          "replica"
+        else
+          superclass.replica_spec_name
+        end
+      end
+
+      def __replica_handler
         FreshConnection::ReplicaConnectionHandler.instance
       end
     end

data/lib/fresh_connection/extend/ar_relation.rb

@@ -3,27 +3,6 @@
 module FreshConnection
   module Extend
     module ArRelation
-      RETRY_LIMIT = 3
-      private_constant :RETRY_LIMIT
-
-      def manage_access(replica_access = enable_replica_access, &block)
-        if @klass.master_db_only?
-          FreshConnection::AccessControl.force_master_access(&block)
-        else
-          retry_count = 0
-          begin
-            FreshConnection::AccessControl.access(replica_access, &block)
-          rescue *FreshConnection::AccessControl.catch_exceptions
-            if @klass.replica_connection_recovery?
-              retry_count += 1
-              retry if retry_count < RETRY_LIMIT
-            end
-
-            raise
-          end
-        end
-      end
-
       def calculate(*args)
         manage_access { super }
       end
@@ -54,8 +33,12 @@ module FreshConnection
         @values[:read_master] = value
       end
 
-      def enable_replica_access
-        connection.open_transactions == 0 && !read_master_value
+      def manage_access(replica_access: enable_replica_access, &block)
+        FreshConnection::AccessControl.manage_access(
+          model: @klass,
+          replica_access: replica_access,
+          &block
+        )
       end
 
       private
@@ -63,6 +46,10 @@ module FreshConnection
       def exec_queries
         manage_access { super }
       end
+
+      def enable_replica_access
+        connection.open_transactions.zero? && !read_master_value
+      end
     end
   end
 end

data/lib/fresh_connection/extend/ar_statement_cache.rb

@@ -3,7 +3,7 @@
 module FreshConnection
   module Extend
     module ArStatementCache
-      if ActiveRecord::VERSION::MINOR == 2
+      if FreshConnection.rails_52?
         def execute(params, connection, &block)
           klass.all.manage_access { super }
         end

data/lib/fresh_connection/replica_connection_handler.rb

@@ -73,4 +73,3 @@ module FreshConnection
     end
   end
 end
-

data/lib/fresh_connection/version.rb

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

data/lib/fresh_connection.rb

@@ -12,6 +12,10 @@ module FreshConnection
         ConnectionManager
       end
     end
+
+    def rails_52?
+      [ActiveRecord::VERSION::MAJOR, ActiveRecord::VERSION::MINOR] == [5, 2]
+    end
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fresh_connection
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc1
+  version: 3.0.0.rc2
 platform: ruby
 authors:
 - Tsukasa OISHI
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-24 00:00:00.000000000 Z
+date: 2018-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -232,7 +232,6 @@ files:
 - lib/fresh_connection/extend/ar_relation.rb
 - lib/fresh_connection/extend/ar_relation_merger.rb
 - lib/fresh_connection/extend/ar_statement_cache.rb
-- lib/fresh_connection/rack/connection_management.rb
 - lib/fresh_connection/railtie.rb
 - lib/fresh_connection/replica_connection_handler.rb
 - lib/fresh_connection/version.rb
@@ -257,7 +256,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: FreshConnection supports connections with configured replica servers.

data/lib/fresh_connection/rack/connection_management.rb

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-module FreshConnection
-  module Rack
-    class ConnectionManagement
-      def initialize(app)
-        @app = app
-      end
-
-      def call(env)
-        testing = env['rack.test']
-
-        response = @app.call(env)
-        response[2] = ::Rack::BodyProxy.new(response[2]) do
-          ActiveRecord::Base.replica_connection_put_aside! unless testing
-        end
-
-        response
-      rescue Exception
-        ActiveRecord::Base.replica_connection_put_aside! unless testing
-        raise
-      end
-    end
-  end
-end