ebisu_connection 2.3.1 → 2.4.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da5ec811acbf00ad3651bfe1af53a4dc4055fa85
-  data.tar.gz: 4f0d482ae1b9b120df97a21db4df60abf8203fd5
+  metadata.gz: 8c6241ca58f74a40f35eeabbead0c1a09b0123b5
+  data.tar.gz: 69e07131acae59f06805441cc3e79b8f6b370776
 SHA512:
-  metadata.gz: 8bc1efc861bc74c3211ea3737a3c6a2ca63717c75155b87e9b590fe64e83b5892b2d678d13c6d048dd7d40c9959715f12a2bcdb49d2c2aea49eaf18a8da49bb8
-  data.tar.gz: 51da097053bdfc3fc4740ee3066808516598becff46c0ba6b1ce50337f605931b1b0addeb1aec041c4350e01f1f77308dea2fbb085f9b6d6ebf0229965cc5402
+  metadata.gz: 41281a706b834dd6c92d97774019a871f9bc416c33f701b5fa10935cd41e4c1e6c5b6bcdc311c873e2da40202022d00170467b73a09e14c1f9c269eecf43f1c8
+  data.tar.gz: 831357fd7126ee7765c92240aa5e65397e0f14e358cb096b98b48147a97a1f327311428f3d1fbf68bbe7446ba3eef19031b746082f6831f2dcd7849ae77a6977

data/.travis.yml

@@ -11,16 +11,13 @@ before_script:
   - psql -c 'create database ebisu_connection_test_replica;' -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,9 +1,20 @@
 appraise "rails42" do
   gem "activerecord", "~> 4.2.0"
-  gem 'mysql2', '~> 0.3.13'
+  gem 'activesupport', '~> 4.2.0'
+  gem 'mysql2', '>= 0.3.13', '< 0.5'
+  gem 'pg', '~> 0.15'
 end
 
 appraise "rails50" do
-  gem "activerecord", "5.0.0"
+  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/ebisu_connection.gemspec

@@ -19,9 +19,9 @@ 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 'fresh_connection', '~> 2.3.0'
+  spec.add_dependency 'fresh_connection', '2.4.0.rc3'
   spec.add_dependency 'concurrent-ruby', '~> 1.0.0'
 
   spec.add_development_dependency 'mysql2', '>= 0.3.13', '< 0.5'

data/gemfiles/rails42.gemfile

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

data/gemfiles/rails50.gemfile

@@ -2,7 +2,9 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "5.0.0"
+gem "activerecord", "~> 5.0.0"
+gem "activesupport", "~> 5.0.0"
 gem "mysql2", ">= 0.3.18", "< 0.5"
+gem "pg", "~> 0.18"
 
 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/ebisu_connection/conf_file.rb

@@ -4,106 +4,60 @@ require 'active_support/deprecation'
 module EbisuConnection
   class ConfFile
     class << self
-      attr_writer :replica_file, :check_interval
+      attr_writer :replica_file
 
       def slaves_file=(file)
         ActiveSupport::Deprecation.warn(
-          "'slaves_file=' is deprecated and will removed from version 2.4.0. use 'replica_file=' insted."
+          "'slaves_file=' is deprecated and will removed from version 2.5.0. use 'replica_file=' instead."
         )
 
         self.replica_file = file
       end
 
-      def if_modify
-        if time_to_check? && modify?
-          yield
-        end
-      end
-
-      def conf_clear!
-        @replica_conf = nil
-      end
-
-      def replica_conf(replica_group)
-        @replica_conf ||= get_replica_conf
+      def replica_conf(spec_name)
+        return config unless config.is_a?(Hash)
 
-        if @replica_conf.is_a?(Hash)
-          c = @replica_conf[replica_group]
+        c = config[spec_name]
+        return c if c
 
