fresh_connection 1.0.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6404116fed235200999c9c0afb902ddc4068143e
-  data.tar.gz: f8b3b6b01e646d1b36dac6d42bda1be88c3aaba2
+  metadata.gz: dc5e646490d77de912ba3add1040b0acecf88d7d
+  data.tar.gz: 1bf31e8b593012fd1ee11835cca259b8739ed9c9
 SHA512:
-  metadata.gz: be9babe8024f3e99cd5e4aa6d6858c1bd73b9aca5a82115ae338470141352c3dec9f399135fe18e3590fcbf667bec6396129fd60f9e17f7f8adb33fbdcca36d2
-  data.tar.gz: 4af029f094f1bce4e3fe53d2f12dba0054cb36ba2aa29dfd1c00b99f406ff46df37196d2fb98170b708eef0f5cdf9339b1e397f3d4f735e3f0f7bb112f946067
+  metadata.gz: 51b0eb074205141d96030ad1274229b5ebe7078bd5e0a348850ccc2623d0178edbb3694a7ee098a5bcef3ce32f7e547dfbff0fda1a3f3926439216179d80b601
+  data.tar.gz: 7e4f445e3a8acf489d7a726d03c127ab4e6b82e7da28a4deda02228823cdbc55932e2d953ca226ff752905576b5d5e59f6cab1015315900e071095c2fa312a15

data/.travis.yml

@@ -1,11 +1,15 @@
 language: ruby
 before_install:
   - gem install bundler
+services:
+  - mysql
+  - postgresql
 before_script:
-  - mysql -e 'create database fresh_connection_test;'
-  - mysql -e 'create database fresh_connection_test_master;'
-  - mysql -e 'create database fresh_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
@@ -18,6 +22,26 @@ gemfile:
   - gemfiles/rails40.gemfile
   - gemfiles/rails41.gemfile
   - gemfiles/rails42.gemfile
+  - gemfiles/rails50.gemfile
+matrix:
+  exclude:
+    - rvm: 2.3.0
+      gemfile: gemfiles/rails3.gemfile
+    - rvm: ruby-head
+      gemfile: gemfiles/rails3.gemfile
+    - 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,19 +1,19 @@
-appraise "rails3" do
-  gem "activerecord", "~> 3.2.0"
-  gem "activesupport", "~> 3.2.0"
-end
-
 appraise "rails40" do
-  gem "activerecord", "~> 4.0.0"
-  gem "activesupport", "~> 4.0.0"
+  gem 'activerecord', '~> 4.0.0'
+  gem 'mysql2', '~> 0.3.10'
 end
 
 appraise "rails41" do
-  gem "activerecord", "~> 4.1.0"
-  gem "activesupport", "~> 4.1.0"
+  gem 'activerecord', '~> 4.1.0'
+  gem 'mysql2', '~> 0.3.13'
 end
 
 appraise "rails42" do
-  gem "activerecord", "~> 4.2.0"
-  gem "activesupport", "~> 4.2.0"
+  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/Gemfile

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in n_adic_number.gemspec
+# Specify your gem's dependencies in fresh_connection.gemspec
 gemspec

data/README.md

@@ -1,43 +1,42 @@
 # FreshConnection
