fresh_connection 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 755153c16ffcf02081f831ae593d7b15a23ea0d2
-  data.tar.gz: 45145aa7be5d694975dfbc46330bd921d158d246
+  metadata.gz: a3ef49675ecb94116b2fb15051a79c6e85cb8b8b
+  data.tar.gz: 36c1f17b854cbe69105c665bdacf145d2d5262bc
 SHA512:
-  metadata.gz: 8ed0b205aa9966468e9a39033b1726539d7bfc01acd66835f697f37739acc25369475b40163b5330e61cccf0abe26af388a8f32a6e072796a4f41739a163e993
-  data.tar.gz: 89c830adfcc482727dea49d243e694d9d6e29ba4071eb6576c20dcafe7d0f76a19d8f6f45d2a021c7e616e36fa256e3ad6f449df3d8713c525fff7b963e7af20
+  metadata.gz: 8836051a97fd3274ca4be7b81b27137a6dbb35de688e006590bac32ef15220499de64151447a16a85fbc38b5bf7c1fb13fd75f3ba72e5b9c45d1926c85612efc
+  data.tar.gz: 639209d198f92ea1151ed15b9c5d756409e661c90c8c84c67414b259f2210f67f1bc776f950caf3304d89eb591de55851e9503ce6e597e54417e113fbfa58d8c

data/README.md

@@ -37,7 +37,7 @@ 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.
+It is possible to use readonly(false) instead of read_master, but it is depricated.
 
 In transaction, All queries go to the master server.
 
@@ -148,6 +148,22 @@ AdminUser and Benefit access to ```admin_slave``` slave group.
 If a model that always access to the master server is exist, You write ```master_db_only!```  in the model.
 The model that master_db_only model's child is always access to master db.
 
+### for Unicorn
+
+```ruby
+before_fork do |server, worker|
+  ...
+  ActiveRecord::Base.clear_all_slave_connections!
+  ...
+end
+
+after_fork do |server, worker|
+  ...
+  ActiveRecord::Base.establish_fresh_connection
+  ...
+end
+```
+
 ### Slave Connection Manager
 Default slave connection manager is FreshConnection::ConnectionManager.
 If you would like to change slave connection manager, assign yourself slave connection manager.
@@ -192,7 +208,6 @@ First of all, you setting the config of the test mysql server in ```spec/databas
 
 ```bash
 bundle install --path .bundle
-GEM_HOME=.bundle/ruby/(your ruby version) gem install bundler --pre
 bundle exec appraisal install
 ```
 

data/fresh_connection.gemspec

@@ -8,17 +8,18 @@ Gem::Specification.new do |spec|
   spec.version       = FreshConnection::VERSION
   spec.authors       = ["Tsukasa OISHI"]
   spec.email         = ["tsukasa.oishi@gmail.com"]
-  spec.description   = %q{https://github.com/tsukasaoishi/fresh_connection}
+
   spec.summary       = %q{FreshConnection supports to connect with Mysql slave servers via Load Balancers.}
+  spec.description   = %q{https://github.com/tsukasaoishi/fresh_connection}
   spec.homepage      = "https://github.com/tsukasaoishi/fresh_connection"
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files`.split($/)
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
-  spec.required_ruby_version = '>= 2.0'
 
+  spec.required_ruby_version = '>= 2.0'
   spec.add_dependency 'activerecord', '>= 3.2.0', '< 4.3'
   spec.add_dependency 'activesupport', '>= 3.2.0', '< 4.3'
   spec.add_dependency 'mysql2', '~> 0.3'
@@ -26,5 +27,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", '~> 10.0'
   spec.add_development_dependency "rspec", '~> 3.0'
-  spec.add_development_dependency 'appraisal', '~> 1.0'
+  spec.add_development_dependency 'appraisal', '~> 2.0'
 end

data/lib/fresh_connection/abstract_connection_manager.rb

