ebisu_connection 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98f897fee0659bddbed6e4539387a46f2c43a72a
-  data.tar.gz: 8dcd5b499e30cd9bd32681e08ffa00cd7d338bb5
+  metadata.gz: 329f392b0c96e684f68b181ee65c8f17941e0537
+  data.tar.gz: d0f4b510081d702887b1253d6b240783e176b4b3
 SHA512:
-  metadata.gz: 502269d5808c9dc2bb0d13e494d01fc15b726b9923f6dc8a2c736b732a8d587b82e57ef389c4c0fd8d1c8dca8af114a87a114924e0a8c73518ad007d7a03c915
-  data.tar.gz: 543a8f54458d6f5bba4f523a689ef59958d649fe7942474f547a5858454272d4981b529a8f593199ad31213e29a25e8fdea37f59190461712801a1a90b37f99f
+  metadata.gz: a026f2a2e172f868d1cdc7a4be0269ae87cdfa204daef131f5e3d7755c39409b12b2485cdefdf33eb0a190799252fa0bae56f39eebcecd833dbc020e797d5d18
+  data.tar.gz: cd289b7235f65d828fd22e9867f916cb2aaa4a346d13694da9d0ff22ad17b2309ec4adf8890bdfa64f038ae50d66974e7308542de0c98dfd11eab8db9691e37a

data/README.md

@@ -148,6 +148,22 @@ In transaction, Always will be access to master server.
     end
 
 
+### for Unicorn
+
+```ruby
+before_fork do |server, worker|
+  ...
+  ActiveRecord::Base.clear_all_slave_connections!
+  ...
+end
+
+after_fork do |server, worker|
+  ...
+  ActiveRecord::Base.establish_fresh_connection
+  ...
+end
+```
+
 ## Contributing
 
 1. Fork it

data/ebisu_connection.gemspec

@@ -8,20 +8,22 @@ Gem::Specification.new do |spec|
   spec.version       = EbisuConnection::VERSION
   spec.authors       = ["tsukasaoishi"]
   spec.email         = ["tsukasa.oishi@gmail.com"]
