fresh_connection 0.0.7 → 0.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: bb171789539cc2eaf31793f904e53f4c0a9f1114
+  data.tar.gz: be8ef001eec63ca7a879d3950fb460b7f300bdb6
+SHA512:
+  metadata.gz: becd1aed70d40cecaa8155630609e7ec13d9fd62c4f4ce6fb92e4f6e54bdeb025915aa55dc9deb226da2a89f6c0bfb491353dea84b68595bf015599108c8e238
+  data.tar.gz: 4aa63bc28708181c47df8dfd211e6fceb2df57dc2a45d1e053a0594db9d1b82b6d366c0186c77f17f1b8faa80a5fccd26f4d9aa8fe51a88b9a9b0451aee32fcf

data/Gemfile

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

data/LICENSE.txt

@@ -0,0 +1,22 @@
+Copyright (c) 2013 tsukasaoishi
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -0,0 +1,80 @@
+# FreshConnection
+
+FreshConnection supports to connect with Mysql slave servers via Load Balancers.
+All connections will be disconnected every time at the end of the action.
+
+## Installation
+
+### For Rails3
+Add this line to your application's Gemfile:
+
+    gem "fresh_connection"
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install fresh_connection
+
+### For Rails2.3
+
+    $ gem install fresh_connection -v 0.0.7
+
+## Config
+#### config/database.yml
+
+    production:
+      adapter: mysql2
+      encoding: utf8
+      reconnect: true
+      database: kaeru
+      pool: 5
+      username: master
+      password: master
+      host: localhost
+      socket: /var/run/mysqld/mysqld.sock
+
+      slave:
+        username: slave
+        password: slave
+        host: slave
+
+slave is config to connect to slave servers.
+Others will use the master setting. If you want to change, write in the slave.
+
+### 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.
+
+### use config/environment.rb if rails2.3
+
+    require 'fresh_connection'
+    ActionController::Dispatcher.middleware.swap ActiveRecord::ConnectionAdapters::ConnectionManagement, FreshConnection::Rack::ConnectionManagement
+
+## Usage
+Read query will be access to slave server.
+
+    Article.where(:id => 1)
+
+If you want to access to master saver, use readonly(false).
+
+    Article.where(:id => 1).readonly(false)
+
+In transaction, Always will be access to master server.
+
+    Article.transaction do
+      Article.where(:id => 1)
+    end
+
+
+## Contributing
+
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request

data/Rakefile