@@ -6,17 +6,24 @@ module FreshConnection
       "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.presence || "slave").to_s
+      @slave_group = slave_group.to_s
+      @slave_group = "slave" if @slave_group.empty?
     end
 
     def slave_connection
     end
     undef_method :slave_connection
 
+    def clear_all_connections!
+    end
+    undef_method :clear_all_connections!
+
     def put_aside!
     end
     undef_method :put_aside!
@@ -36,7 +43,7 @@ module FreshConnection
     end
 
     def slave_down_message?(message)
-      /#{EXCEPTION_MESSAGE_WHEN_SLAVE_SERVER_DOWN}/o =~ message
+      /#{EXCEPTION_MESSAGE_WHEN_SLAVE_SERVER_DOWN}/o === message
     end
   end
 end

data/lib/fresh_connection/connection_manager.rb

@@ -11,11 +11,11 @@ module FreshConnection
 
     def put_aside!
       synchronize do
-        if c = slave_connections.delete(current_thread_id)
-          c.disconnect! rescue nil
-        end
+        slave_connections.values.each {|c| c.disconnect! rescue nil }
+        @slave_connections.clear
       end
     end
+    alias_method :clear_all_connections!, :put_aside!
 
     def recovery(failure_connection, exception)
       do_recovery = slave_down_message?(exception.message)

data/lib/fresh_connection/extend/ar_base.rb

@@ -10,9 +10,10 @@ module FreshConnection
         base.slave_connection_handler = FreshConnection::SlaveConnectionHandler.new
       end
 
-      if FreshConnection.rails_4?
+      case ActiveRecord::VERSION::MAJOR
+      when 4
         delegate :read_master, to: :all
-      elsif FreshConnection.rails_3?
+      when 3
         delegate :read_master, to: :scoped
       end
 
@@ -32,6 +33,10 @@ module FreshConnection
         slave_connection_handler.connection(self)
       end
 
+      def clear_all_slave_connections!
+        slave_connection_handler.clear_all_connections!
+      end
+
       def master_db_only!
         @_fresh_connection_master_only = true
       end
@@ -41,7 +46,7 @@ module FreshConnection
           (self != ActiveRecord::Base && superclass.master_db_only?)
       end
 
-      def put_aside!
+      def slave_connection_put_aside!
         slave_connection_handler.put_aside!
       end
 

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

@@ -0,0 +1,31 @@
+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

@@ -0,0 +1,20 @@
+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/ar_relation.rb

@@ -1,17 +1,13 @@
 require 'active_support/deprecation'
+require "fresh_connection/extend/ar_relation/for_rails#{ActiveRecord::VERSION::MAJOR}"
 
 module FreshConnection
   module Extend
     module ArRelation
       def self.prepended(base)
-        if FreshConnection.rails_4?
-          base.__send__(:prepend, ForRails4)
-        elsif FreshConnection.rails_3?
-          base.__send__(:prepend, ForRails3)
-        end
+        base.__send__(:prepend, ForRails)
       end
 
-
       def calculate(operation, column_name, options = {})
         if options[:readonly] == false
           ActiveSupport::Deprecation.warn(":readonly key has been deprecated.", caller)
@@ -43,47 +39,6 @@ module FreshConnection
           super
         end
       end
-
-      module ForRails4
-        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
-
-      module ForRails3
-        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/rack/connection_management.rb

@@ -1,10 +1,22 @@
 module FreshConnection
   module Rack
-    class ConnectionManagement < ActiveRecord::ConnectionAdapters::ConnectionManagement
+    class ConnectionManagement
+      def initialize(app)
+        @app = app
+      end
+
       def call(env)
-        super
-      ensure
-        ActiveRecord::Base.put_aside! unless env.key?("rack.test")
+        testing = env['rack.test']
+
+        response = @app.call(env)
+        response[2] = ::Rack::BodyProxy.new(response[2]) do
+          ActiveRecord::Base.slave_connection_put_aside! unless testing
+        end
+
+        response
+      rescue Exception
+        ActiveRecord::Base.slave_connection_put_aside! unless testing
+        raise
       end
     end
   end