-
-FreshConnection allows access to Mysql slave servers in Rails.
-
 [![Gem Version](https://badge.fury.io/rb/fresh_connection.svg)](http://badge.fury.io/rb/fresh_connection) [![Build Status](https://travis-ci.org/tsukasaoishi/fresh_connection.svg?branch=master)](https://travis-ci.org/tsukasaoishi/fresh_connection) [![Code Climate](https://codeclimate.com/github/tsukasaoishi/fresh_connection/badges/gpa.svg)](https://codeclimate.com/github/tsukasaoishi/fresh_connection)
 
-ActiveRecord can only access a single server by default.  
-FreshConnection can access to replicated Mysql slave servers via a loadbalancer.
+ActiveRecord accesses a single server by default.  
+FreshConnection can access to slave servers via a load balancer.
 
 For example.
 ```
-Rails ------------ Mysql(Master)
+Rails ------------ Master DB
              |
-             |                     +------ Mysql(Slave1)
+             |                     +------ Slave1 DB
              |                     |
              +---- Loadbalancer ---+
                                    |
-                                   +------ Mysql(Slave2)
+                                   +------ Slave2 DB
 ```
 
-When Rails controller's action begins, FreshConnction connects with one of slave servers behind the loadbalacer.  
-Read query goes to the slave server via the loadbalancer.  
-Write query goes to the master server. Inside transaction, all queries go to the master server.  
-All Mysql connections is disconnected at the end of the Rails controller's action.
+FreshConnction connects with one of slave servers behind the load balancer.  
+Read query goes to the slave server.  
+Write query goes to the master server.  
+Inside transaction, all queries go to the master server.  
 
+If you can't use a load balancer, could use [EbisuConnection](https://github.com/tsukasaoishi/ebisu_connection).
 
 ## Usage
-
+### Access to Slave
 Read query goes to the slave server.
 
 ```ruby
 Article.where(:id => 1)
 ```
 
-If you want to access to the master server, use read_master.
+### Access to Master
+If read query want to access to the master server, use `read_master`.  
+In before version 0.4.3, can use `readonly(false)`.
 
 ```ruby
 Article.where(:id => 1).read_master
 ```
-If you would like to use readonly(false), use version before 1.0.0.
 
 In transaction, All queries go to the master server.
 
@@ -47,7 +46,7 @@ Article.transaction do
 end
 ```
 
-Create, Update. Delete queries go to the master server.
+Create, Update and Delete queries go to the master server.
 
 ```ruby
 article = Article.create(...)
@@ -56,9 +55,14 @@ article.save
 article.destory
 ```
 
+## Support Rails version
+FreshConnection supports Rails version 4.0 or later.  
+If you are using Rails 3.2, could use FreshConnection version 1.0.0 or before.
 
-## Installation
+## Support DB
+FreshConnection supports MySQL and PostgreSQL.
 
+## Installation
 Add this line to your application's Gemfile:
 
 ```ruby
@@ -100,7 +104,7 @@ production:
 ```
 
 ```slave``` is a config to connect to slave servers.
-Others will use the master server setting.
+Others will use the master server settings.
 
 ### use multiple slave servers group
 If you may want to use multiple slave groups, write the config to ```config/database.yml```.
@@ -136,7 +140,7 @@ class AdminUser < ActiveRecord::Base
 end
 ```
 
-The model of children class will access to same slave group as the parent.
+The children class will access to same slave group as the parent.
 
 ```ruby
 class Parent < ActiveRecord::Base
@@ -199,12 +203,17 @@ class MySlaveConnection < FreshConnection::AbstractConnectionManager
     # must return object of ActiveRecord::ConnectionAdapters::Mysql2Adapter
   end
 
+  def clear_all_connections!
+    # called when all connections disconnect
+  end
+  
   def put_aside!
     # called when end of Rails controller action
   end
 
-  def recovery(failure_connection, exception)
+  def recovery?
     # called when raise exception to access slave server
+    # retry to access when this method return true
   end
 end
 ```
@@ -227,13 +236,11 @@ How to setup your test environment.
 First of all, you setting the config of the test mysql server in ```spec/database.yml```
 
 ```bash
-bundle install --path .bundle
-bundle exec appraisal install
+./bin/setup
 ```
 
 This command run the spec suite for all rails versions supported.
 
 ```bash
-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 "fresh_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/fresh_connection.gemspec

@@ -21,10 +21,11 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.0'
 
-  spec.add_dependency 'activerecord', '>= 3.2.0', '< 5.0'
-  spec.add_dependency 'activesupport', '>= 3.2.0', '< 5.0'
-  spec.add_dependency 'mysql2', '~> 0.3.18'
+  spec.add_dependency 'activerecord', '>= 4.0.0', '< 5.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,6 +3,6 @@
 source "https://rubygems.org"
 
 gem "activerecord", "~> 4.0.0"
-gem "activesupport", "~> 4.0.0"
+gem "mysql2", "~> 0.3.10"
 
 gemspec :path => "../"

data/gemfiles/rails41.gemfile

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

data/gemfiles/rails42.gemfile

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

data/gemfiles/{rails3.gemfile → rails50.gemfile}

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 3.2.0"
-gem "activesupport", "~> 3.2.0"
+gem "activerecord", "5.0.0.beta3"
+gem "mysql2", ">= 0.3.18", "< 0.5"
 
 gemspec :path => "../"

data/lib/fresh_connection/abstract_connection_manager.rb

@@ -1,17 +1,8 @@
 module FreshConnection
   class AbstractConnectionManager
-    EXCEPTION_MESSAGE_WHEN_SLAVE_SERVER_DOWN = [
-      "MySQL server has gone away",
-      "closed MySQL connection",
-      "Can't connect to local MySQL server"
-    ].map{|msg| Regexp.escape(msg)}.join("|")
-
-    private_constant :EXCEPTION_MESSAGE_WHEN_SLAVE_SERVER_DOWN
-
     attr_reader :slave_group
 
     def initialize(slave_group = "slave")
-      @mutex = Mutex.new
       @slave_group = slave_group.to_s
       @slave_group = "slave" if @slave_group.empty?
     end
@@ -28,23 +19,9 @@ module FreshConnection
     end
     undef_method :put_aside!
 
-    def recovery(failure_connection, exception)
-    end
-    undef_method :recovery
-
-    private
-
-    def synchronize
-      @mutex.synchronize{ yield }
-    end
-
-    def current_thread_id
-      Thread.current.object_id
-    end
-
-    def slave_down_message?(message)
-      /#{EXCEPTION_MESSAGE_WHEN_SLAVE_SERVER_DOWN}/o === message
+    def recovery?
     end
+    undef_method :recovery?
   end
 end
 

data/lib/fresh_connection/access_control.rb

@@ -18,6 +18,14 @@ module FreshConnection
         access_db == :slave
       end
 
+      def catch_exceptions
+        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)
+        @catch_exceptions
+      end
+
       private
 
       def switch_to(new_db)

data/lib/fresh_connection/connection_factory.rb

@@ -1,10 +1,8 @@
-require 'active_support/core_ext/hash/keys'
-
 module FreshConnection
   class ConnectionFactory
     def initialize(group, modify_spec = {})
       @group = group.to_sym
-      @modify_spec = modify_spec.symbolize_keys
+      @modify_spec = modify_spec
     end
 
     def new_connection
@@ -22,9 +20,8 @@ module FreshConnection
     end
 
     def build_spec
-      config = ar_spec.config.symbolize_keys
-      group_config = (config[@group] || {}).symbolize_keys
-      config.merge(group_config).merge(@modify_spec)
+      config = ar_spec.config
+      config.merge(config[@group] || {}).merge(@modify_spec)
     end
 
     def ar_spec

data/lib/fresh_connection/connection_manager.rb

@@ -1,43 +1,44 @@
-require 'fresh_connection/abstract_connection_manager'
-require 'fresh_connection/connection_factory'
+require 'concurrent'
 
 module FreshConnection
   class ConnectionManager < AbstractConnectionManager
+    def initialize(*args)
+      super
+      @connections = Concurrent::Map.new
+    end
+
     def slave_connection
-      synchronize do
-        slave_connections[current_thread_id] ||= connection_factory.new_connection
+      @connections.fetch_or_store(current_thread_id) do |_|
+        connection_factory.new_connection
       end
     end
 
     def put_aside!
-      synchronize do
-        if c = slave_connections.delete(current_thread_id)
-          c.disconnect! rescue nil
-        end
-      end
+      conn = @connections.delete(current_thread_id)
+      return unless conn
+      conn && conn.disconnect! rescue nil
     end
 
     def clear_all_connections!
-      synchronize do
-        slave_connections.values.each {|c| c.disconnect! rescue nil }
-        @slave_connections.clear
+      @connections.each_value do |conn|
+        conn.disconnect! rescue nil
       end
+      @connections.clear
     end
 
-    def recovery(failure_connection, exception)
-      do_recovery = slave_down_message?(exception.message)
-      put_aside! if do_recovery
-      do_recovery
+    def recovery?
+      put_aside!
+      true
     end
 
     private
 
-    def slave_connections
-      @slave_connections ||= {}
-    end
-
     def connection_factory
       @connection_factory ||= ConnectionFactory.new(@slave_group)
     end
+
+    def current_thread_id
+      Thread.current.object_id
+    end
   end
 end

data/lib/fresh_connection/extend/ar_abstract_adapter.rb

@@ -0,0 +1,14 @@
+module FreshConnection
+  module Extend
+    module ArAbstractAdapter
+      def self.prepended(base)
+        base.send :attr_writer, :slave_group
+      end
+
+      def log(*args)
+        args[1] = "[#{@slave_group}] #{args[1]}" if @slave_group
+        super
+      end
+    end
+  end
+end

data/lib/fresh_connection/extend/ar_base.rb

@@ -1,32 +1,24 @@
-require 'active_support/core_ext/class/attribute'
-require 'fresh_connection/slave_connection_handler'
-require 'fresh_connection/access_control'
-
 module FreshConnection
   module Extend
     module ArBase
-      def self.extended(base)
-        base.class_attribute :slave_connection_handler, :instance_writer => false
-        base.slave_connection_handler = FreshConnection::SlaveConnectionHandler.new
-      end
-
-      case ActiveRecord::VERSION::MAJOR
-      when 4
-        delegate :read_master, to: :all
-      when 3
-        delegate :read_master, to: :scoped
-      end
-
-      def manage_access(slave_access, &block)
-        if master_db_only?
-          FreshConnection::AccessControl.force_master_access(&block)
+      def connection
+        if FreshConnection::AccessControl.slave_access?
+          if logger && logger.debug?
+            slave_connection.tap{|c| c.slave_group = slave_group }
+          else
+            slave_connection
+          end
         else
-          FreshConnection::AccessControl.access(slave_access, &block)
+          super
         end
       end
 
+      def read_master
+        all.read_master
+      end
+
       def with_master(&block)
-        manage_access(false, &block)
+        all.manage_access(false, &block)
       end
 
       def establish_fresh_connection(slave_group = nil)
@@ -54,13 +46,19 @@ module FreshConnection
         slave_connection_handler.put_aside!
       end
 
-      def recovery(failure_connection, exception)
-        slave_connection_handler.recovery(self, failure_connection, exception)
+      def slave_connection_recovery?
+        slave_connection_handler.recovery?(self)
       end
 
       def slave_group
         slave_connection_handler.slave_group(self)
       end
+
+      private
+
+      def slave_connection_handler
+        @@slave_connection_handler ||= FreshConnection::SlaveConnectionHandler.new
+      end
     end
   end
 end

data/lib/fresh_connection/extend/ar_relation.rb

@@ -1,18 +1,46 @@
-require "fresh_connection/extend/ar_relation/for_rails#{ActiveRecord::VERSION::MAJOR}"
-
 module FreshConnection
   module Extend
     module ArRelation
-      def self.prepended(base)
-        base.__send__(:prepend, ForRails)
+      RETRY_LIMIT = 3
+      private_constant :RETRY_LIMIT
+
+      def manage_access(slave_access = enable_slave_access, &block)
+        if @klass.master_db_only?
+          FreshConnection::AccessControl.force_master_access(&block)
+        else
+          retry_count = 0
+          begin
+            FreshConnection::AccessControl.access(slave_access, &block)
+          rescue *FreshConnection::AccessControl.catch_exceptions
+            if @klass.slave_connection_recovery?
+              retry_count += 1
+              retry if retry_count < RETRY_LIMIT
+            end
+
+            raise
+          end
+        end
       end
 
-      def calculate(operation, column_name, options = {})
-        @klass.manage_access(enable_slave_access) { super }
+      def calculate(*args)
+        manage_access { super }
       end
 
       def exists?(*args)
-        @klass.manage_access(enable_slave_access) { super }
+        manage_access { super }
+      end
+
+      def pluck(*args)
+        manage_access { super }
+      end
+
+      def read_master
+        spawn.read_master!
+      end
+
+      def read_master!
+        @read_from_master = true
+        self
       end
 
       def enable_slave_access
@@ -22,11 +50,7 @@ module FreshConnection
       private
 
       def exec_queries
-        return @records if loaded?
-
-        @klass.manage_access(enable_slave_access) do
-          super
-        end
+        manage_access { super }
       end
     end
   end

data/lib/fresh_connection/extend/ar_statement_cache.rb

@@ -2,9 +2,7 @@ module FreshConnection
   module Extend
     module ArStatementCache
       def execute(params, klass, connection)
-        klass.manage_access(klass.all.enable_slave_access) do
-          super
-        end
+        klass.all.manage_access { super }
       end
     end
   end

data/lib/fresh_connection/extend.rb

@@ -1,27 +1,18 @@
-require 'active_support/lazy_load_hooks'
+require 'active_record'
+require 'fresh_connection/extend/ar_base'
+require 'fresh_connection/extend/ar_relation'
+require 'fresh_connection/extend/ar_abstract_adapter'
 
-ActiveSupport.on_load(:active_record) do
-  require 'fresh_connection/extend/ar_base'
-  require 'fresh_connection/extend/ar_relation'
-  require 'fresh_connection/extend/connection_handler'
-  require 'fresh_connection/extend/mysql2_adapter'
-  require 'active_record/connection_adapters/mysql2_adapter'
+module ActiveRecord
+  Base.extend FreshConnection::Extend::ArBase
+  Relation.send :prepend, FreshConnection::Extend::ArRelation
 
-  ActiveRecord::Base.extend FreshConnection::Extend::ArBase
-  ActiveRecord::Relation.__send__(:prepend, FreshConnection::Extend::ArRelation)
-
-  ActiveRecord::ConnectionAdapters::ConnectionHandler.__send__(
-    :prepend, FreshConnection::Extend::ConnectionHandler
-  )
-
-  ActiveRecord::ConnectionAdapters::Mysql2Adapter.__send__(
-    :prepend, FreshConnection::Extend::Mysql2Adapter
-  )
-
-  if defined?(ActiveRecord::StatementCache)
+  if defined?(StatementCache)
     require 'fresh_connection/extend/ar_statement_cache'
-    ActiveRecord::StatementCache.__send__(:prepend, FreshConnection::Extend::ArStatementCache)
+    StatementCache.send :prepend, FreshConnection::Extend::ArStatementCache
   end
 
-  ActiveRecord::Base.establish_fresh_connection
+  ConnectionAdapters::AbstractAdapter.send :prepend, FreshConnection::Extend::ArAbstractAdapter
+
+  Base.establish_fresh_connection
 end

data/lib/fresh_connection/slave_connection_handler.rb

@@ -1,15 +1,17 @@
+require 'concurrent'
+
 module FreshConnection
   class SlaveConnectionHandler
     def initialize
-      @class_to_pool = {}
+      @class_to_pool = Concurrent::Map.new
     end
 
     def establish_connection(name, slave_group)
-      if cm = @class_to_pool[name]
+      if cm = class_to_pool[name]
         cm.put_aside!
       end
 
-      @class_to_pool[name] = FreshConnection.connection_manager.new(slave_group)
+      class_to_pool[name] = FreshConnection.connection_manager.new(slave_group)
     end
 
     def connection(klass)
@@ -22,16 +24,16 @@ module FreshConnection
       end
     end
 
+    def recovery?(klass)
+      detect_connection_manager(klass).recovery?
+    end
+
     def put_aside!
       all_connection_managers do |connection_manager|
         connection_manager.put_aside!
       end
     end
 
-    def recovery(klass, failure_connection, exception)
-      detect_connection_manager(klass).recovery(failure_connection, exception)
-    end
-
     def slave_group(klass)
       detect_connection_manager(klass).slave_group
     end
@@ -39,17 +41,21 @@ module FreshConnection
     private
 
     def all_connection_managers
-      @class_to_pool.values.each do |connection_manager|
+      class_to_pool.values.each do |connection_manager|
         yield(connection_manager)
       end
     end
 
     def detect_connection_manager(klass)
-      c = @class_to_pool[klass.name]
+      c = class_to_pool[klass.name]
       return c if c
       return nil if ActiveRecord::Base == klass
       detect_connection_manager(klass.superclass)
     end
+
+    def class_to_pool
+      @class_to_pool
+    end
   end
 end
 

data/lib/fresh_connection/version.rb

@@ -1,4 +1,4 @@
 module FreshConnection
-  VERSION = "1.0.1"
+  VERSION = "2.0.0"
 end
 

data/lib/fresh_connection.rb

@@ -1,6 +1,11 @@
-require 'fresh_connection/connection_manager'
-
 module FreshConnection
+  autoload :ConnectionManager, 'fresh_connection/connection_manager'
+  autoload :AbstractConnectionManager, 'fresh_connection/abstract_connection_manager'
+  autoload :ConnectionManager, 'fresh_connection/connection_manager'
+  autoload :ConnectionFactory, 'fresh_connection/connection_factory'
+  autoload :SlaveConnectionHandler, 'fresh_connection/slave_connection_handler'
+  autoload :AccessControl, 'fresh_connection/access_control'
+
   class << self
     attr_writer :connection_manager
 
@@ -11,4 +16,4 @@ module FreshConnection
 end
 
 require 'fresh_connection/extend'
-require "fresh_connection/railtie" if defined?(Rails)
+require 'fresh_connection/railtie' if defined?(Rails)

metadata

@@ -1,143 +1,157 @@
 --- !ruby/object:Gem::Specification
 name: fresh_connection
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Tsukasa OISHI
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-12 00:00:00.000000000 Z
+date: 2016-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
-    - - <
+        version: 4.0.0
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
-    - - <
+        version: 4.0.0
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
-    - - <
-      - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 3.2.0
-    - - <
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.18
-  type: :runtime
+        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.3.18
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.0
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.0
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.7
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: https://github.com/tsukasaoishi/fresh_connection
@@ -147,32 +161,32 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Appraisals
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/console
+- bin/setup
+- bin/test
 - fresh_connection.gemspec
-- gemfiles/rails3.gemfile
 - gemfiles/rails40.gemfile
 - gemfiles/rails41.gemfile
 - gemfiles/rails42.gemfile
+- gemfiles/rails50.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/extend.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/for_rails3.rb
-- lib/fresh_connection/extend/ar_relation/for_rails4.rb
 - lib/fresh_connection/extend/ar_statement_cache.rb
-- lib/fresh_connection/extend/connection_handler.rb
-- lib/fresh_connection/extend/mysql2_adapter.rb
 - lib/fresh_connection/rack/connection_management.rb
 - lib/fresh_connection/railtie.rb
 - lib/fresh_connection/slave_connection_handler.rb
@@ -188,17 +202,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: FreshConnection supports to connect with Mysql slave servers via Load Balancers.

data/lib/fresh_connection/extend/ar_relation/for_rails3.rb

@@ -1,31 +0,0 @@
-module FreshConnection
-  module Extend
-    module ArRelation
-      module ForRails
-        def pluck(column_name)
-          if column_name.is_a?(Symbol) && column_names.include?(column_name.to_s)
-            column_name = "#{connection.quote_table_name(table_name)}.#{connection.quote_column_name(column_name)}"
-          end
-
-          result = @klass.manage_access(enable_slave_access) do
-            klass.connection.select_all(select(column_name).arel, nil)
-          end
-
-          return result if result.nil? || result.empty?
-
-          last_columns = result.last.keys.last
-
-          result.map do |attributes|
-            klass.type_cast_attribute(last_columns, klass.initialize_attributes(attributes))
-          end
-        end
-
-        def read_master
-          relation = clone
-          relation.instance_variable_set("@read_from_master", true)
-          relation
-        end
-      end
-    end
-  end
-end

data/lib/fresh_connection/extend/ar_relation/for_rails4.rb

@@ -1,20 +0,0 @@
-module FreshConnection
-  module Extend
-    module ArRelation
-      module ForRails
-        def pluck(*args)
-          @klass.manage_access(enable_slave_access) { super }
-        end
-
-        def read_master
-          spawn.read_master!
-        end
-
-        def read_master!
-          @read_from_master = true
-          self
-        end
-      end
-    end
-  end
-end

data/lib/fresh_connection/extend/connection_handler.rb

@@ -1,12 +0,0 @@
-module FreshConnection
-  module Extend
-    module ConnectionHandler
-      def retrieve_connection(klass)
-        c = super
-        c.model_class = klass
-        c
-      end
-    end
-  end
-end
-

data/lib/fresh_connection/extend/mysql2_adapter.rb

@@ -1,45 +0,0 @@
-require 'fresh_connection/access_control'
-
-module FreshConnection
-  module Extend
-    module Mysql2Adapter
-      RETRY_LIMIT = 3
-      private_constant :RETRY_LIMIT
-
-      def self.prepended(base)
-        base.__send__(:attr_writer, :model_class)
-      end
-
-      def select_all(arel, name = nil, binds = [])
-        if FreshConnection::AccessControl.slave_access?
-          change_connection do
-            super(arel, "[#{@model_class.slave_group}] #{name}", binds)
-          end
-        else
-          super
-        end
-      end
-
-      private
-
-      def change_connection
-        retry_count = 0
-        master_connection = @connection
-        begin
-          slave_connection = @model_class.slave_connection
-          @connection = slave_connection.raw_connection
-          yield
-        rescue ActiveRecord::StatementInvalid => exception
-          if @model_class.recovery(slave_connection, exception)
-            retry_count += 1
-            retry if retry_count < RETRY_LIMIT
-          end
-
-          raise
-        end
-      ensure
-        @connection = master_connection
-      end
-    end
-  end
-end