fresh_connection 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 857d0d9ba24df51680f684b69af3c6c48225e949
-  data.tar.gz: 7007d1b834443414e39bedcaedea38c986d7f5bc
+  metadata.gz: 2999ecd43189e483dd9e76457c90598f3056977c
+  data.tar.gz: 2cf79d1a5a80c898bc45154f41c8f6bbc8ab58e4
 SHA512:
-  metadata.gz: 2df9731b1f0d52e9d18bc7277cd4bd701ad0a91f38330a6a0704c24a5f1d3c3d0455a174880eb1a85be710af282730a6f86c5ff382bc49b876b2b688d6a919cb
-  data.tar.gz: e9dfd6f0ce0995d85b0bffe2b68a1b17be89efff305ba18ab6a77becec66a707cd3586a05719bf8c0035cfbe4dbe2f3ee6014489491d2b7a1a95956bf1ef8305
+  metadata.gz: 7410aef62e7d1d41a51c0d47574ac053d7662a88d56ab6660396743929df8ed63baedb760f7954935b07313a5f500833e509d54336136bdd7868a51622bc2f0b
+  data.tar.gz: abe0ef9651146312f7513f8a6ae49bb6ebde58df48077699396cad5a46ccc86480219671ec34595edeb41d62d9cf1153408b98169502db2672691a3cd7008747

data/Appraisals

@@ -1,17 +1,17 @@
 appraise "rails3" do
   gem "activerecord", "~> 3.2.0"
   gem "activesupport", "~> 3.2.0"
-  gem "railties", "~> 3.2.0"
+  gem "mysql2", "~> 0.3"
 end
 
 appraise "rails40" do
   gem "activerecord", "~> 4.0.0"
   gem "activesupport", "~> 4.0.0"
-  gem "railties", "~> 4.0.0"
+  gem "mysql2", "~> 0.3"
 end
 
 appraise "rails41" do
   gem "activerecord", "~> 4.1.0"
   gem "activesupport", "~> 4.1.0"
-  gem "railties", "~> 4.1.0"
+  gem "mysql2", "~> 0.3"
 end

data/README.md

@@ -1,11 +1,11 @@
 # 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.
+All connections will be disconnected every time at the end of the Rails controller's action.
+FreshConnection does not support Rails 2.x.
 
 ## Installation
 
-### For Rails3 and 4
 Add this line to your application's Gemfile:
 
     gem "fresh_connection"
@@ -38,11 +38,11 @@ Or install it yourself as:
         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.
+```slave``` is a config to connect to slave servers.
+Others will use the master server setting.
 
 ### use multiple slave servers group
-If you may want to user multiple slave group, write multiple slave group to config/database.yml. 
+If you may want to use multiple slave groups, write the config to ```config/database.yml```.
 
     production:
       adapter: mysql2
@@ -65,13 +65,13 @@ If you may want to user multiple slave group, write multiple slave group to conf
         password: slave
         host: admin_slaves
 
-And call establish_fresh_connection method in model that access to ```admin_slave``` slave group.
+And call the establish_fresh_connection method in a model that access to ```admin_slave``` slave group.
 
     class AdminUser < ActiveRecord::Base
       establish_fresh_connection :admin_slave
     end
 
-The children is access to same slave group of parent.
+The model of children class will access to same slave group as the parent.
 
     class Parent < ActiveRecord::Base
       establish_fresh_connection :admin_slave
@@ -92,13 +92,19 @@ AdminUser and Benefit access to ```admin_slave``` slave group.
       master_db_only!
     end
 
-If model that always access to master servers is exist, You may want to write ```master_db_only!```  in model.
+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.
 
 ### Slave Connection Manager
 Default slave connection manager is FreshConnection::ConnectionManager.
 If you would like to change slave connection manager, assign yourself slave connection manager.
 
+#### config/application.rb
+
+    config.fresh_connection.connection_manager = MySlaveConnection
+
+or
+
 #### config/initializers/fresh_connection.rb
 
     FreshConnection.connection_manager = MySlaveConnection