data/lib/fresh_connection/railtie.rb

@@ -3,12 +3,10 @@ require 'fresh_connection/rack/connection_management'
 module FreshConnection
   class Railtie < Rails::Railtie
     initializer "fresh_connection.configure_rails_initialization" do |app|
-      ActiveSupport.on_load(:active_record) do
-        app.config.app_middleware.swap(
-          ActiveRecord::ConnectionAdapters::ConnectionManagement,
-          FreshConnection::Rack::ConnectionManagement
-        )
-      end
+      app.config.app_middleware.insert_before(
+        ActiveRecord::ConnectionAdapters::ConnectionManagement,
+        FreshConnection::Rack::ConnectionManagement
+      )
     end
   end
 end

data/lib/fresh_connection/slave_connection_handler.rb

@@ -16,8 +16,14 @@ module FreshConnection
       detect_connection_manager(klass).slave_connection
     end
 
+    def clear_all_connections!
+      all_connection_managers do |connection_manager|
+        connection_manager.clear_all_connections!
+      end
+    end
+
     def put_aside!
-      @class_to_pool.values.each do |connection_manager|
+      all_connection_managers do |connection_manager|
         connection_manager.put_aside!
       end
     end
@@ -32,6 +38,12 @@ module FreshConnection
 
     private
 
+    def all_connection_managers
+      @class_to_pool.values.each do |connection_manager|
+        yield(connection_manager)
+      end
+    end
+
     def detect_connection_manager(klass)
       c = @class_to_pool[klass.name]
       return c if c

data/lib/fresh_connection/version.rb

@@ -1,4 +1,4 @@
 module FreshConnection
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end
 

data/lib/fresh_connection.rb

@@ -1,4 +1,3 @@
-require 'active_support/deprecation'
 require 'fresh_connection/connection_manager'
 
 module FreshConnection
@@ -8,24 +7,6 @@ module FreshConnection
     def connection_manager
       @connection_manager || ConnectionManager
     end
-
-    def env=(e)
-      ActiveSupport::Deprecation.warn("FreshConnection.env= has been deprecated.", caller)
-      @env = e
-    end
-
-    def env
-      ActiveSupport::Deprecation.warn("FreshConnection.env has been deprecated.", caller)
-      @env || defined?(Rails) && Rails.env
-    end
-
-    def rails_3?
-      ActiveRecord::VERSION::MAJOR == 3
-    end
-
-    def rails_4?
-      ActiveRecord::VERSION::MAJOR == 4
-    end
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fresh_connection
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Tsukasa OISHI
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2015-05-07 00:00:00.000000000 Z
+date: 2015-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -112,14 +112,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 description: https://github.com/tsukasaoishi/fresh_connection
 email:
 - tsukasa.oishi@gmail.com
@@ -147,6 +147,8 @@ files:
 - lib/fresh_connection/extend.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
@@ -155,15 +157,6 @@ files:
 - lib/fresh_connection/slave_connection_handler.rb
 - lib/fresh_connection/version.rb
 - log/.gitkeep
-- spec/database.yml
-- spec/db_schema.sql
-- spec/prepare.rb
-- spec/spec_helper.rb
-- spec/support/active_record_logger.rb
-- spec/unit/access_control_spec.rb
-- spec/unit/ar_base_spec.rb
-- spec/unit/fresh_connection_spec.rb
-- spec/unit/recovery_spec.rb
 homepage: https://github.com/tsukasaoishi/fresh_connection
 licenses:
 - MIT
