ebisu_connection 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87ddae1248a9277a1f722106a6f363dd04abfbf9
-  data.tar.gz: e4cc9ef470525730d97c7f73492c85f87002818f
+  metadata.gz: 98f897fee0659bddbed6e4539387a46f2c43a72a
+  data.tar.gz: 8dcd5b499e30cd9bd32681e08ffa00cd7d338bb5
 SHA512:
-  metadata.gz: 7be8879cd77128d32518c61410b2077dee5ed9537c455bb85bb215797af97c3033ce54c87b22394a4f75ad6b70df4b568325d775ce4005708d17c83910f25298
-  data.tar.gz: e751976d76f4b79eb1118b7e65c34c0eccd0a67ef6715c5bd67706b62a61156b86a95e810362786d735494c19d700564b5419c2ba77e1df9fb2a6ae68e4a93a6
+  metadata.gz: 502269d5808c9dc2bb0d13e494d01fc15b726b9923f6dc8a2c736b732a8d587b82e57ef389c4c0fd8d1c8dca8af114a87a114924e0a8c73518ad007d7a03c915
+  data.tar.gz: 543a8f54458d6f5bba4f523a689ef59958d649fe7942474f547a5858454272d4981b529a8f593199ad31213e29a25e8fdea37f59190461712801a1a90b37f99f

data/.travis.yml

@@ -5,7 +5,6 @@ before_script:
   - mysql -e 'create database ebisu_connection_test_slave;'
   - "bundle exec ruby spec/prepare.rb"
 rvm:
-  - 1.9.3
   - 2.0.0
   - 2.1
   - 2.2

data/README.md

@@ -133,9 +133,13 @@ Read query will be access to slave server.
     Article.where(:id => 1)
     Article.count
 
-If you want to access to master saver, use readonly(false).
+If you want to access to the master server, use read_master.
 
-    Article.where(:id => 1).readonly(false)
+```ruby
+Article.where(:id => 1).read_master
+```
+
+It is possible to use readonly(false) instead of read_master, but it will be depricated at future version.
 
 In transaction, Always will be access to master server.
 
@@ -159,8 +163,8 @@ To run the test suite, you need mysql installed.
 How to setup your test environment.
 
 ```bash
-bundle install --path bundle
-GEM_HOME=bundle/ruby/(your ruby version) gem install bundler --pre
+bundle install --path .bundle
+GEM_HOME=.bundle/ruby/(your ruby version) gem install bundler --pre
 bundle exec appraisal install
 ```
 

data/ebisu_connection.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'fresh_connection', '~> 0.3.0'
+  spec.add_dependency 'fresh_connection', '~> 0.4.0'
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", '~> 10.0'

data/lib/ebisu_connection/conf_file.rb

@@ -1,3 +1,5 @@
+require 'yaml'
+
 module EbisuConnection
   class ConfFile
     class << self
@@ -11,7 +13,6 @@ module EbisuConnection
 
       def conf_clear!
         @slaves_conf = nil
-        @spec = nil
       end
 
       def slaves_conf(slave_group)
@@ -23,11 +24,6 @@ module EbisuConnection
         end
       end
 
-      def spec(slave_group)
-        @spec ||= get_spec
-        @spec.merge(@spec[slave_group] || {})
-      end
-
       def slaves_file
         return @slaves_file if @slaves_file
         raise "nothing slaves_file. You have to set a file path using EbisuConnection.slaves_file= method" unless defined?(Rails)
@@ -57,11 +53,7 @@ module EbisuConnection
       def get_slaves_conf
         @file_mtime = File.mtime(slaves_file)
         conf = YAML.load_file(slaves_file)
-        conf[FreshConnection.env.to_s] || {}
-      end
-
-      def get_spec
-        ActiveRecord::Base.configurations[FreshConnection.env]
+        conf[EbisuConnection.env.to_s] || {}
       end
     end
   end

data/lib/ebisu_connection/connection_manager.rb

@@ -1,10 +1,9 @@
-require 'yaml'
 require 'fresh_connection/abstract_connection_manager'
+require 'ebisu_connection/conf_file'
+require 'ebisu_connection/slave_group'
 
 module EbisuConnection
   class ConnectionManager < FreshConnection::AbstractConnectionManager
-    delegate :if_modify, :conf_clear!, :to => ConfFile
-
     def initialize(slave_group = "slave")
       super
       @slaves = {}
@@ -17,14 +16,14 @@ module EbisuConnection
     def put_aside!
       return if check_own_connection
 
-      if_modify do
+      ConfFile.if_modify do
         reserve_release_all_connection
         check_own_connection
       end
     end
 
     def recovery(failure_connection, exception)
-      if recoverable? && slave_down_message?(exception.message)
+      if slave_down_message?(exception.message)
         slaves.remove_connection(failure_connection)
         true
       else
