fresh_connection 0.0.1 → 0.0.2

data/History.txt

@@ -2,3 +2,8 @@
 
 * 1 major enhancement:
   * Initial release
+
+== 0.0.2 2011-10-18
+
+* Ignore setting support
+* Abolish multi connection

data/README.rdoc

@@ -1,19 +1,19 @@
 = FreshConnection
 
- * https://github.com/tsukasaoishi/fresh_connection
+* https://github.com/tsukasaoishi/fresh_connection
 
 == Description
 
- FreshConnection supports of connect with Mysql slave servers via Load Balancers.
- Currently, I have only tested with Rails2.3.14.
- In the future, I plan to support Rails3.
+FreshConnection supports of connect with Mysql slave servers via Load Balancers.
+Currently, I have only tested with Rails2.3.14.
+In the future, I plan to support Rails3.
 
- All connections will be disconnected every time at the end of the action.
+All connections will be disconnected every time at the end of the action.
 
 == How to use at Rails
 
 === Gemfile
-  gem "fresh_connection", "=0.0.1"
+  gem "fresh_connection", "=0.0.2"
 
 === config/database.yml
   production:
@@ -31,10 +31,8 @@
       username: slave
       password: slave
       host: slave
-      max_connection: 5
 
 slave is config to connect to slave servers.
-max_connection is max connection number to connect to slave.
 Others will use the master setting. If you want to change, write in the slave.
 
 
@@ -42,6 +40,11 @@ Others will use the master setting. If you want to change, write in the slave.
   require 'fresh_connection'
   ActionController::Dispatcher.middleware.swap ActiveRecord::ConnectionAdapters::ConnectionManagement, FreshConnection::Rack::ConnectionManagement
 
+=== config/initializers/fresh_connection.rb
+  FreshConnection::SlaveConnection.ignore_models = %w|Model1 Model2|
+
+If models that ignore access to slave servers is exist, You can write model name at FreshConnection::SlaveConnection.ignore_models.
+
 == Synopis
 Read query will be access to slave server.
   Article.where(:id => 1)

data/fresh_connection.gemspec

@@ -2,12 +2,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fresh_connection}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tsukasa OISHI"]
   s.date = %q{2010-10-16}
-  s.description = %q{MiyazakiResistance is a library like ActiveRecord to use Tokyo Tyrant.}
+  s.description = %q{FreshConnection supports of connect with Mysql slave servers via Load Balancers.}
   s.email = ["tsukasa.oishi@gmail.com"]
   s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.rdoc"]
   s.files = %w|
@@ -19,11 +19,10 @@ Gem::Specification.new do |s|
     rails/initializers/active_record_base.rb
   |
   s.has_rdoc = true