@@ -188,13 +181,4 @@ rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: FreshConnection supports to connect with Mysql slave servers via Load Balancers.
-test_files:
-- spec/database.yml
-- spec/db_schema.sql
-- spec/prepare.rb
-- spec/spec_helper.rb
-- spec/support/active_record_logger.rb
-- spec/unit/access_control_spec.rb
-- spec/unit/ar_base_spec.rb
-- spec/unit/fresh_connection_spec.rb
-- spec/unit/recovery_spec.rb
+test_files: []

data/spec/database.yml

@@ -1,14 +0,0 @@
-test:
-  adapter: mysql2
-  encoding: utf8
-  database: fresh_connection_test_master
-  pool: 5
-  username: root
-  password:
-
-  slave1:
-    database: fresh_connection_test_slave1
-
-  slave2:
-    database: fresh_connection_test_slave2
-

data/spec/db_schema.sql

@@ -1,296 +0,0 @@
--- MySQL dump 10.13  Distrib 5.6.15, for osx10.9 (x86_64)
---
--- Host: localhost    Database: fresh_connection_test_master
--- ------------------------------------------------------
--- Server version	5.6.15
-
-/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
-/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
-/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!40101 SET NAMES utf8 */;
-/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
-/*!40103 SET TIME_ZONE='+00:00' */;
-/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
-/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
-/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
-/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-
---
--- Current Database: `fresh_connection_test_master`
---
-
-CREATE DATABASE /*!32312 IF NOT EXISTS*/ `fresh_connection_test_master` /*!40100 DEFAULT CHARACTER SET utf8 */;
-
-USE `fresh_connection_test_master`;
-
---
--- Table structure for table `addresses`
---
-
-DROP TABLE IF EXISTS `addresses`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `addresses` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `user_id` int(11) NOT NULL DEFAULT '0',
-  `prefecture` varchar(255) NOT NULL DEFAULT '',
-  `created_at` datetime DEFAULT NULL,
-  `updated_at` datetime DEFAULT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `addresses`
---
-
-LOCK TABLES `addresses` WRITE;
-/*!40000 ALTER TABLE `addresses` DISABLE KEYS */;
-INSERT INTO `addresses` VALUES (1,1,'Tokyo (master)','2014-04-10 07:24:16','2014-04-10 07:24:16');
-/*!40000 ALTER TABLE `addresses` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `tels`
---
-
-DROP TABLE IF EXISTS `tels`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `tels` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `user_id` int(11) NOT NULL DEFAULT '0',
-  `number` varchar(255) NOT NULL DEFAULT '',
-  `created_at` datetime DEFAULT NULL,
-  `updated_at` datetime DEFAULT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `tels`
---
-
-LOCK TABLES `tels` WRITE;
-/*!40000 ALTER TABLE `tels` DISABLE KEYS */;
-INSERT INTO `tels` VALUES (1,1,'03-1111-1111 (master)','2014-04-10 07:24:16','2014-04-10 07:24:16'),(2,1,'03-1111-1112 (master)','2014-04-10 07:24:16','2014-04-10 07:24:16'),(3,1,'03-1111-1113 (master)','2014-04-10 07:24:16','2014-04-10 07:24:16');
-/*!40000 ALTER TABLE `tels` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `users`
---
-
-DROP TABLE IF EXISTS `users`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `users` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `name` varchar(255) NOT NULL DEFAULT '',
-  `created_at` datetime DEFAULT NULL,
-  `updated_at` datetime DEFAULT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `users`
---
-
-LOCK TABLES `users` WRITE;
-/*!40000 ALTER TABLE `users` DISABLE KEYS */;
-INSERT INTO `users` VALUES (1,'Tsukasa (master)','2014-04-10 07:24:16','2014-04-10 07:24:16');
-INSERT INTO `users` VALUES (2,'Other','2015-01-16 07:24:16','2014-04-10 07:24:16');
-/*!40000 ALTER TABLE `users` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Current Database: `fresh_connection_test_slave1`
---
-
-CREATE DATABASE /*!32312 IF NOT EXISTS*/ `fresh_connection_test_slave1` /*!40100 DEFAULT CHARACTER SET utf8 */;
-
-USE `fresh_connection_test_slave1`;
-
---
--- Table structure for table `addresses`
---
-
-DROP TABLE IF EXISTS `addresses`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `addresses` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `user_id` int(11) NOT NULL DEFAULT '0',
-  `prefecture` varchar(255) NOT NULL DEFAULT '',
-  `created_at` datetime DEFAULT NULL,
-  `updated_at` datetime DEFAULT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `addresses`
---
-
-LOCK TABLES `addresses` WRITE;
-/*!40000 ALTER TABLE `addresses` DISABLE KEYS */;
-INSERT INTO `addresses` VALUES (1,1,'Tokyo (slave1)','2014-04-10 07:24:16','2014-04-10 07:24:16');
-/*!40000 ALTER TABLE `addresses` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `tels`
---
-
-DROP TABLE IF EXISTS `tels`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `tels` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `user_id` int(11) NOT NULL DEFAULT '0',
-  `number` varchar(255) NOT NULL DEFAULT '',
-  `created_at` datetime DEFAULT NULL,
-  `updated_at` datetime DEFAULT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `tels`
---
-
-LOCK TABLES `tels` WRITE;
-/*!40000 ALTER TABLE `tels` DISABLE KEYS */;
-INSERT INTO `tels` VALUES (1,1,'03-1111-1111 (slave1)','2014-04-10 07:24:16','2014-04-10 07:24:16'),(2,1,'03-1111-1112 (slave1)','2014-04-10 07:24:16','2014-04-10 07:24:16'),(3,1,'03-1111-1113 (slave1)','2014-04-10 07:24:16','2014-04-10 07:24:16');
-/*!40000 ALTER TABLE `tels` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `users`
---
-
-DROP TABLE IF EXISTS `users`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `users` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `name` varchar(255) NOT NULL DEFAULT '',
-  `created_at` datetime DEFAULT NULL,
-  `updated_at` datetime DEFAULT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `users`
---
-
-LOCK TABLES `users` WRITE;
-/*!40000 ALTER TABLE `users` DISABLE KEYS */;
-INSERT INTO `users` VALUES (1,'Tsukasa (slave1)','2014-04-10 07:24:16','2014-04-10 07:24:16');
-INSERT INTO `users` VALUES (2,'Other','2015-01-16 07:24:16','2014-04-10 07:24:16');
-INSERT INTO `users` VALUES (3,'Other','2015-01-16 07:24:16','2014-04-10 07:24:16');
-/*!40000 ALTER TABLE `users` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Current Database: `fresh_connection_test_slave2`
---
-
-CREATE DATABASE /*!32312 IF NOT EXISTS*/ `fresh_connection_test_slave2` /*!40100 DEFAULT CHARACTER SET utf8 */;
-
-USE `fresh_connection_test_slave2`;
-
---
--- Table structure for table `addresses`
---
-
-DROP TABLE IF EXISTS `addresses`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `addresses` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `user_id` int(11) NOT NULL DEFAULT '0',
-  `prefecture` varchar(255) NOT NULL DEFAULT '',
-  `created_at` datetime DEFAULT NULL,
-  `updated_at` datetime DEFAULT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `addresses`
---
-
-LOCK TABLES `addresses` WRITE;
-/*!40000 ALTER TABLE `addresses` DISABLE KEYS */;
-INSERT INTO `addresses` VALUES (1,1,'Tokyo (slave2)','2014-04-10 07:24:16','2014-04-10 07:24:16');
-/*!40000 ALTER TABLE `addresses` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `tels`
---
-
-DROP TABLE IF EXISTS `tels`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `tels` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `user_id` int(11) NOT NULL DEFAULT '0',
-  `number` varchar(255) NOT NULL DEFAULT '',
-  `created_at` datetime DEFAULT NULL,
-  `updated_at` datetime DEFAULT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `tels`
---
-
-LOCK TABLES `tels` WRITE;
-/*!40000 ALTER TABLE `tels` DISABLE KEYS */;
-INSERT INTO `tels` VALUES (1,1,'03-1111-1111 (slave2)','2014-04-10 07:24:16','2014-04-10 07:24:16'),(2,1,'03-1111-1112 (slave2)','2014-04-10 07:24:16','2014-04-10 07:24:16'),(3,1,'03-1111-1113 (slave2)','2014-04-10 07:24:16','2014-04-10 07:24:16');
-/*!40000 ALTER TABLE `tels` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `users`
---
-
-DROP TABLE IF EXISTS `users`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `users` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `name` varchar(255) NOT NULL DEFAULT '',
-  `created_at` datetime DEFAULT NULL,
-  `updated_at` datetime DEFAULT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `users`
---
-
-LOCK TABLES `users` WRITE;
-/*!40000 ALTER TABLE `users` DISABLE KEYS */;
-INSERT INTO `users` VALUES (1,'Tsukasa (slave2)','2014-04-10 07:24:16','2014-04-10 07:24:16');
-INSERT INTO `users` VALUES (2,'Other','2015-01-16 07:24:16','2014-04-10 07:24:16');
-INSERT INTO `users` VALUES (3,'Other','2015-01-16 07:24:16','2014-04-10 07:24:16');
-/*!40000 ALTER TABLE `users` ENABLE KEYS */;
-UNLOCK TABLES;
-/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
-
-/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
-/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
-/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
-/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
-/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
-/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
-/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-
--- Dump completed on 2014-04-10 21:36:33

data/spec/prepare.rb

@@ -1,35 +0,0 @@
-require 'yaml'
-require 'active_record'
-require 'fresh_connection'
-
-system("mysql -uroot < spec/db_schema.sql")
-
-module ActiveRecord
-  class Base
-    self.configurations = YAML.load_file(File.join(File.dirname(__FILE__), "database.yml"))
-    establish_connection(configurations["test"])
-    establish_fresh_connection :slave1
-  end
-end
-
-class Parent < ActiveRecord::Base
-  self.abstract_class = true
-end
-
-class Slave2 < ActiveRecord::Base
-  self.abstract_class = true
-  establish_fresh_connection :slave2
-end
-
-class User < ActiveRecord::Base
-  has_one :address
-  has_many :tels
-end
-
-class Address < ActiveRecord::Base
-  belongs_to :user
-end
-
-class Tel < Slave2
-  belongs_to :user
-end

data/spec/spec_helper.rb

@@ -1,7 +0,0 @@
-ENV["RAILS_ENV"]="test"
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
-require 'fresh_connection'
-
-require File.join(File.dirname(__FILE__), "prepare.rb")
-
-Dir[File.join(File.dirname(__FILE__), "/support/**/*.rb")].each {|f| require f}

data/spec/support/active_record_logger.rb