@@ -1,27 +1 @@
-%w[rubygems rake rake/clean fileutils newgem rubigen].each { |f| require f }
-require File.dirname(__FILE__) + '/lib/fresh_connection'
-
-# Generate all the Rake tasks
-# Run 'rake -T' to see list of generated tasks (from gem root directory)
-$hoe = Hoe.new('fresh_connection', FreshConnection::VERSION) do |p|
-  p.developer('Tsukasa OISHI', 'tsukasa.oishi@gmail.com')
-  p.changes              = p.paragraphs_of("History.txt", 0..1).join("\n\n")
-  p.rubyforge_name       = p.name # TODO this is default value
-  # p.extra_deps         = [
-  #   ['activesupport','>= 2.0.2'],
-  # ]
-  p.extra_dev_deps = [
-    ['newgem', ">= #{::Newgem::VERSION}"]
-  ]
-  
-  p.clean_globs |= %w[**/.DS_Store tmp *.log]
-  path = (p.rubyforge_name == p.name) ? p.rubyforge_name : "\#{p.rubyforge_name}/\#{p.name}"
-  p.remote_rdoc_dir = File.join(path.gsub(/^#{p.rubyforge_name}\/?/,''), 'rdoc')
-  p.rsync_args = '-av --delete --ignore-errors'
-end
-
-require 'newgem/tasks' # load /tasks/*.rake
-Dir['tasks/**/*.rake'].each { |t| load t }
-
-# TODO - want other tests/tasks run by default? Add them to the list
-# task :default => [:spec, :features]
+require "bundler/gem_tasks"

data/fresh_connection.gemspec

@@ -1,28 +1,25 @@
-# -*- encoding: utf-8 -*-
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'fresh_connection/version'
 
-Gem::Specification.new do |s|
-  s.name = %q{fresh_connection}
-  s.version = "0.0.7"
+Gem::Specification.new do |spec|
+  spec.name          = "fresh_connection"
+  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.homepage      = "https://github.com/tsukasaoishi/fresh_connection"
+  spec.license       = "MIT"
 
-  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{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|
-    Rakefile
-    fresh_connection.gemspec
-    lib/fresh_connection.rb
-    lib/fresh_connection/slave_connection.rb
-    lib/fresh_connection/rack/connection_management.rb
-    rails/initializers/active_record_base.rb
-  |
-  s.has_rdoc = true
-  s.homepage = %q{https://github.com/tsukasaoishi/fresh_connection}
-  s.rdoc_options = ["--main", "README.rdoc"]
-  s.require_paths = ["lib"]
-  s.rubyforge_project = %q{fresh_connection}
-  s.rubygems_version = %q{1.3.1}
-  s.summary = %q{FreshConnection supports of connect with Mysql slave servers via Load Balancers.}
+  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.require_paths = ["lib"]
+
+  spec.add_dependency 'activerecord', '~> 3.2.0'
+
+  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "rake"
 end

data/lib/fresh_connection/active_record/abstract_adapter.rb

@@ -0,0 +1,24 @@
+module ActiveRecord
+  module ConnectionAdapters
+    class AbstractAdapter
+      def select_all_with_slave_connection(arel, name = nil, binds = [])
+        if FreshConnection::SlaveConnection.slave_access?
+          change_connection {select_all_without_slave_connection(arel, "[slave] #{name}", binds)}
+        else
+          select_all_without_slave_connection(arel, name, binds)
+        end
+      end
+      alias_method_chain :select_all, :slave_connection
+
+      private
+
+      def change_connection
+        master_con, @connection =
+          @connection, FreshConnection::SlaveConnection.connection.raw_connection
+        yield
+      ensure
+        @connection = master_con
+      end
+    end
+  end
+end

data/lib/fresh_connection/active_record/mysql2_adapter.rb

@@ -0,0 +1,14 @@
+require 'active_record/connection_adapters/mysql2_adapter'
+
+module ActiveRecord
+  module ConnectionAdapters
+    class Mysql2Adapter < AbstractMysqlAdapter
+      private
+
+      def configure_connection_with_ignore
+        configure_connection_without_ignore unless FreshConnection::SlaveConnection.ignore_configure_connection?
+      end
+      alias_method_chain :configure_connection, :ignore
+    end
+  end
+end

data/lib/fresh_connection/active_record/relation.rb

@@ -0,0 +1,22 @@
+module ActiveRecord
+  class Relation
+    private
+
+    def exec_queries_with_slave_connection
+      return @records if loaded?
+
+      if FreshConnection::SlaveConnection.ignore_model?(@klass.name)
+        FreshConnection::SlaveConnection.force_master_access { exec_queries_without_slave_connection }
+      elsif go_slave?
+        FreshConnection::SlaveConnection.slave_access { exec_queries_without_slave_connection }
+      else
+        FreshConnection::SlaveConnection.master_access { exec_queries_without_slave_connection }
+      end
+    end
+    alias_method_chain :exec_queries, :slave_connection
+
+    def go_slave?
+      connection.open_transactions == 0 && (@readonly_value.nil? || @readonly_value)
+    end
+  end
+end

data/lib/fresh_connection/railtie.rb

@@ -0,0 +1,10 @@
+module FreshConnection
+  class Railtie < Rails::Railtie
+    initializer "fresh_connection.configure_rails_initialization" do |app|
+      app.config.middleware.swap(
+        ActiveRecord::ConnectionAdapters::ConnectionManagement,
+        FreshConnection::Rack::ConnectionManagement
+      )
+    end
+  end
+end

data/lib/fresh_connection/slave_connection.rb

@@ -1,5 +1,8 @@
 module FreshConnection
   class SlaveConnection
+    COUNT = :fresh_connection_access_count
+    TARGET = :fresh_connection_access_target
+
     class << self
       attr_writer :ignore_models, :ignore_configure_connection, :master_clear_connection
 
@@ -14,16 +17,30 @@ module FreshConnection
         @slave_connections = {}
       end
 
-      def slave_access_in
-        Thread.current[:fresh_connection_slave_access] = true
+      def slave_access
+        access_in(:slave)
+        yield
+      ensure
+        access_out
+      end
+
+      def master_access
+        access_in(:master)
+        yield
+      ensure
+        access_out
       end
 
-      def slave_access_out
-        Thread.current[:fresh_connection_slave_access] = false
+      def force_master_access
+        now_target = Thread.current[TARGET]
+        Thread.current[TARGET] = :master
+        yield
+      ensure
+        Thread.current[TARGET] = now_target
       end
 
       def slave_access?
-        Thread.current[:fresh_connection_slave_access] ||= false
+        Thread.current[TARGET] == :slave
       end
 
       def ignore_model?(model_name)
@@ -35,20 +52,30 @@ module FreshConnection
       end
 
       def master_clear_connection?
-        @master_clear_connection.nil? || @master_clear_connection
+        @master_clear_connection || false
       end
 
       private
 
+      def access_in(target)
+        Thread.current[COUNT] = (Thread.current[COUNT] || 0) + 1
+        Thread.current[TARGET] ||= target
+      end
+
+      def access_out
+        Thread.current[COUNT] -= 1
+        if Thread.current[COUNT] == 0
+          Thread.current[TARGET] = nil
+          Thread.current[COUNT] = nil
+        end
+      end
+
+
       def slave_connection
         @slave_connections ||= {}
         @slave_connections[current_thread_id] ||= new_connection
       end
 
-      def clear_slave_connection
-        @slave_connections[current_thread_id] = nil
-      end
-
       def new_connection
         ActiveRecord::Base.send("#{spec["adapter"]}_connection", spec)
       end

data/lib/fresh_connection/version.rb

@@ -0,0 +1,4 @@
+module FreshConnection
+  VERSION = "0.1.0"
+end
+

data/lib/fresh_connection.rb

@@ -1,8 +1,8 @@
-module FreshConnection
-  VERSION = "0.0.5"
-end
-
+require "fresh_connection/version"
 require "fresh_connection/slave_connection"
 require "fresh_connection/rack/connection_management"
+require "fresh_connection/active_record/relation"
+require "fresh_connection/active_record/abstract_adapter"
+require "fresh_connection/active_record/mysql2_adapter"
 
-Dir.glob("#{File.join(File.dirname(__FILE__), "../rails/initializers")}/*.rb").each{|path| require path}
+require "fresh_connection/railtie.rb" if defined?(Rails)

metadata

@@ -1,60 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: fresh_connection
 version: !ruby/object:Gem::Version
-  version: 0.0.7
-  prerelease: 
+  version: 0.1.0
 platform: ruby
 authors:
 - Tsukasa OISHI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2010-10-16 00:00:00.000000000 Z
-dependencies: []
-description: FreshConnection supports of connect with Mysql slave servers via Load
-  Balancers.
+date: 2013-12-07 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
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rake
+  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
 email:
 - tsukasa.oishi@gmail.com
 executables: []
 extensions: []
-extra_rdoc_files:
-- History.txt
-- Manifest.txt
-- README.rdoc
+extra_rdoc_files: []
 files:
+- Gemfile
+- LICENSE.txt
+- README.md
 - Rakefile
 - fresh_connection.gemspec
 - lib/fresh_connection.rb
-- lib/fresh_connection/slave_connection.rb
+- 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/rack/connection_management.rb
-- rails/initializers/active_record_base.rb
-- History.txt
-- Manifest.txt
-- README.rdoc
+- lib/fresh_connection/railtie.rb
+- lib/fresh_connection/slave_connection.rb
+- lib/fresh_connection/version.rb
 homepage: https://github.com/tsukasaoishi/fresh_connection
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
-rdoc_options:
-- --main
-- README.rdoc
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: fresh_connection
-rubygems_version: 1.8.23
+rubyforge_project: 
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
-summary: FreshConnection supports of connect with Mysql slave servers via Load Balancers.
+specification_version: 4
+summary: FreshConnection supports to connect with Mysql slave servers via Load Balancers.
 test_files: []

data/History.txt

@@ -1,13 +0,0 @@
-== 0.0.1 2011-10-16
-
-* 1 major enhancement:
-  * Initial release
-
-== 0.0.2 2011-10-18
-
-* Ignore setting support
-* Abolish multi connection
-
-== 0.0.3 2012-05-23
-
-* Ignore Configure Connection

data/Manifest.txt

@@ -1,9 +0,0 @@
-History.txt
-Manifest.txt
-README
-Rakefile
-fresh_connection.gemspec
-lib/fresh_connection.rb
-lib/fresh_connection/slave_connection.rb
-lib/fresh_connection/rack/connection_management.rb
-rails/initializers/active_record_base.rb

data/README.rdoc

@@ -1,60 +0,0 @@
-= FreshConnection
-
-* 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.
-
-All connections will be disconnected every time at the end of the action.
-
-== How to use at Rails
-
-=== Gemfile
-  gem "fresh_connection", "=0.0.2"
-
-=== config/database.yml
-  production:
-    adapter: mysql
-    encoding: utf8
-    reconnect: true
-    database: kaeru
-    pool: 5
-    username: master
-    password: master
-    host: localhost
-    socket: /var/run/mysqld/mysqld.sock
-
-    slave:
-      username: slave
-      password: slave
-      host: slave
-
-slave is config to connect to slave servers.
-Others will use the master setting. If you want to change, write in the slave.
-
-
-=== config/environment.rb
-  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)
-
-If you want to access to master saver, use readonly(false).
-  Article.where(:id => 1).readonly(false)
-
-In transaction, Always will be access to master server.
-  Article.transaction do
-    Article.where(:id => 1)
-  end
-
-

data/rails/initializers/active_record_base.rb

@@ -1,109 +0,0 @@
-module ActiveRecord
-  module ConnectionAdapters
-    class AbstractAdapter
-      def select_all_with_slave_cluster(*args)
-        if FreshConnection::SlaveConnection.slave_access?
-          change_connection {select_all_without_slave_cluster(*args)}
-        else
-          select_all_without_slave_cluster(*args)
-        end
-      end
-      alias_method_chain :select_all, :slave_cluster
-
-      def columns_with_slave_cluster(*args)
-        if FreshConnection::SlaveConnection.slave_access?
-          change_connection {columns_without_slave_cluster(*args)}
-        else
-          columns_without_slave_cluster(*args)
-        end
-      end
-      alias_method_chain :columns, :slave_cluster
-
-      def log_info_with_slave_cluster(sql, name, ms)
-        name = "[MASTER] " + (name || "SQL") if !FreshConnection::SlaveConnection.slave_access? && name != "CACHE"
-        log_info_without_slave_cluster(sql, name, ms)
-      end
-      alias_method_chain :log_info, :slave_cluster
-
-      private
-
-      def change_connection
-        master_con, @connection = @connection, FreshConnection::SlaveConnection.connection.raw_connection
-        yield
-      ensure
-        @connection = master_con
-      end
-    end
-
-    class MysqlAdapter < AbstractAdapter
-      private
-
-      def configure_connection_with_ignore
-        configure_connection_without_ignore unless FreshConnection::SlaveConnection.ignore_configure_connection?
-      end
-      alias_method_chain :configure_connection, :ignore
-    end
-  end
-
-  class Base
-    class << self
-      def find_every_with_slave_cluster(options)
-        run_on_db(options) { find_every_without_slave_cluster(options) }
-      end
-      alias_method_chain :find_every, :slave_cluster
-
-      def find_by_sql_with_slave_cluster(sql, options = nil)
-        run_on_db(options) { find_by_sql_without_slave_cluster(sql) }
-      end
-      alias_method_chain :find_by_sql, :slave_cluster
-
-      def count_by_sql_with_slave_cluster(sql, options = nil)
-        run_on_db(options) { count_by_sql_without_slave_cluster(sql) }
-      end
-      alias_method_chain :count_by_sql, :slave_cluster
-
-      def calculate_with_slave_cluster(operation, column_name, options = {})
-        run_on_db(options) do
-          options.delete(:readonly)
-          calculate_without_slave_cluster(operation, column_name, options)
-        end
-      end
-      alias_method_chain :calculate, :slave_cluster
-
-      private
-
-      def run_on_db(options)
-        in_run_on_db(options)
-        run_on_db_status[:go_slave] ? run_on_readonly_db{yield} : yield
-      ensure
-        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 run_on_db_status
-        Thread.current[:run_on_db_status] ||= {:count => 0, :go_slave => false}
-      end
-
-      def go_slave?(options)
-        !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.slave_access_out
-      end
-    end
-  end
-end
-