-  s.homepage = %q{http://www.kaeruspoon.net/keywords/MiyazakiResistance}
-  s.post_install_message = %q{PostInstall.txt}
+  s.homepage = %q{https://github.com/tsukasaoishi/fresh_connection}
   s.rdoc_options = ["--main", "README.rdoc"]
   s.require_paths = ["lib"]
-  s.rubyforge_project = %q{miyazakiresistance}
+  s.rubyforge_project = %q{fresh_connection}
   s.rubygems_version = %q{1.3.1}
-  s.summary = %q{MiyazakiResistance is a library like ActiveRecord to use Tokyo Tyrant.}
+  s.summary = %q{FreshConnection supports of connect with Mysql slave servers via Load Balancers.}
 end

data/lib/fresh_connection/slave_connection.rb

@@ -2,51 +2,49 @@ module FreshConnection
   class SlaveConnection
     class << self
       def connection
-        slave_connections[slave_pointer] ||= new_connection
+        slave_connection
       end
 
       def clear_all_connections!
         if @slave_connections.present?
-          @slave_connections.values.each{|conns| conns.each{|c| c.disconnect!}}
+          @slave_connections.each_value{|c| c && c.disconnect! rescue nil}
         end
         @slave_connections = {}
       end
 
       def slave_access_in
-        Thread.current[:slave_access] = true
+        Thread.current[:fresh_connection_slave_access] = true
       end
 
       def slave_access_out
-        Thread.current[:slave_access] = false
+        Thread.current[:fresh_connection_slave_access] = false
       end
 
       def slave_access?
-        Thread.current[:slave_access] ||= false
+        Thread.current[:fresh_connection_slave_access] ||= false
       end
 
-      def shift_slave_pointer
-        Thread.current[:slave_pointer] = slave_pointer + 1
-        Thread.current[:slave_pointer] = 0 if slave_pointer > max_slave_pointer
+      def ignore_models=(model_names)
+        @ignore_models = model_names
       end
-      
-      private
 
-      def new_connection
-        ActiveRecord::Base.send("#{spec["adapter"]}_connection", spec)
+      def ignore_model?(model_name)
+        (@ignore_models || []).include?(model_name)
       end
 
-      def slave_connections
+      private
+
+      def slave_connection
         @slave_connections ||= {}
-        @slave_connections[current_thread_id] ||= []
+        @slave_connections[current_thread_id] ||= new_connection
       end
 
-
-      def slave_pointer
-        Thread.current[:slave_pointer] ||= 0
+      def clear_slave_connection
+        @slave_connections[current_thread_id] = nil
       end
 
-      def max_slave_pointer
-        @max_slave_pointer ||= (spec["max_connection"] || 1) - 1
+      def new_connection
+        ActiveRecord::Base.send("#{spec["adapter"]}_connection", spec)
       end
 
       def spec

data/lib/fresh_connection.rb

@@ -1,5 +1,5 @@
 module FreshConnection
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end
 
 require "fresh_connection/slave_connection"

data/rails/initializers/active_record_base.rb

@@ -64,27 +64,34 @@ module ActiveRecord
       private
 
       def run_on_db(options)
-        in_run_on_db[:go_slave] = go_slave?(options) if in_run_on_db[:count] == 0
-        in_run_on_db[:count] += 1
-
-        in_run_on_db[:go_slave] ? run_on_readonly_db{yield} : yield
+        in_run_on_db(options)
+        run_on_db_status[:go_slave] ? run_on_readonly_db{yield} : yield
       ensure
-        in_run_on_db[:count] -= 1
+        out_run_on_db
+      end
+
+      def in_run_on_db(options)
+        run_on_db_status[:go_slave] = go_slave?(options) if run_on_db_status[:count] == 0
+        run_on_db_status[:count] += 1
+      end
+
+      def out_run_on_db
+        run_on_db_status[:count] -= 1
       end
 
-      def in_run_on_db
-        Thread.current[:in_run_on_db] ||= {:count => 0, :go_slave => false}
+      def run_on_db_status
+        Thread.current[:run_on_db_status] ||= {:count => 0, :go_slave => false}
       end
 
       def go_slave?(options)
-        connection.open_transactions == 0 && (!options.is_a?(Hash) || !options.key?(:readonly) || options[:readonly].nil? || options[:readonly])
+        !FreshConnection::SlaveConnection.ignore_model?(self.name) && connection.open_transactions == 0 &&
+          (!options.is_a?(Hash) || !options.key?(:readonly) || options[:readonly].nil? || options[:readonly])
       end
 
       def run_on_readonly_db
         FreshConnection::SlaveConnection.slave_access_in
         yield
       ensure
-        FreshConnection::SlaveConnection.shift_slave_pointer
         FreshConnection::SlaveConnection.slave_access_out
       end
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fresh_connection
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Tsukasa OISHI
@@ -18,7 +18,7 @@ cert_chain: []
 date: 2010-10-16 00:00:00 Z
 dependencies: []
 
-description: MiyazakiResistance is a library like ActiveRecord to use Tokyo Tyrant.
+description: FreshConnection supports of connect with Mysql slave servers via Load Balancers.
 email: 
 - tsukasa.oishi@gmail.com
 executables: []
@@ -39,10 +39,10 @@ files:
 - History.txt
 - Manifest.txt
 - README.rdoc
-homepage: http://www.kaeruspoon.net/keywords/MiyazakiResistance
+homepage: https://github.com/tsukasaoishi/fresh_connection
 licenses: []
 
-post_install_message: PostInstall.txt
+post_install_message: 
 rdoc_options: 
 - --main
 - README.rdoc
@@ -68,10 +68,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: miyazakiresistance
+rubyforge_project: fresh_connection
 rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
-summary: MiyazakiResistance is a library like ActiveRecord to use Tokyo Tyrant.
+summary: FreshConnection supports of connect with Mysql slave servers via Load Balancers.
 test_files: []