-          if !c && replica_group == "replica" && @replica_conf.key?("slave")
-            ActiveSupport::Deprecation.warn(
-              "'slave' in replica.yml is deprecated and will ignored from version 2.4.0. use 'replica' insted."
-            )
+        if spec_name == "replica" && config.key?("slave")
+          ActiveSupport::Deprecation.warn(
+            "'slave' in replica.yml is deprecated and will ignored from version 2.5.0. use 'replica' insted."
+          )
 
-            c = @replica_conf["slave"]
-          end
-
-          c || @replica_conf
-        else
-          @replica_conf
+          c = config["slave"]
         end
+
+        c || config
       end
 
-      def slaves_conf(replica_group)
-        ActiveSupport::Deprecation.warn(
-          "'slaves_conf' is deprecated and will removed from version 2.4.0. use 'replica_conf' insted."
-        )
+      private
+
+      def config
+        return @config if defined?(@config)
 
-        replica_conf(replica_group)
+        conf = YAML.load_file(replica_file)
+        @config = conf[EbisuConnection.env.to_s] || {}
       end
 
       def replica_file
         return @replica_file if @replica_file
+
         raise "nothing replica_file. You have to set a file path using EbisuConnection.replica_file= method" unless defined?(Rails)
 
         file = %w(yml yaml).map{|ext| Rails.root.join("config/replica.#{ext}").to_s }.detect {|f| File.exist?(f) }
+        return file if file
 
-        unless file
-          file = %w(yml yaml).map{|ext| Rails.root.join("config/slave.#{ext}").to_s }.detect {|f| File.exist?(f) }
-          if file
-            ActiveSupport::Deprecation.warn(
-              "file name 'config/#{file}' is deprecated and will ignored from version 2.4.0. use 'config/replica.yml' insted."
-            )
-          end
-        end
-
-        raise "nothing replica_file. You have to put a config/replica.yml file" unless file
-
-        @replica_file = file
-      end
+        file = %w(yml yaml).map{|ext| Rails.root.join("config/slave.#{ext}").to_s }.detect {|f| File.exist?(f) }
+        if file
+          ActiveSupport::Deprecation.warn(
+            "file name 'config/#{file}' is deprecated and will ignored from version 2.5.0. use 'config/replica.yml' insted."
+          )
 
-      def slaves_file
-        ActiveSupport::Deprecation.warn(
-          "'slaves_file' is deprecated and will removed from version 2.4.0. use 'replica_file' insted."
-        )
-
-        replica_file
-      end
-
-      def check_interval
-        @check_interval || 1.minute
-      end
-
-      private
-
-      def time_to_check?
-        now = Time.now
-        @check_time ||= now
-
-        return false if now - @check_time < check_interval
-
-        @check_time = now
-        true
-      end
-
-      def modify?
-        @file_mtime != File.mtime(replica_file)
-      end
+          return file
+        end
 
-      def get_replica_conf
-        @file_mtime = File.mtime(replica_file)
-        conf = YAML.load_file(replica_file)
-        conf[EbisuConnection.env.to_s] || {}
+        raise "nothing replica_file. You have to put a config/replica.yml file"
       end
     end
   end

data/lib/ebisu_connection/connection_manager.rb

@@ -1,76 +1,70 @@
 require "concurrent"
-require "ebisu_connection/replica_group"
+require "ebisu_connection/replica"
+require "ebisu_connection/greatest_common_divisor"
 
 module EbisuConnection
   class ConnectionManager < FreshConnection::AbstractConnectionManager
-    def initialize(replica_group = "replica")
+    class AllReplicaHasGoneError < StandardError; end
+
+    def initialize(spec_name = nil)
       super
-      @replicas = Concurrent::Map.new
+
+      @replicas = Concurrent::Array.new
+
+      replica_conf.each do |conf|
+        @replicas << Replica.new(conf, spec_name)
+      end
+
+      recalc_roulette
     end
 
     def replica_connection
-      replicas.sample.connection
+      raise AllReplicaHasGoneError if @replicas.empty?
+      @replicas[@roulette.sample].connection
     end
 
     def put_aside!
