ebisu_connection 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ca70a47990e4d8b4785fd2d744777cce70ca488
-  data.tar.gz: deb891cf866a57e0fa9945215737bbe73774469e
+  metadata.gz: 764c768519c8100f8cebb21c2f82a2f7366b9027
+  data.tar.gz: fe2a33cd780b591989c14007ec9fd37fd14f8702
 SHA512:
-  metadata.gz: 073399cd8859740d5a14c69b4932f4615438841012adae7f4bd95f909c7f62754dca313e9ccd958d3863c6932b16cf5142adfb7a75a0d95ebfb27aeddd0fe425
-  data.tar.gz: 8656575ecfac9e40ef0b9b56a5ae34f836e174467c84524ae5e617b48fab1cf200308a72bb8de5573f6a76a2a45920852ec401904daf10b163467250afca86b7
+  metadata.gz: be9cbf840dbeca58b62dae564ccd7108e03d8140c9a359e2a0c75ab52ae8a0406f20cbef725fc8fcef0d818fa85d3270883621955584e7552abb0e5739ed09f7
+  data.tar.gz: 4ef3c1940b977e53318ea19cef4c27b5ba80fa8d20377d8aecbd319fd5bf75387a9de8c3cb3893f09b4a338d17ce8afd3a512098d113f89911c7db54d418697b

data/.travis.yml

@@ -1,11 +1,15 @@
 language: ruby
 before_install:
   - gem install bundler
+services:
+  - mysql
+  - postgresql
 before_script:
-  - mysql -e 'create database ebisu_connection_test;'
-  - mysql -e 'create database ebisu_connection_test_master;'
-  - mysql -e 'create database ebisu_connection_test_slave;'
   - bundle update
+  - cp test/config/database_postgresql.yml.travis test/config/database_postgresql.yml
+  - psql -c 'create database fresh_connection_test_master;' -U postgres
+  - psql -c 'create database fresh_connection_test_slave1;' -U postgres
+  - psql -c 'create database fresh_connection_test_slave2;' -U postgres
 cache: bundler
 rvm:
   - 2.0.0
@@ -14,10 +18,25 @@ rvm:
   - 2.3.0
   - ruby-head
 gemfile:
-  - gemfiles/rails3.gemfile
   - gemfiles/rails40.gemfile
   - gemfiles/rails41.gemfile
   - gemfiles/rails42.gemfile
+  - gemfiles/rails50.gemfile
+matrix:
+  exclude:
+    - rvm: 2.3.0
+      gemfile: gemfiles/rails40.gemfile
+    - rvm: ruby-head
+      gemfile: gemfiles/rails40.gemfile
+    - rvm: 2.0.0
+      gemfile: gemfiles/rails50.gemfile
+    - rvm: 2.1.8
+      gemfile: gemfiles/rails50.gemfile
+  allow_failures:
+    - rvm: ruby-head
+    - gemfile: gemfiles/rails50.gemfile
+  fast_finish: true
 notifications:
   emails:
     - tsukasa.oishi@gmail.com
+bundler_args: --jobs 3 --retry 3

data/Appraisals

@@ -1,15 +1,19 @@
-appraise "rails3" do
-  gem "activerecord", "~> 3.2.0"
-end
-
 appraise "rails40" do
   gem "activerecord", "~> 4.0.0"
+  gem 'mysql2', '~> 0.3.10'
 end
 
 appraise "rails41" do
   gem "activerecord", "~> 4.1.0"
+  gem 'mysql2', '~> 0.3.13'
 end
 
 appraise "rails42" do
   gem "activerecord", "~> 4.2.0"
+  gem 'mysql2', '~> 0.3.13'
+end
+
+appraise "rails50" do
+  gem "activerecord", "5.0.0.beta3"
+  gem 'mysql2', '>= 0.3.18', '< 0.5'
 end

data/README.md

@@ -1,10 +1,60 @@
 # EbisuConnection