-  spec.description   = %q{EbisuConnection supports to connect with Mysql slave servers. It doesn't need Load Balancer.}
+
   spec.summary       = %q{EbisuConnection supports to connect with Mysql slave servers.}
-  spec.homepage      = ""
+  spec.description   = %q{EbisuConnection supports to connect with Mysql slave servers. It doesn't need Load Balancer.}
+  spec.homepage      = "https://github.com/tsukasaoishi/ebisu_connection"
   spec.license       = "MIT"
 
-  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.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.required_ruby_version = '>= 2.0'
   spec.add_dependency 'fresh_connection', '~> 0.4.0'
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", '~> 10.0'
   spec.add_development_dependency "rspec", '~> 3.0'
-  spec.add_development_dependency 'appraisal', '~> 1.0'
+  spec.add_development_dependency 'appraisal', '~> 2.0'
 end

data/lib/ebisu_connection/connection_manager.rb

@@ -1,6 +1,7 @@
 require 'fresh_connection/abstract_connection_manager'
 require 'ebisu_connection/conf_file'
 require 'ebisu_connection/slave_group'
+require 'active_support/deprecation'
 
 module EbisuConnection
   class ConnectionManager < FreshConnection::AbstractConnectionManager
@@ -31,7 +32,7 @@ module EbisuConnection
       end
     end
 
-    def clear_all_connection!
+    def clear_all_connections!
       synchronize do
         @slaves.values.each do |s|
           s.all_disconnect!
@@ -42,6 +43,11 @@ module EbisuConnection
       end
     end
 
+    def clear_all_connection!
+      ActiveSupport::Deprecation.warn("clear_all_connection! has been deprecated. Use clear_all_connections! instead", caller)
+      clear_all_connections!
+    end
+
     private
 
     def check_own_connection

data/lib/ebisu_connection/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ebisu_connection
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - tsukasaoishi
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2015-05-07 00:00:00.000000000 Z
+date: 2015-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fresh_connection
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 description: EbisuConnection supports to connect with Mysql slave servers. It doesn't
   need Load Balancer.
 email:
@@ -107,16 +107,7 @@ files:
 - lib/ebisu_connection/slave.rb
 - lib/ebisu_connection/slave_group.rb
 - lib/ebisu_connection/version.rb
-- spec/database.yml
-- spec/db_schema.sql
-- spec/prepare.rb
-- spec/slaves.yaml
-- spec/spec_helper.rb
-- spec/unit/ebisu_connection_spec.rb
-- spec/unit/greatest_common_divisor_spec.rb
-- spec/unit/slave_group_spec.rb
-- spec/unit/slave_spec.rb
-homepage: ''
+homepage: https://github.com/tsukasaoishi/ebisu_connection
 licenses:
 - MIT
 metadata: {}
@@ -128,7 +119,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -140,13 +131,4 @@ rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: EbisuConnection supports to connect with Mysql slave servers.
-test_files:
-- spec/database.yml
-- spec/db_schema.sql
-- spec/prepare.rb
-- spec/slaves.yaml
-- spec/spec_helper.rb
-- spec/unit/ebisu_connection_spec.rb
-- spec/unit/greatest_common_divisor_spec.rb
-- spec/unit/slave_group_spec.rb
-- spec/unit/slave_spec.rb
+test_files: []

data/spec/database.yml

@@ -1,10 +0,0 @@
-test:
-  adapter: mysql2
-  encoding: utf8
-  database: ebisu_connection_test_master
-  pool: 5
-  username: root
-  password:
-
-  slave:
-    database: ebisu_connection_test_slave

data/spec/db_schema.sql

@@ -1,95 +0,0 @@
--- MySQL dump 10.13  Distrib 5.6.19, for osx10.9 (x86_64)
---
--- Host: localhost    Database: ebisu_connection_test_master
--- ------------------------------------------------------
--- Server version	5.6.19
-
-/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
-/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
-/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!40101 SET NAMES utf8 */;
-/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
-/*!40103 SET TIME_ZONE='+00:00' */;
-/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
-/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
-/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
-/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-
---
--- Current Database: `ebisu_connection_test_master`
---
-
-CREATE DATABASE /*!32312 IF NOT EXISTS*/ `ebisu_connection_test_master` /*!40100 DEFAULT CHARACTER SET utf8 */;
-
-USE `ebisu_connection_test_master`;
-
---
--- Table structure for table `users`
---
-
-DROP TABLE IF EXISTS `users`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `users` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `name` varchar(255) NOT NULL DEFAULT '',
-  `created_at` datetime DEFAULT NULL,
-  `updated_at` datetime DEFAULT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `users`
---
-
-LOCK TABLES `users` WRITE;
-/*!40000 ALTER TABLE `users` DISABLE KEYS */;
-INSERT INTO `users` VALUES (1,'Tsukasa (master)','2014-04-10 07:24:16','2014-04-10 07:24:16');
-/*!40000 ALTER TABLE `users` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Current Database: `ebisu_connection_test_slave`
---
-
-CREATE DATABASE /*!32312 IF NOT EXISTS*/ `ebisu_connection_test_slave` /*!40100 DEFAULT CHARACTER SET utf8 */;
-
-USE `ebisu_connection_test_slave`;
-
---
--- Table structure for table `users`
---
-
-DROP TABLE IF EXISTS `users`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `users` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `name` varchar(255) NOT NULL DEFAULT '',
-  `created_at` datetime DEFAULT NULL,
-  `updated_at` datetime DEFAULT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `users`
---
-
-LOCK TABLES `users` WRITE;
-/*!40000 ALTER TABLE `users` DISABLE KEYS */;
-INSERT INTO `users` VALUES (1,'Tsukasa (slave)','2014-04-10 07:24:16','2014-04-10 07:24:16');
-/*!40000 ALTER TABLE `users` ENABLE KEYS */;
-UNLOCK TABLES;
-/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
-
-/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
-/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
-/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
-/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
-/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
-/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
-/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-
--- Dump completed on 2014-06-16 21:22:37

data/spec/prepare.rb

@@ -1,14 +0,0 @@
-require 'yaml'
-require 'active_record'
-
-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(configurations["test"])
-  end
-end
-
-class User < ActiveRecord::Base
-end

data/spec/slaves.yaml

@@ -1,7 +0,0 @@
-test:
-  slave:
-    - "localhost, 10"
-    - "localhost, 10"
-    -
-      host: localhost
-      wheight: 10

data/spec/spec_helper.rb

@@ -1,7 +0,0 @@
-ENV["RAILS_ENV"]="test"
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
-require 'ebisu_connection'
-
-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

@@ -1,19 +0,0 @@
-require 'spec_helper'
-
-describe EbisuConnection do
-  context "access to slave" do
-    it "select from User is to access to slave" do
-      expect(User.first.name).to be_include("slave")
-    end
-  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
-  end
-end

data/spec/unit/greatest_common_divisor_spec.rb

@@ -1,38 +0,0 @@
-require 'spec_helper'
-
-describe EbisuConnection::GreatestCommonDivisor do
-  before(:all) do
-    @g = EbisuConnection::GreatestCommonDivisor
-  end
-
-  context ".calc" do
-    it "return nil if set is empty" do
-      expect(@g.calc([])).to be_nil
-    end
-
-    it "return first element if set has one element" do
-      expect(@g.calc([1])).to eq(1)
-    end
-
-    it "return first element if set has elements that is all same" do
-      set = [1] * 100
-      expect(@g.calc(set)).to eq(1)
-    end
-
-    it "return 1 if set includes 1 in elements" do
-      set = (1..100).to_a
-      expect(@g.calc(set)).to eq(1)
-    end
-
-    it "return gcd" do
-      expect(@g.calc([2,4])).to eq(2)
-      expect(@g.calc([2,4,6])).to eq(2)
-      expect(@g.calc([4,6])).to eq(2)
-      expect(@g.calc([3,4,6])).to eq(1)
-      expect(@g.calc([3,6])).to eq(3)
-      expect(@g.calc([10,10,2])).to eq(2)
-      expect(@g.calc([10,10,2,10,5])).to eq(1)
-      expect(@g.calc([10,10,10,5])).to eq(5)
-    end
-  end
-end

data/spec/unit/slave_group_spec.rb

@@ -1,31 +0,0 @@
-require 'spec_helper'
-
-describe EbisuConnection::SlaveGroup do
-  before(:all) do
-    @sg = EbisuConnection::SlaveGroup
-  end
-
-  context "#sample" do
-    it "raise exception if slaves empty" do
-      inst = @sg.new([], "slave")
-      expect{
-        inst.sample
-      }.to raise_error(EbisuConnection::SlaveGroup::AllSlavesHasGoneError)
-    end
-
-    it "return slve instance object" do
-      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"], "slave")
-      c = inst.sample.connection
-      expect {
-        inst.remove_connection(c)
-      }.to raise_error(EbisuConnection::SlaveGroup::AllSlavesHasGoneError)
-    end
-  end
-end

data/spec/unit/slave_spec.rb

@@ -1,50 +0,0 @@
-require 'spec_helper'
-
-describe EbisuConnection::Slave do
-  context "initialize(conf is String)" do
-    it "hostname only" do
-      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", "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", "slave")
-      expect(s.hostname).to eq("host_1")
-      expect(s.weight).to eq(10)
-    end
-  end
-
-  context "initialize(conf is Hash)" do
-    it "hostname only" do
-      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}, "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}, "slave")
-      expect(s.hostname).to eq("host_1")
-      expect(s.weight).to eq(10)
-    end
-  end
-
-  context "#connection" do
-    it "return Mysql2Adapter object" do
-      s = EbisuConnection::Slave.new("localhost", "slave")
-      expect(s.connection).to be_a(ActiveRecord::ConnectionAdapters::Mysql2Adapter)
-    end
-  end
-end