@@ -32,10 +31,6 @@ module EbisuConnection
       end
     end
 
-    def recoverable?
-      true
-    end
-
     def clear_all_connection!
       synchronize do
         @slaves.values.each do |s|
@@ -43,7 +38,7 @@ module EbisuConnection
         end
 
         @slaves = {}
-        conf_clear!
+        ConfFile.conf_clear!
       end
     end
 
@@ -68,7 +63,7 @@ module EbisuConnection
         @slaves.values.each do |s|
           s.reserve_release_connection!
         end
-        conf_clear!
+        ConfFile.conf_clear!
       end
     end
 
@@ -79,15 +74,11 @@ module EbisuConnection
     end
 
     def get_slaves
-      SlaveGroup.new(slaves_conf, spec)
+      SlaveGroup.new(slaves_conf, slave_group)
     end
 
     def slaves_conf
-      ConfFile.slaves_conf(@slave_group)
-    end
-
-    def spec
-      ConfFile.spec(@slave_group)
+      ConfFile.slaves_conf(slave_group)
     end
   end
 end

data/lib/ebisu_connection/slave.rb

@@ -1,33 +1,27 @@
-require 'active_support/core_ext/hash/keys'
-require 'active_support/core_ext/object/blank'
-
 module EbisuConnection
   class Slave
     attr_reader :hostname, :weight
 
-    def initialize(conf, spec)
+    def initialize(conf, slave_group)
       case conf
       when String
         host, weight = conf.split(/\s*,\s*/)
         @hostname, port = host.split(/\s*:\s*/)
       when Hash
-        conf.stringify_keys!
-        @hostname = conf["host"]
-        weight = conf["weight"]
-        port = conf["port"]
+        @hostname = conf["host"] || conf[:host]
+        weight = conf["weight"] || conf[:weight]
+        port = conf["port"] || conf[:port]
       else
         raise ArgumentError, "slaves config is invalid"
       end
 
-      modify_spec = {"host" => @hostname}
-      modify_spec["port"] = port.to_i if port.present?
-
-      @spec = spec.merge(modify_spec)
+      spec = modify_spec(port)
+      @connection_factory = FreshConnection::ConnectionFactory.new(slave_group, spec)
       @weight = (weight || 1).to_i
     end
 
     def connection
-      @connection ||= ActiveRecord::Base.send("mysql2_connection", @spec)
+      @connection ||= @connection_factory.new_connection
     end
 
     def disconnect!
@@ -37,5 +31,12 @@ module EbisuConnection
       end
     rescue
     end
+
+    def modify_spec(port)
+      modify_spec = {"host" => @hostname}
+      return modify_spec unless port
+      modify_spec["port"] = port.to_i if port.is_a?(Integer) || !port.empty?
+      modify_spec
+    end
   end
 end

data/lib/ebisu_connection/slave_group.rb

@@ -1,17 +1,20 @@
+require 'ebisu_connection/greatest_common_divisor'
+require 'ebisu_connection/slave'
+
 module EbisuConnection
   class SlaveGroup
     class AllSlavesHasGoneError < StandardError; end
 
-    def initialize(slaves_conf, spec)
+    def initialize(slaves_conf, slave_group)
       @slaves = slaves_conf.map do |conf|
-        Slave.new(conf, spec)
+        Slave.new(conf, slave_group)
       end
 
       recalc_roulette
     end
 
     def sample
-      raise AllSlavesHasGoneError if @slaves.blank?
+      raise AllSlavesHasGoneError if @slaves.empty?
       @slaves[@roulette.sample]
     end
 
@@ -19,7 +22,7 @@ module EbisuConnection
       return unless s = @slaves.detect{|s| s.connection == connection}
       s.disconnect! rescue nil
       @slaves.delete(s)
-      raise AllSlavesHasGoneError if @slaves.blank?
+      raise AllSlavesHasGoneError if @slaves.empty?
       recalc_roulette
       nil
     end

data/lib/ebisu_connection/version.rb

@@ -1,3 +1,3 @@
 module EbisuConnection
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/ebisu_connection.rb

@@ -1,17 +1,22 @@
 require "fresh_connection"
-require "active_support/core_ext/module/delegation"
+require 'ebisu_connection/conf_file'
+require 'ebisu_connection/connection_manager'
 
 module EbisuConnection
-  extend ActiveSupport::Autoload
+  class << self
+    attr_writer :env
 
-  autoload :ConfFile
-  autoload :ConnectionManager
-  autoload :SlaveGroup
-  autoload :Slave
-  autoload :GreatestCommonDivisor
+    def slaves_file=(file)
+      ConfFile.slaves_file = file
+    end
 
-  class << self
-    delegate :slaves_file=, :check_interval=, :to => ConfFile
+    def check_interval=(interval)
+      ConfFile.check_interval = interval
+    end
+
+    def env
+      @env ||= defined?(Rails) && Rails.env || ENV["RAILS_ENV"] || ENV["RACK_ENV"]
+    end
   end
 end
 