-
 [![Gem Version](https://badge.fury.io/rb/ebisu_connection.svg)](http://badge.fury.io/rb/ebisu_connection) [![Build Status](https://travis-ci.org/tsukasaoishi/ebisu_connection.svg?branch=master)](https://travis-ci.org/tsukasaoishi/ebisu_connection) [![Code Climate](https://codeclimate.com/github/tsukasaoishi/ebisu_connection/badges/gpa.svg)](https://codeclimate.com/github/tsukasaoishi/ebisu_connection)
 
-EbisuConnection supports to connect with Mysql slave servers. It doesn't need Load Balancer.
-You can assign a performance weight to each slave server. And slave config is reflected dynamic.
-EbisuConnection uses FreshConnection (https://github.com/tsukasaoishi/fresh_connection).
+EbisuConnection allows access to slave servers.  
+You could assign a performance weight to each slave server.
+
+```
+Rails ------------ Master DB
+             |
+             | 
+             +---- Slave1 DB (weight 10)
+             |
+             |
+             +---- Slave2 DB (weight 20)
+```
+
+If you could put a load balancer in front of slave servers, should use [FreshConnection](https://github.com/tsukasaoishi/fresh_connection).
+
+## Usage
+### Access to Slave
+Read query goes to the slave server.
+
+```ruby
+Article.where(:id => 1)
+```
+
+### Access to Master
+If read query want to access to the master server, use `read_master`.  
+In before version 0.3.1, can use `readonly(false)`.
+
+```ruby
+Article.where(:id => 1).read_master
+```
+
+In transaction, All queries go to the master server.
+
+```ruby
+Article.transaction do
+  Article.where(:id => 1)
+end
+```
+
+Create, Update and Delete queries go to the master server.
+
+```ruby
+article = Article.create(...)
+article.title = "FreshConnection"
+article.save
+article.destory
+```
+
+## Support Rails version
+EbisuConnection supports Rails version 4.0 or later.  
+If you are using Rails 3.2, could use EbisuConnection version 1.0.0 or before.
+
+## Support DB
+EbisuConnection supports MySQL and PostgreSQL.
 
 ## Installation
 
@@ -48,10 +98,10 @@ production:
     host: slave
 ```
 
-```slave``` is base config to connect to slave servers.
-Others will use the master setting. If you want to change, write in the slave.
-
-Config of each slave server fill out config/slave.yaml
+```slave``` is a config to connect to slave servers.  
+Others will use the master server settings.  
+  
+Config of each slave server fill out to `config/slave.yml`
 
 ```yaml
 production:
@@ -62,7 +112,7 @@ production:
     weight: 30
 ```
 
-config/slave.yaml is checked by end of action. If config changed, it's reflected dynamic. Application doesn't need restart.
+If ``config/slave.yml`` changed, it is reflected dynamic. Application doesn't need restart.
 
 ```yaml
 "hostname, weight"
@@ -96,7 +146,7 @@ production:
     host: admin_slaves
 ```
 
-Config of each slave server fill out config/slave.yaml
+Config of each slave server fill out to `config/slave.yml`
 
 ```yaml
 production:
@@ -111,7 +161,6 @@ production:
     - "slave4, 20"
 ```
 
-
 And call establish_fresh_connection method in model that access to ```admin_slave``` slave group.
 
 ```ruby
@@ -148,32 +197,6 @@ end
 If model that always access to master servers is exist, You may want to write ```master_db_only!```  in model.
 The model that master_db_only model's child is always access to master db.
 
-## Usage
-
-Read query will be access to slave server.
-
-```ruby
-Article.where(:id => 1)
-Article.count
-```
-
-If you want to access to the master server, use read_master.
-
-```ruby
-Article.where(:id => 1).read_master
-```
-
-It is possible to use readonly(false) instead of read_master, but it will be depricated at future version.
-
-In transaction, Always will be access to master server.
-
-```ruby
-Article.transaction do
-  Article.where(:id => 1)
-end
-```
-
-
 ### for Unicorn
 
 ```ruby
@@ -205,13 +228,12 @@ To run the test suite, you need mysql installed.
 How to setup your test environment.
 
 ```bash
-bundle install --path .bundle
-bundle exec appraisal install
+./bin/setup
 ```
 
 This command run the spec suite for all rails versions supported.
 
 ```base
-bundle exec appraisal rake test
+./bin/test
 ```
 

data/Rakefile

@@ -1,10 +1,22 @@
 require "bundler/gem_tasks"
 require 'rake/testtask'
 
-Rake::TestTask.new do |t|
-  t.libs.push "test"
-  t.test_files = FileList['test/**/*_test.rb']
-  t.verbose = true
+desc 'Run mysql2 and postgresql test'
+task :test do
+  Rake::Task["test:mysql2"].invoke
+  Rake::Task["test:postgresql"].invoke
+end
+
+namespace :test do
+  %w(mysql2 postgresql).each do |db|
+    Rake::TestTask.new(db) do |t|
+      t.libs << "test"
+      t.libs << "lib"
+      t.test_files = FileList["test/config/prepare_#{db}", 'test/**/*_test.rb']
+      t.verbose = false
+      t.warning = false
+    end
+  end
 end
 
 task :default => :test

data/bin/console

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "ebisu_connection"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require "irb"
+IRB.start

data/bin/setup

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle install --path .bundle
+bundle exec appraisal install
+
+# Do any other automated setup that you need to do here

data/bin/test

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle exec appraisal rake test

data/ebisu_connection.gemspec

@@ -21,8 +21,11 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.0'
 
-  spec.add_dependency 'fresh_connection', '~> 1.0.0'
+  spec.add_dependency 'fresh_connection', '~> 2.0.0'
+  spec.add_dependency 'concurrent-ruby', '~> 1.0.0'
 
+  spec.add_development_dependency 'mysql2', '>= 0.3.13', '< 0.5'
+  spec.add_development_dependency 'pg', '~> 0.11'
   spec.add_development_dependency "bundler", ">= 1.3.0", "< 2.0"
   spec.add_development_dependency "rake", ">= 0.8.7"
   spec.add_development_dependency 'appraisal'

data/gemfiles/rails40.gemfile

@@ -3,5 +3,6 @@
 source "https://rubygems.org"
 
 gem "activerecord", "~> 4.0.0"
+gem "mysql2", "~> 0.3.10"
 
 gemspec :path => "../"

data/gemfiles/rails41.gemfile

@@ -3,5 +3,6 @@
 source "https://rubygems.org"
 
 gem "activerecord", "~> 4.1.0"
+gem "mysql2", "~> 0.3.13"
 
 gemspec :path => "../"

data/gemfiles/rails42.gemfile

@@ -3,5 +3,6 @@
 source "https://rubygems.org"
 
 gem "activerecord", "~> 4.2.0"
+gem "mysql2", "~> 0.3.13"
 
 gemspec :path => "../"

data/gemfiles/rails50.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "5.0.0.beta3"
+gem "mysql2", ">= 0.3.18", "< 0.5"
+
+gemspec :path => "../"

data/lib/ebisu_connection/conf_file.rb

@@ -27,7 +27,10 @@ module EbisuConnection
       def slaves_file
         return @slaves_file if @slaves_file
         raise "nothing slaves_file. You have to set a file path using EbisuConnection.slaves_file= method" unless defined?(Rails)
-        File.join(Rails.root, "config/slave.yaml")
+
+        @slaves_file = %w(yml yaml).map{|ext| Rails.root.join("config/slave.#{ext}").to_s }.detect {|f| File.exist?(f) }
+        raise "nothing slaves_file. You have to put a config/slave.yml file" unless @slaves_file
+        @slaves_file
       end
 
       def check_interval

data/lib/ebisu_connection/connection_manager.rb

@@ -1,13 +1,10 @@
-require 'fresh_connection/abstract_connection_manager'
-require 'ebisu_connection/conf_file'
-require 'ebisu_connection/slave_group'
-require 'active_support/deprecation'
+require 'concurrent'
 
 module EbisuConnection
   class ConnectionManager < FreshConnection::AbstractConnectionManager
     def initialize(slave_group = "slave")
       super
-      @slaves = {}
+      @slaves = Concurrent::Map.new
     end
 
     def slave_connection
@@ -23,59 +20,43 @@ module EbisuConnection
       end
     end
 
-    def recovery(failure_connection, exception)
-      if slave_down_message?(exception.message)
-        slaves.remove_connection(failure_connection)
-        true
-      else
-        false
-      end
-    end
-
     def clear_all_connections!
-      synchronize do
-        @slaves.values.each do |s|
-          s.all_disconnect!
-        end
-
-        @slaves = {}
-        ConfFile.conf_clear!
+      @slaves.each_value do |s|
+        s.all_disconnect!
       end
+
+      @slaves.clear
+      ConfFile.conf_clear!
     end
 
-    def clear_all_connection!
-      ActiveSupport::Deprecation.warn("clear_all_connection! has been deprecated. Use clear_all_connections! instead", caller)
-      clear_all_connections!
+    def recovery?
+      slaves.recovery_connection?
     end
 
     private
 
     def check_own_connection
-      synchronize do
-        s = @slaves[current_thread_id]
+      s = @slaves[current_thread_id]
 
-        if s && s.reserved_release?
-          s.all_disconnect!
-          @slaves.delete(current_thread_id)
-          true
-        else
-          false
-        end
+      if s && s.reserved_release?
+        s.all_disconnect!
+        @slaves.delete(current_thread_id)
+        true
+      else
+        false
       end
     end
 
     def reserve_release_all_connection
-      synchronize do
-        @slaves.values.each do |s|
-          s.reserve_release_connection!
-        end
-        ConfFile.conf_clear!
+      @slaves.each_value do |s|
+        s.reserve_release_connection!
       end
+      ConfFile.conf_clear!
     end
 
     def slaves
-      synchronize do
-        @slaves[current_thread_id] ||= get_slaves
+      @slaves.fetch_or_store(current_thread_id) do |_|
+        get_slaves
       end
     end
 
@@ -86,5 +67,9 @@ module EbisuConnection
     def slaves_conf
       ConfFile.slaves_conf(slave_group)
     end
+
+    def current_thread_id
+      Thread.current.object_id
+    end
   end
 end

data/lib/ebisu_connection/slave.rb

@@ -24,6 +24,10 @@ module EbisuConnection
       @connection ||= @connection_factory.new_connection
     end
 
+    def active?
+      connection.active?
+    end
+
     def disconnect!
       if @connection
         @connection.disconnect!

data/lib/ebisu_connection/slave_group.rb

@@ -1,6 +1,3 @@
-require 'ebisu_connection/greatest_common_divisor'
-require 'ebisu_connection/slave'
-
 module EbisuConnection
   class SlaveGroup
     class AllSlavesHasGoneError < StandardError; end
@@ -18,13 +15,19 @@ module EbisuConnection
       @slaves[@roulette.sample]
     end
 
-    def remove_connection(connection)
-      return unless s = @slaves.detect{|s| s.connection == connection}
-      s.disconnect! rescue nil
-      @slaves.delete(s)
+    def recovery_connection?
+      dead_slaves = @slaves.select{|s| !s.active? }
+      return false if dead_slaves.empty?
+
+      dead_slaves.each do |s|
+        s.disconnect!
+        @slaves.delete(s)
+      end
+
       raise AllSlavesHasGoneError if @slaves.empty?
+
       recalc_roulette
-      nil
+      true
     end
 
     def all_disconnect!

data/lib/ebisu_connection/version.rb

@@ -1,3 +1,3 @@
 module EbisuConnection
-  VERSION = "1.0.0"
+  VERSION = "2.0.0"
 end

data/lib/ebisu_connection.rb

@@ -1,8 +1,12 @@
 require "fresh_connection"
-require 'ebisu_connection/conf_file'
-require 'ebisu_connection/connection_manager'
 
 module EbisuConnection
+  autoload :ConfFile, 'ebisu_connection/conf_file'
+  autoload :ConnectionManager, 'ebisu_connection/connection_manager'
+  autoload :SlaveGroup, 'ebisu_connection/slave_group'
+  autoload :Slave, 'ebisu_connection/slave'
+  autoload :GreatestCommonDivisor, 'ebisu_connection/greatest_common_divisor'
+
   class << self
     attr_writer :env
 

metadata

@@ -1,17 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: ebisu_connection
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - tsukasaoishi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-10 00:00:00.000000000 Z
+date: 2016-03-26 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.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -24,6 +38,40 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.13
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.13
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.11'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -116,11 +164,15 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/console
+- bin/setup
+- bin/test
 - ebisu_connection.gemspec
 - gemfiles/rails3.gemfile
 - gemfiles/rails40.gemfile
 - gemfiles/rails41.gemfile
 - gemfiles/rails42.gemfile
+- gemfiles/rails50.gemfile
 - lib/ebisu_connection.rb
 - lib/ebisu_connection/conf_file.rb
 - lib/ebisu_connection/connection_manager.rb