@@ -151,6 +157,8 @@ I'm glad that you would do test!
 To run the test suite, you need mysql installed.
 How to setup your test environment.
 
+First of all, you setting the config of the test mysql server in ```spec/database.yml```
+
 ```bash
 bundle install --path bundle
 GEM_HOME=bundle/ruby/(your ruby version) gem install bundler --pre

data/fresh_connection.gemspec

@@ -18,13 +18,12 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'activerecord', '>= 3.2.0'
-  spec.add_dependency 'activesupport', '>= 3.2.0'
-  spec.add_dependency 'railties', '>= 3.2.0'
+  spec.add_dependency 'activerecord', '>= 3.2.0', '< 4.2'
+  spec.add_dependency 'activesupport', '>= 3.2.0', '< 4.2'
+  spec.add_dependency 'mysql2', '~> 0.3'
 
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake", '>= 10.0.0'
-  spec.add_development_dependency "rspec", '>= 2.14.1'
-  spec.add_development_dependency 'mysql2', '>= 0.3.15'
-  spec.add_development_dependency 'appraisal', '>= 1.0.0'
+  spec.add_development_dependency "bundler", "~> 1.6"
+  spec.add_development_dependency "rake", '~> 10.0'
+  spec.add_development_dependency "rspec", '~> 2.14'
+  spec.add_development_dependency 'appraisal', '~> 1.0'
 end

data/gemfiles/rails3.gemfile

@@ -4,6 +4,6 @@ source "https://rubygems.org"
 
 gem "activerecord", "~> 3.2.0"
 gem "activesupport", "~> 3.2.0"
-gem "railties", "~> 3.2.0"
+gem "mysql2", "~> 0.3"
 
 gemspec :path => "../"

data/gemfiles/rails40.gemfile

@@ -4,6 +4,6 @@ source "https://rubygems.org"
 
 gem "activerecord", "~> 4.0.0"
 gem "activesupport", "~> 4.0.0"
-gem "railties", "~> 4.0.0"
+gem "mysql2", "~> 0.3"
 
 gemspec :path => "../"

data/gemfiles/rails41.gemfile

@@ -4,6 +4,6 @@ source "https://rubygems.org"
 
 gem "activerecord", "~> 4.1.0"
 gem "activesupport", "~> 4.1.0"
-gem "railties", "~> 4.1.0"
+gem "mysql2", "~> 0.3"
 
 gemspec :path => "../"

data/lib/fresh_connection/connection_manager.rb

@@ -44,7 +44,7 @@ module FreshConnection
     end
 
     def get_spec
-      ret = ActiveRecord::Base.configurations[Rails.env]
+      ret = ActiveRecord::Base.configurations[FreshConnection.env]
       ret.merge(ret[@slave_group] || {})
     end
   end

data/lib/fresh_connection/initializer.rb

@@ -1,4 +1,3 @@
-require 'fresh_connection/rack/connection_management'
 require 'fresh_connection/extend/ar_base'
 require 'fresh_connection/extend/ar_relation'
 require 'fresh_connection/extend/connection_handler'
@@ -7,13 +6,6 @@ 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
 

data/lib/fresh_connection/railtie.rb

@@ -1,11 +1,18 @@
+require 'fresh_connection/rack/connection_management'
 require 'rails'
 
 module FreshConnection
   class Railtie < Rails::Railtie
-    initializer "fresh_connection.configure_rails_initialization" do |app|
-      Initializer.swap_rack(app)
+    config.fresh_connection = ActiveSupport::OrderedOptions.new
+    config.eager_load_namespaces << FreshConnection
 
+    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
+        )
+
         Initializer.extend_active_record
       end
     end

data/lib/fresh_connection/version.rb

@@ -1,4 +1,4 @@
 module FreshConnection
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end
 

data/lib/fresh_connection.rb

@@ -12,18 +12,23 @@ module FreshConnection
   autoload :SlaveConnection
 
   class << self
-    attr_writer :connection_manager, :ignore_configure_connection, :retry_limit
+    attr_writer :connection_manager, :ignore_configure_connection, :retry_limit, :env
 
     def connection_manager
-      @connection_manager || ConnectionManager
+      manager_klass = @connection_manager || rails_config(:connection_manager) || ConnectionManager
+      manager_klass.is_a?(String) ? manager_klass.constantize : manager_klass
     end
 
     def ignore_configure_connection?
-      !!@ignore_configure_connection
+      !!(@ignore_configure_connection || rails_config(:ignore_configure_connection))
     end
 
     def retry_limit
-      @retry_limit || 3
+      @retry_limit || rails_config(:retry_limit) || 3
+    end
+
+    def env
+      @env || defined?(Rails) && Rails.env
     end
 
     def rails_3?
@@ -33,7 +38,14 @@ module FreshConnection
     def rails_4?
       ActiveRecord::VERSION::MAJOR == 4
     end
+
+    private
+
+    def rails_config(target)
+      return nil unless defined?(Rails)
+      Rails.application.config.fresh_connection[target]
+    end
   end
 end
 
-require "fresh_connection/railtie.rb"
+require "fresh_connection/railtie.rb" if defined?(Rails)

data/spec/prepare.rb

@@ -5,7 +5,7 @@ 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
+    establish_connection(configurations["test"])
     establish_fresh_connection :slave1
   end
 end

data/spec/spec_helper.rb

@@ -3,6 +3,7 @@ $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 require 'fresh_connection'
 
 FreshConnection::Initializer.extend_active_record
+FreshConnection.env = "test"
 require File.join(File.dirname(__FILE__), "prepare.rb")
 
 Dir[File.join(File.dirname(__FILE__), "/support/**/*.rb")].each {|f| require f}

data/spec/unit/access_control_spec.rb

@@ -48,7 +48,7 @@ describe FreshConnection::AccessControl do
     it "forced master state" do
       @ac.access(true) do
         @ac.force_master_access do
-          expect(@ac.slave_access?).to be_false
+          expect(@ac.slave_access?).to be_falsey
         end
       end
     end
@@ -56,7 +56,7 @@ describe FreshConnection::AccessControl do
     it "not effect outside" do
       @ac.access(true) do
         @ac.force_master_access {}
-        expect(@ac.slave_access?).to be_true
+        expect(@ac.slave_access?).to be_truthy
       end
     end
   end

data/spec/unit/ar_base_spec.rb

@@ -29,14 +29,14 @@ describe ActiveRecord::Base do
     end
 
     it "childrend of master_db_only class is master_db_only" do
-      expect(User2.master_db_only?).to be_false
+      expect(User2.master_db_only?).to be_falsey
       Parent.master_db_only!
-      expect(User2.master_db_only?).to be_true
+      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_false
+      expect(Address.master_db_only?).to be_falsey
     end
   end
 end

data/spec/unit/fresh_connection_spec.rb

@@ -12,7 +12,7 @@ describe FreshConnection do
         Address.first.user.name,
         Tel.first.user.name,
       ]
-      
+
       expect(data).to be_all{|n| n.include?("slave1")}
     end
 
@@ -21,7 +21,7 @@ describe FreshConnection do
         Address.first.prefecture,
         @user.address.prefecture
       ]
-      
+
       expect(data).to be_all{|n| n.include?("slave1")}
     end
 
@@ -30,7 +30,7 @@ describe FreshConnection do
         Tel.first.number,
         @user.tels.first.number
       ]
-      
+
       expect(data).to be_all{|n| n.include?("slave2")}
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fresh_connection
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Tsukasa OISHI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-14 00:00:00.000000000 Z
+date: 2014-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -17,6 +17,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,6 +27,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -31,6 +37,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -38,90 +47,79 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.2'
 - !ruby/object:Gem::Dependency
-  name: railties
+  name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.0.0
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.0.0
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.14.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.14.1
-- !ruby/object:Gem::Dependency
-  name: mysql2
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.15
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.15
+        version: '2.14'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
 description: https://github.com/tsukasaoishi/fresh_connection
 email:
 - tsukasa.oishi@gmail.com
@@ -183,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: FreshConnection supports to connect with Mysql slave servers via Load Balancers.