data/spec/spec_helper.rb

@@ -2,6 +2,6 @@ ENV["RAILS_ENV"]="test"
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 require 'ebisu_connection'
 
-FreshConnection.env = "test"
+EbisuConnection.env = "test"
 EbisuConnection.slaves_file = File.join(File.dirname(__FILE__), "slaves.yaml")
 require File.join(File.dirname(__FILE__), "prepare.rb")

data/spec/unit/ebisu_connection_spec.rb

@@ -8,6 +8,10 @@ describe EbisuConnection do
   end
 
   context "access to master" do
+    it "specify read_master" do
+      expect(User.read_master.first.name).to be_include("master")
+    end
+
     it "specify readonly(false)" do
       expect(User.readonly(false).first.name).to be_include("master")
     end

data/spec/unit/slave_group_spec.rb

@@ -3,30 +3,25 @@ require 'spec_helper'
 describe EbisuConnection::SlaveGroup do
   before(:all) do
     @sg = EbisuConnection::SlaveGroup
-    @spec = {
-      "adapter" => "mysql2",
-      "database" => "ebisu_connection_test",
-      "username" => "root"
-    }
   end
 
   context "#sample" do
     it "raise exception if slaves empty" do
-      inst = @sg.new([], {})
+      inst = @sg.new([], "slave")
       expect{
         inst.sample
       }.to raise_error(EbisuConnection::SlaveGroup::AllSlavesHasGoneError)
     end
 
     it "return slve instance object" do
-      inst = @sg.new(["h"], {})
+      inst = @sg.new(["h"], "slave")
       expect(inst.sample).to be_a(EbisuConnection::Slave)
     end
   end
 
   context "#remove_connection" do
     it "raise exception AllSlavesHasGoneError when slaves size is one" do
-      inst = @sg.new(["localhost"], @spec)
+      inst = @sg.new(["localhost"], "slave")
       c = inst.sample.connection
       expect {
         inst.remove_connection(c)

data/spec/unit/slave_spec.rb

@@ -1,29 +1,21 @@
 require 'spec_helper'
 
 describe EbisuConnection::Slave do
-  before(:all) do
-    @spec = {
-      "adapter" => "mysql2",
-      "database" => "ebisu_connection_test",
-      "username" => "root"
-    }
-  end
-
   context "initialize(conf is String)" do
     it "hostname only" do
-      s = EbisuConnection::Slave.new("host_1", {})
+      s = EbisuConnection::Slave.new("host_1", "slave")
       expect(s.hostname).to eq("host_1")
       expect(s.weight).to eq(1)
     end
 
     it "hostname and weight" do
-      s = EbisuConnection::Slave.new("host_1, 10", {})
+      s = EbisuConnection::Slave.new("host_1, 10", "slave")
       expect(s.hostname).to eq("host_1")
       expect(s.weight).to eq(10)
     end
 
     it "hostname, weight and port" do
-      s = EbisuConnection::Slave.new("host_1:1975, 10", {})
+      s = EbisuConnection::Slave.new("host_1:1975, 10", "slave")
       expect(s.hostname).to eq("host_1")
       expect(s.weight).to eq(10)
     end
@@ -31,19 +23,19 @@ describe EbisuConnection::Slave do
 
   context "initialize(conf is Hash)" do
     it "hostname only" do
-      s = EbisuConnection::Slave.new({:host => "host_1"}, {})
+      s = EbisuConnection::Slave.new({:host => "host_1"}, "slave")
       expect(s.hostname).to eq("host_1")
       expect(s.weight).to eq(1)
     end
 
     it "hostname and weight" do
-      s = EbisuConnection::Slave.new({:host => "host_1", :weight => 10}, {})
+      s = EbisuConnection::Slave.new({:host => "host_1", :weight => 10}, "slave")
       expect(s.hostname).to eq("host_1")
       expect(s.weight).to eq(10)
     end
 
     it "hostname, weight and port" do
-      s = EbisuConnection::Slave.new({:host => "host_1", :weight => 10, :port => 1975}, {})
+      s = EbisuConnection::Slave.new({:host => "host_1", :weight => 10, :port => 1975}, "slave")
       expect(s.hostname).to eq("host_1")
       expect(s.weight).to eq(10)
     end
@@ -51,7 +43,7 @@ describe EbisuConnection::Slave do
 
   context "#connection" do
     it "return Mysql2Adapter object" do
-      s = EbisuConnection::Slave.new("localhost", @spec)
+      s = EbisuConnection::Slave.new("localhost", "slave")
       expect(s.connection).to be_a(ActiveRecord::ConnectionAdapters::Mysql2Adapter)
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ebisu_connection
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - tsukasaoishi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-03 00:00:00.000000000 Z
+date: 2015-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fresh_connection
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement