fresh_connection 0.1.8 → 0.2.0

data/lib/fresh_connection/extend/mysql2_adapter.rb

@@ -0,0 +1,46 @@
+module FreshConnection
+  module Extend
+    module Mysql2Adapter
+      def self.included(base)
+        base.__send__(:attr_writer, :model_class)
+        base.alias_method_chain :configure_connection, :fresh_connection
+      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 < FreshConnection.retry_limit
+          end
+
+          raise
+        end
+      ensure
+        @connection = master_connection
+      end
+
+      def configure_connection_with_fresh_connection
+        return if FreshConnection.ignore_configure_connection?
+        configure_connection_without_fresh_connection
+      end
+    end
+  end
+end

data/lib/fresh_connection/initializer.rb

@@ -0,0 +1,35 @@
+require 'active_record/connection_adapters/mysql2_adapter'
+require 'fresh_connection/rack/connection_management'
+require 'fresh_connection/extend/ar_base'
+require 'fresh_connection/extend/ar_relation'
+require 'fresh_connection/extend/connection_handler'
+require 'fresh_connection/extend/mysql2_adapter'
+
+module FreshConnection
+  class Initializer
+    class << self
+      def swap_rack(app)
+        app.config.middleware.swap(
+          ActiveRecord::ConnectionAdapters::ConnectionManagement,
+          FreshConnection::Rack::ConnectionManagement
+        )
+      end
+
+      def extend_active_record
+        ActiveRecord::Base.extend FreshConnection::Extend::ArBase
+
+        ActiveRecord::Relation.__send__(:include, FreshConnection::Extend::ArRelation)
+
+        ActiveRecord::ConnectionAdapters::ConnectionHandler.__send__(
+          :include, FreshConnection::Extend::ConnectionHandler
+        )
+
+        ActiveRecord::ConnectionAdapters::Mysql2Adapter.__send__(
+          :include, FreshConnection::Extend::Mysql2Adapter
+        )
+
+        ActiveRecord::Base.establish_fresh_connection
+      end
+    end
+  end
+end

data/lib/fresh_connection/rack/connection_management.rb

@@ -4,7 +4,7 @@ module FreshConnection
       def call(env)
         super
       ensure
-        FreshConnection::SlaveConnection.put_aside! unless env.key?("rack.test")
+        ActiveRecord::Base.put_aside! unless env.key?("rack.test")
       end
     end
   end

data/lib/fresh_connection/railtie.rb

@@ -1,10 +1,13 @@
+require 'rails'
+
 module FreshConnection
   class Railtie < Rails::Railtie
     initializer "fresh_connection.configure_rails_initialization" do |app|
-      app.config.middleware.swap(
-        ActiveRecord::ConnectionAdapters::ConnectionManagement,
-        FreshConnection::Rack::ConnectionManagement
-      )
+      Initializer.swap_rack(app)
+
+      ActiveSupport.on_load(:active_record) do
+        Initializer.extend_active_record
+      end
     end
   end
 end

data/lib/fresh_connection/slave_connection.rb

@@ -1,89 +1,53 @@
+require 'active_support/deprecation'
+
 module FreshConnection
+  #
+  # This class has been deprecated.
+  # It will delete at next version.
+  #
   class SlaveConnection
-    COUNT = :fresh_connection_access_count
-    TARGET = :fresh_connection_access_target
-    RETRY_LIMIT = 10
-
     class << self
-      attr_writer :ignore_models, :ignore_configure_connection
-
-      delegate :slave_connection, :put_aside!, :recoverable?, :recovery, :to => :connection_manager
-
-      def manage_access(model_klass, go_slave, &block)
-        if ignore_model?(model_klass)
-          force_master_access(&block)
-        else
-          target = go_slave ? :slave : :master
-          begin
-            access_in(target)
-            block.call
-          ensure
-            access_out
+      def ignore_models=(models)
+        deprecation("ignore_models=", "ActiveRecord::Base.master_db_only!")
+        models.each do |model|
+          if model.is_a?(String)
+            model.constantize.master_db_only!
+          elsif model.ancestors.include?(ActiveRecord::Base)
+            model.master_db_only!
           end
         end
       end
 