@@ -1,3 +0,0 @@
-require 'logger'
-
-ActiveRecord::Base.logger = Logger.new(File.join(File.dirname(__FILE__), '../../log/sql.log'))

data/spec/unit/access_control_spec.rb

@@ -1,63 +0,0 @@
-require 'spec_helper'
-
-describe FreshConnection::AccessControl do
-  before(:each) do
-    @ac = FreshConnection::AccessControl
-  end
-
-  context ".access" do
-    it "persisted first state(slave)" do
-      ret = []
-      @ac.access(true) do
-        @ac.access(true) do
-          ret << @ac.slave_access?
-          @ac.access(false) do
-            ret << @ac.slave_access?
-          end
-        end
-      end
-
-      expect(ret).to be_all{|item| item}
-    end
-
-    it "persisted first state(master)" do
-      ret = []
-      @ac.access(false) do
-        @ac.access(true) do
-          ret << @ac.slave_access?
-          @ac.access(false) do
-            ret << @ac.slave_access?
-          end
-        end
-      end
-
-      expect(ret).to_not be_all{|item| item}
-    end
-
-    it "outside is always master" do
-      ret = []
-      ret << @ac.slave_access?
-      @ac.access(true){}
-      ret << @ac.slave_access?
-
-      expect(ret).to_not be_all{|item| item}
-    end
-  end
-
-  context ".force_master_access" do
-    it "forced master state" do
-      @ac.access(true) do
-        @ac.force_master_access do
-          expect(@ac.slave_access?).to be_falsey
-        end
-      end
-    end
-
-    it "not effect outside" do
-      @ac.access(true) do
-        @ac.force_master_access {}
-        expect(@ac.slave_access?).to be_truthy
-      end
-    end
-  end
-end

data/spec/unit/ar_base_spec.rb

@@ -1,42 +0,0 @@
-require 'spec_helper'
-
-describe ActiveRecord::Base do
-  context ".slave_connection" do
-    it "return Mysql2Adapter object" do
-      expect(User.slave_connection).to be_a(ActiveRecord::ConnectionAdapters::Mysql2Adapter)
-    end
-  end
-
-  context ".slave_group" do
-    class Tel2 < Slave2
-      self.table_name = :tel
-    end
-
-    it "equal group_name of establish_fresh_connection" do
-      expect(User.slave_group).to eq("slave1")
-      expect(Tel.slave_group).to eq("slave2")
-    end
-
-    it "equal 'slave' when not specific group_name" do
-      Tel2.establish_fresh_connection
-      expect(Tel2.slave_group).to eq("slave")
-    end
-  end
-
-  context ".master_db_only?" do
-    class User2 < Parent
-      self.table_name = :users
-    end
-
-    it "childrend of master_db_only class is master_db_only" do
-      expect(User2.master_db_only?).to be_falsey
-      Parent.master_db_only!
-      expect(User2.master_db_only?).to be_truthy
-    end
-
-    it "not effect other class" do
-      Parent.master_db_only!
-      expect(Address.master_db_only?).to be_falsey
-    end
-  end
-end

data/spec/unit/fresh_connection_spec.rb

@@ -1,141 +0,0 @@
-require 'spec_helper'
-
-describe FreshConnection do
-  before(:each) do
-    @user = User.where(id: 1).first
-  end
-
-  context "access to slave" do
-    it "select from User is to access to slave1" do
-      data = [
-        @user.name,
-        Address.first.user.name,
-        Tel.first.user.name,
-      ]
-
-      expect(data).to be_all{|n| n.include?("slave1")}
-    end
-
-    it "select from Address is to access to slave1" do
-      data = [
-        Address.first.prefecture,
-        @user.address.prefecture
-      ]
-
-      expect(data).to be_all{|n| n.include?("slave1")}
-    end
-
-    it "select from Address is to access to slave2" do
-      data = [
-        Tel.first.number,
-        @user.tels.first.number
-      ]
-
-      expect(data).to be_all{|n| n.include?("slave2")}
-    end
-
-    it "select with join is to access to slave1" do
-      name = User.joins(:address).where("addresses.user_id = 1").where(id: 1).first.name
-      expect(name).to be_include("slave1")
-    end
-
-    it "pluck is access to slave1" do
-      expect(User.where(id: 1).pluck(:name).first).to be_include("slave")
-    end
-
-    it "pluck returns empty array when result of condition is empty" do
-      expect(User.limit(0).pluck(:name)).to be_empty
-    end
-
-    it "count is access to slave" do
-      expect(User.where(name: "Other").count).to eq(2)
-    end
-  end
-
-  context "access to master" do
-    it "in transaction" do
-      User.transaction do
-        expect(@user.name).to be_include("slave1")
-        data = [
-          Address.first.user.name,
-          Address.first.prefecture,
-          Tel.first.number,
-          Tel.first.user.name,
-          @user.address.prefecture,
-          @user.tels.first.number,
-          User.joins(:address).where(id: 1).where("addresses.user_id = 1").first.name,
-          User.where(id: 1).pluck(:name).first
-        ]
-        expect(data).to be_all{|n| n.include?("master")}
-
-        expect(User.where(name: "Other").count).to eq(1)
-      end
-    end
-
-    it "specify read_master" do
-      data = [
-        Address.read_master.first.prefecture,
-        Address.includes(:user).read_master.first.user.name,
-        Tel.read_master.first.number,
-        Tel.includes(:user).read_master.first.user.name,
-        @user.tels.read_master.first.number,
-        User.where(id: 1).includes(:tels).read_master.first.tels.first.number,
-        User.where(id: 1).includes(:address).read_master.first.address.prefecture,
-        User.where(id: 1).joins(:address).where("addresses.user_id = 1").read_master.first.name,
-        User.where(id: 1).read_master.pluck(:name).first
-      ]
-
-      expect(data).to be_all{|n| n.include?("master")}
-      expect(User.where(name: "Other").read_master.count).to eq(1)
-    end
-
-    it "specify readonly(false)" do
-      ActiveSupport::Deprecation.silence do
-        data = [
-          Address.readonly(false).first.prefecture,
-          Address.includes(:user).readonly(false).first.user.name,
-          Tel.readonly(false).first.number,
-          Tel.includes(:user).readonly(false).first.user.name,
-          @user.tels.readonly(false).first.number,
-          User.where(id: 1).includes(:tels).readonly(false).first.tels.first.number,
-          User.where(id: 1).includes(:address).readonly(false).first.address.prefecture,
-          User.where(id: 1).joins(:address).where("addresses.user_id = 1").readonly(false).first.name,
-          User.where(id: 1).readonly(false).pluck(:name).first
-        ]
-
-        expect(data).to be_all{|n| n.include?("master")}
-        expect(User.where(name: "Other").readonly(false).count).to eq(1)
-        expect(User.where(name: "Other").count(:readonly => false)).to eq(1)
-      end
-    end
-  end
-
-  context "master_db_only model always access to master" do
-    class Address3 < ActiveRecord::Base
-      self.table_name = "addresses"
-      master_db_only!
-    end
-
-    class Master < ActiveRecord::Base
-      self.abstract_class = true
-      master_db_only!
-    end
-
-    class Tel3 < Master
-      self.table_name = "tels"
-    end
-
-    it "self is master_db_only model" do
-      expect(Address3.first.prefecture).to be_include("master")
-    end
-
-    it "parent is master_db_only model" do
-      expect(Tel3.first.number).to be_include("master")
-    end
-
-    it "not effect other models" do
-      expect(Address.first.prefecture).to be_include("slave1")
-      expect(Tel.first.number).to be_include("slave2")
-    end
-  end
-end

data/spec/unit/recovery_spec.rb

@@ -1,39 +0,0 @@
-require 'spec_helper'
-
-describe "recovery when Mysql down" do
-  class User3 < ActiveRecord::Base
-    self.table_name = "users"
-
-    class << self
-      attr_writer :limit_time
-
-      def slave_connection
-        @access_time ||= 0
-        @access_time += 1
-        if @access_time > limit_time
-          super
-        else
-          raise ActiveRecord::StatementInvalid, "MySQL server has gone away"
-        end
-      end
-
-      def limit_time
-        @limit_time || 1
-      end
-    end
-  end
-
-  it "enable recovery" do
-    User3.limit_time = 1
-    expect {
-      User3.first
-    }.not_to raise_error
-  end
-
-  it "raise exception when retry over" do
-    User3.limit_time = 100
-    expect {
-      User3.first
-    }.to raise_error(ActiveRecord::StatementInvalid)
-  end
-end