-      return if check_own_connection
-
-      ConfFile.if_modify do
-        reserve_release_all_connection
-        check_own_connection
+      @replicas.each_value do |pool|
+        pool.release_connection if pool.active_connection? && !pool.connection.transaction_open?
       end
     end
 
     def clear_all_connections!
-      @replicas.each_value do |s|
-        s.all_disconnect!
+      @replicas.each_value do |pool|
+        pool.disconnect!
       end
-
-      @replicas.clear
-      ConfFile.conf_clear!
     end
 
     def recovery?
-      replicas.recovery_connection?
-    end
+      dead_replicas = @replicas.select{|pool| !pool.connection.active? }
+      return false if dead_replicas.empty?
 
-    private
+      dead_replicas.each do |pool|
+        pool.disconnect!
+        @replicas.delete(pool)
+      end
 
-    def check_own_connection
-      s = @replicas[current_thread_id]
+      raise AllReplicaHasGoneError if @replicas.empty?
 
-      if s && s.reserved_release?
-        s.all_disconnect!
-        @replicas.delete(current_thread_id)
-        true
-      else
-        false
-      end
+      recalc_roulette
+      true
     end
 
-    def reserve_release_all_connection
-      @replicas.each_value do |s|
-        s.reserve_release_connection!
-      end
-      ConfFile.conf_clear!
-    end
+    private
 
-    def replicas
-      @replicas.fetch_or_store(current_thread_id) do |_|
-        get_replicas
-      end
-    end
+    def recalc_roulette
+      weight_list = @replicas.map {|pool| pool.weight }
 
-    def get_replicas
-      ReplicaGroup.new(replica_conf, replica_group)
+      @roulette = []
+      gcd = GreatestCommonDivisor.calc(weight_list)
+      weight_list.each_with_index do |w, index|
+        weight = w / gcd
+        @roulette.concat([index] * weight)
+      end
     end
 
     def replica_conf
-      ConfFile.replica_conf(replica_group)
-    end
-
-    def current_thread_id
-      Thread.current.object_id
+      ConfFile.replica_conf(spec_name)
     end
   end
 end

data/lib/ebisu_connection/railtie.rb

@@ -0,0 +1,9 @@
+module EbisuConnection
+  class Railtie < Rails::Railtie
+    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
+end

data/lib/ebisu_connection/replica.rb

@@ -1,45 +1,54 @@
+require 'fresh_connection/connection_specification'
+
 module EbisuConnection
   class Replica
     attr_reader :hostname, :weight
 
-    def initialize(conf, replica_group)
+    def initialize(conf, spec_name)
       case conf
       when String
         host, weight = conf.split(/\s*,\s*/)
-        @hostname, port = host.split(/\s*:\s*/)
+        @hostname, @port = host.split(/\s*:\s*/)
       when Hash
         @hostname = conf["host"] || conf[:host]
         weight = conf["weight"] || conf[:weight]
-        port = conf["port"] || conf[:port]
+        @port = conf["port"] || conf[:port]
       else
         raise ArgumentError, "replica config is invalid"
       end
 
-      spec = modify_spec(port)
-      @connection_factory = FreshConnection::ConnectionFactory.new(replica_group, spec)
+      spec = FreshConnection::ConnectionSpecification.new(
+        spec_name, modify_spec: modify_spec
+      ).spec
+
+      @pool = ActiveRecord::ConnectionAdapters::ConnectionPool.new(spec)
       @weight = (weight || 1).to_i
     end
 
     def connection
-      @connection ||= @connection_factory.new_connection
+      @pool.connection
+    end
+
+    def active_connection?
+      @pool.active_connection?
     end
 
-    def active?
-      connection.active?
+    def release_connection
+      @pool.release_connection
     end
 
     def disconnect!
-      if @connection
-        @connection.disconnect!
-        @connection = nil
-      end
-    rescue
+      @pool.disconnect!
     end
 
-    def modify_spec(port)
+    private
+
+    def modify_spec
       modify_spec = {"host" => @hostname}