-      def slave_access?
-        Thread.current[TARGET] == :slave
-      end
-
-      def ignore_model?(model_klass)
-        @cached_ignore_model ||= {}
-        return @cached_ignore_model[model_klass] if @cached_ignore_model.has_key?(model_klass)
-
-        @cached_ignore_model[model_klass] = check_ignore_model(model_klass)
-      end
-
-      def ignore_configure_connection?
-        !!@ignore_configure_connection
+      def ignore_configure_connection=(flag)
+        deprecation("ignore_configure_connection=", "FreshConnection.ignore_configure_connection=")
+        FreshConnection.ignore_configure_connection = flag
       end
 
       def connection_manager=(manager)
-        @connection_manager_class = manager
+        deprecation("connection_manager=", "FreshConnection.connection_manager=")
+        FreshConnection.connection_manager = manager
       end
 
-      def retry_limit
-        RETRY_LIMIT
+      def slave_connection
+        raise_deprecation_exception("slave_connection", "ArtiveRecord::Base.slave_connection")
       end
 
       private
 
-      def force_master_access
-        now_target = Thread.current[TARGET]
-        Thread.current[TARGET] = :master
-        yield
-      ensure
-        Thread.current[TARGET] = now_target
-      end
-
-      def access_in(target)
-        Thread.current[COUNT] = (Thread.current[COUNT] || 0) + 1
-        Thread.current[TARGET] ||= target
+      def deprecation(method_name, instead_method)
+        ActiveSupport::Deprecation.warn(deprecation_message(method_name, instead_method))
       end
 
-      def access_out
-        Thread.current[COUNT] -= 1
-        if Thread.current[COUNT] == 0
-          Thread.current[TARGET] = nil
-          Thread.current[COUNT] = nil
+      def raise_deprecation_exception(method_name, instead_method)
+        if defined?(ActiveSupport::DeprecationException)
+          raise ActiveSupport::DeprecationException, deprecation_message(method_name, instead_method)
+        else
+          raise "ActiveSupport::DeprecationException: #{deprecation_message(method_name, instead_method)}"
         end
       end
 
-      def connection_manager
-        @connection_manager ||=
-          (@connection_manager_class || FreshConnection::ConnectionManager).new
-      end
-
-      def check_ignore_model(model_klass)
-        (@ignore_models || []).one? do |ignore_model|
-          if ignore_model.is_a?(String)
-            ignore_model == model_klass.name
-          elsif ignore_model.ancestors.include?(ActiveRecord::Base)
-            model_klass.ancestors.include?(ignore_model)
-          else
-            false
-          end
-        end
+      def deprecation_message(method_name, instead_method)
+        "FreshConnection::SlaveConnection.#{method_name} has been deprecated. Use #{instead_method} instead"
       end
     end
   end

data/lib/fresh_connection/slave_connection_handler.rb

@@ -0,0 +1,43 @@
+module FreshConnection
+  class SlaveConnectionHandler
+    def initialize
+      @class_to_pool = {}
+    end
+
+    def establish_connection(name, slave_group)
+      if cm = @class_to_pool[name]
+        cm.put_aside!
+      end
+
+      @class_to_pool[name] = FreshConnection.connection_manager.new(slave_group)
+    end
+
+    def connection(klass)
+      detect_connection_manager(klass).slave_connection
+    end
+
+    def put_aside!
+      @class_to_pool.values.each 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
+
+    private
+
+    def detect_connection_manager(klass)
+      c = @class_to_pool[klass.name]
+      return c if c
+      return nil if ActiveRecord::Base == klass
+      detect_connection_manager(klass.superclass)
+    end
+  end
+end
+

data/lib/fresh_connection/version.rb

@@ -1,4 +1,4 @@
 module FreshConnection
-  VERSION = "0.1.8"
+  VERSION = "0.2.0"
 end
 

data/spec/database.yml

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

@@ -0,0 +1,291 @@
+-- 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');
+/*!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');
+/*!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');
+/*!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