fresh_connection 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3707472745859247112e68f0b348876811dcea97
-  data.tar.gz: 032461a6457f8ff4b5f566ef54e4ace7160aeebd
+  metadata.gz: 5020cb29611bf24a7ee6063ce70c1df0c58fc241
+  data.tar.gz: 2c4e322e659d9cb8cc96c71a670c8cfff55bcbc7
 SHA512:
-  metadata.gz: 504d3589083726b6403c1e828dbe5d4b692e6b0bd695c21422a23daad8f6427dc8151fb9f00dd1dd18c4929189dbbf621d736e7fc176b52fa9fe8f7d17e87649
-  data.tar.gz: ead47efa46d780b2a1e0586c2a5be2347c1f4e8bf7a47323d38cd8b90d9f33af344d874642792a8c59ba01b3444627f24bca04ad33825b7a1c67a708c359076f
+  metadata.gz: a9e952072b5549d5b36fb2702f9ddee6a0299b9e8360c9efb668afd7b5684d5d214d79f17d82fc619185de642668a03cdd74d046a119afebe4f3c75c274d7afe
+  data.tar.gz: 886a5c6650c1fc07cdce4191b0b3d00b808dc3219cb1169f62b0a2027d4c72b529b7779241e64085d0122d283b5bc4d85597067501429d8e5f3ffa1c05714ccb

data/README.md

@@ -5,7 +5,7 @@ All connections will be disconnected every time at the end of the action.
 
 ## Installation
 
-### For Rails3
+### For Rails3 and 4
 Add this line to your application's Gemfile:
 
     gem "fresh_connection"
@@ -23,7 +23,7 @@ Or install it yourself as:
     $ gem install fresh_connection -v 0.0.7
 
 ## Config
-#### config/database.yml
+### config/database.yml
 
     production:
       adapter: mysql2
@@ -50,10 +50,24 @@ Others will use the master setting. If you want to change, write in the slave.
 
 If models that ignore access to slave servers is exist, You can write model name at FreshConnection::SlaveConnection.ignore models.
 
-### use config/environment.rb if rails2.3
+### Slave Connection Manager
+Default slave connection manager is FreshConnection::ConnectionManager.
+If you would like to change slave connection manager, assign yourself slave connection manager.
 
-    require 'fresh_connection'
-    ActionController::Dispatcher.middleware.swap ActiveRecord::ConnectionAdapters::ConnectionManagement, FreshConnection::Rack::ConnectionManagement
+#### config/initializers/fresh_connection.rb
+
+    FreshConnection::SlaveConnection.connection_manager = MySlaveConnection
+
+
+Yourself Slave Connection Manager is required any instance methods.
+
+    def slave_connection
+      # must return object of ActiveRecord::ConnectionAdapters::Mysql2Adapter
+    end
+
+    def put_aside!
+      # called when end of Rails controller action
+    end
 
 ## Usage
 Read query will be access to slave server.
@@ -71,6 +85,7 @@ In transaction, Always will be access to master server.
     end
 
 
+
 ## Contributing
 
 1. Fork it

data/lib/fresh_connection/connection_manager.rb

@@ -0,0 +1,34 @@
+module FreshConnection
+  class ConnectionManager
+    def slave_connection
+      @slave_connections ||= {}
+      @slave_connections[current_thread_id] ||= new_connection
+    end
+
+    def put_aside!
+      if @slave_connections.present?
+        @slave_connections.each_value{|c| c && c.disconnect! rescue nil}
+      end
+      @slave_connections = {}
+    end
+
+    private
+
+    def new_connection
+      ActiveRecord::Base.send("#{spec["adapter"]}_connection", spec)
+    end
+
+    def spec
+      @spec ||= get_spec
+    end
+
+    def get_spec
+      ret = ActiveRecord::Base.configurations[Rails.env]
+      ret.merge(ret["slave"] || {})
+    end
+
+    def current_thread_id
+      Thread.current.object_id
+    end
+  end
+end

data/lib/fresh_connection/rack/connection_management.rb

@@ -1,21 +1,10 @@
 module FreshConnection
   module Rack
-    class ConnectionManagement
-      def initialize(app)
-        @app = app
-      end
-
+    class ConnectionManagement < ActiveRecord::ConnectionAdapters::ConnectionManagement
       def call(env)
-        @app.call(env)
+        super
       ensure
-        unless env.key?("rack.test")
-          if FreshConnection::SlaveConnection.master_clear_connection?
-            ActiveRecord::Base.clear_all_connections!
-          else
-            ActiveRecord::Base.clear_active_connections!
-          end
-          FreshConnection::SlaveConnection.clear_all_connections!
-        end
+        FreshConnection::SlaveConnection.put_aside! unless env.key?("rack.test")
       end
     end
   end

data/lib/fresh_connection/slave_connection.rb

@@ -4,17 +4,18 @@ module FreshConnection
     TARGET = :fresh_connection_access_target
 
     class << self
-      attr_writer :ignore_models, :ignore_configure_connection, :master_clear_connection
+      attr_writer :ignore_models, :ignore_configure_connection
 
       def raw_connection
         slave_connection.raw_connection
       end
 
-      def clear_all_connections!
-        if @slave_connections.present?
-          @slave_connections.each_value{|c| c && c.disconnect! rescue nil}
-        end
-        @slave_connections = {}
+      def slave_connection
+        connection_manager.slave_connection
+      end
+
+      def put_aside!
+        connection_manager.put_aside!
       end
 
       def manage_access(model_name, go_slave, &block)
@@ -43,8 +44,8 @@ module FreshConnection
         !!@ignore_configure_connection
       end
 
-      def master_clear_connection?
-        @master_clear_connection || false
+      def connection_manager=(manager)
+        @connection_manager_class = manager
       end
 
       private
@@ -70,26 +71,9 @@ module FreshConnection
         end
       end
 
-      def slave_connection
-        @slave_connections ||= {}
-        @slave_connections[current_thread_id] ||= new_connection
-      end
-
-      def new_connection
-        ActiveRecord::Base.send("#{spec["adapter"]}_connection", spec)
-      end
-
-      def spec
-        @spec ||= get_spec
-      end
-
-      def get_spec
-        ret = ActiveRecord::Base.configurations[Rails.env]
-        ret.merge(ret["slave"] || {})
-      end
-
-      def current_thread_id
-        Thread.current.object_id
+      def connection_manager
+        @connection_manager ||=
+          (@connection_manager_class || FreshConnection::ConnectionManager).new
       end
     end
   end

data/lib/fresh_connection/version.rb

@@ -1,4 +1,4 @@
 module FreshConnection
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end
 

data/lib/fresh_connection.rb

@@ -1,4 +1,5 @@
 require "fresh_connection/version"
+require "fresh_connection/connection_manager"
 require "fresh_connection/slave_connection"
 require "fresh_connection/rack/connection_management"
 require "fresh_connection/active_record/relation"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fresh_connection
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Tsukasa OISHI
@@ -68,6 +68,7 @@ files:
 - lib/fresh_connection/active_record/abstract_adapter.rb
 - lib/fresh_connection/active_record/mysql2_adapter.rb
 - lib/fresh_connection/active_record/relation.rb
+- lib/fresh_connection/connection_manager.rb
 - lib/fresh_connection/rack/connection_management.rb
 - lib/fresh_connection/railtie.rb
 - lib/fresh_connection/slave_connection.rb