-      return modify_spec unless port
-      modify_spec["port"] = port.to_i if port.is_a?(Integer) || !port.empty?
+      return modify_spec if !defined?(@port) || @port.nil?
+      return modify_spec if @port.respond_to?(:empty?) && @port.empty?
+
+      modify_spec["port"] = @port.to_i
       modify_spec
     end
   end

data/lib/ebisu_connection/version.rb

@@ -1,3 +1,3 @@
 module EbisuConnection
-  VERSION = "2.3.1"
+  VERSION = "2.4.0.rc1"
 end

data/lib/ebisu_connection.rb

@@ -1,4 +1,4 @@
-require 'active_support/deprecation'
+require 'active_support'
 require "fresh_connection"
 require "ebisu_connection/conf_file"
 
@@ -11,15 +11,7 @@ module EbisuConnection
     end
 
     def slaves_file=(file)
-      ActiveSupport::Deprecation.warn(
-        "'slaves_file=' is deprecated and will removed from version 2.4.0. use 'replica_file=' insted."
-      )
-
-      self.replica_file = file
-    end
-
-    def check_interval=(interval)
-      ConfFile.check_interval = interval
+      ConfFile.slaves_file = file
     end
 
     def env
@@ -30,4 +22,5 @@ end
 
 require "ebisu_connection/connection_manager"
 FreshConnection.connection_manager = EbisuConnection::ConnectionManager
-ActiveRecord::Base.establish_fresh_connection
+
+require "ebisu_connection/railtie" if defined?(Rails)

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: ebisu_connection
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.4.0.rc1
 platform: ruby
 authors:
 - tsukasaoishi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-20 00:00:00.000000000 Z
+date: 2017-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fresh_connection
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.4.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.4.0.rc3
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -169,12 +169,13 @@ files:
 - ebisu_connection.gemspec
 - gemfiles/rails42.gemfile
 - gemfiles/rails50.gemfile
+- gemfiles/rails51.gemfile
 - lib/ebisu_connection.rb
 - lib/ebisu_connection/conf_file.rb
 - lib/ebisu_connection/connection_manager.rb
 - lib/ebisu_connection/greatest_common_divisor.rb
+- lib/ebisu_connection/railtie.rb
 - lib/ebisu_connection/replica.rb
-- lib/ebisu_connection/replica_group.rb
 - lib/ebisu_connection/version.rb
 homepage: https://github.com/tsukasaoishi/ebisu_connection
 licenses:
@@ -188,15 +189,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.5.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: EbisuConnection supports connections with configured replica servers.

data/lib/ebisu_connection/replica_group.rb

@@ -1,62 +0,0 @@
-require "ebisu_connection/replica"
-require "ebisu_connection/greatest_common_divisor"
-
-module EbisuConnection
-  class ReplicaGroup
-    class AllReplicaHasGoneError < StandardError; end
-
-    def initialize(replica_conf, replica_group)
-      @replicas = replica_conf.map do |conf|
-        Replica.new(conf, replica_group)
-      end
-
-      recalc_roulette
-    end
-
-    def sample
-      raise AllReplicaHasGoneError if @replicas.empty?
-      @replicas[@roulette.sample]
-    end
-
-    def recovery_connection?
-      dead_replicas = @replicas.select{|s| !s.active? }
-      return false if dead_replicas.empty?
-
-      dead_replicas.each do |s|
-        s.disconnect!
-        @replicas.delete(s)
-      end
-
-      raise AllReplicaHasGoneError if @replicas.empty?
-
-      recalc_roulette
-      true
-    end
-
-    def all_disconnect!
-      @reserve_release = nil
-      @replicas.each {|s| s.disconnect!}
-    end
-
-    def reserve_release_connection!
-      @reserve_release = true
-    end
-
-    def reserved_release?
-      !!@reserve_release
-    end
-
-    private
-
-    def recalc_roulette
-      weight_list = @replicas.map {|s| s.weight }
-
-      @roulette = []
-      gcd = GreatestCommonDivisor.calc(weight_list)
-      weight_list.each_with_index do |w, index|
-        weight = w / gcd
-        @roulette.concat([index] * weight)
-      end
-    end
-  end
-end