ebisu_connection 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3bea33e80ff8e417162f05398ebb64531751825b
-  data.tar.gz: a908cbe78a57d95209b8660de521a1371f0e5b05
+  metadata.gz: cce03246ed6e2fdd861e08fda5c26ac5055dfd93
+  data.tar.gz: 39ef771e7f321a9d48067054ac454c049497af48
 SHA512:
-  metadata.gz: c407ba2f24d9466e390eae96ff9931630b4f5ddd0361135d1e07c3d491e7d01e297c1f501ef0004130c5a49c6d0e9fd934877e2ff1ec8d244fd0ffd515851d2e
-  data.tar.gz: 871ee55618b50ffc9e833f9933d1706f1127a081d2d1c644d634cf26906d9c90e5f440fb3a537edb4b2735ab7f8cf069606003e74281b0b9bd8b1428aa143309
+  metadata.gz: 0f97f3d8eff3282cdf4a200ba1da8d65a3d6c23b1bcd81dddcba2d1472ed6d9e03b83b19730556a8297871b58226e635b20898df0b38c4988808b951ca93f254
+  data.tar.gz: b239dfdb465fe2c4eee2ea400b9e732777600e7e9b56452cac780dea29198bfe9a3a83b0bb89beac53185520b90182ee317a35ed10803226c43969337cd53b78

data/Appraisals

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

data/ebisu_connection.gemspec

@@ -18,11 +18,11 @@ 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.2.0'
+  spec.add_dependency 'fresh_connection', '~> 0.2.0', '>= 0.2.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,5 @@ source "https://rubygems.org"
 
 gem "activerecord", "~> 3.2.0"
 gem "activesupport", "~> 3.2.0"
-gem "railties", "~> 3.2.0"
 
 gemspec :path => "../"

data/gemfiles/rails40.gemfile

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

data/gemfiles/rails41.gemfile

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

data/lib/ebisu_connection/conf_file.rb

@@ -29,7 +29,9 @@ module EbisuConnection
       end
 
       def slaves_file
-        @slaves_file || File.join(Rails.root, "config/slave.yaml")
+        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)
+        File.join(Rails.root, "config/slave.yaml")
       end
 
       def check_interval
@@ -55,11 +57,11 @@ module EbisuConnection
       def get_slaves_conf
         @file_mtime = File.mtime(slaves_file)
         conf = YAML.load_file(slaves_file)
-        conf[Rails.env.to_s] || {}
+        conf[FreshConnection.env.to_s] || {}
       end
 
       def get_spec
-        ActiveRecord::Base.configurations[Rails.env]
+        ActiveRecord::Base.configurations[FreshConnection.env]
       end
     end
   end

data/lib/ebisu_connection/version.rb

@@ -1,3 +1,3 @@
 module EbisuConnection
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/database.yml

@@ -0,0 +1,10 @@
+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

@@ -0,0 +1,95 @@
+-- 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

@@ -0,0 +1,13 @@
+require 'yaml'
+
+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

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

data/spec/spec_helper.rb

@@ -3,3 +3,6 @@ $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 require 'ebisu_connection'
 
 FreshConnection::Initializer.extend_active_record
+FreshConnection.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

@@ -0,0 +1,15 @@
+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 readonly(false)" do
+      expect(User.readonly(false).first.name).to be_include("master")
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ebisu_connection
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - tsukasaoishi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-12 00:00:00.000000000 Z
+date: 2014-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fresh_connection
@@ -17,6 +17,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,76 +27,79 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.2
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
+        version: '0.3'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.0.0
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.0.0
+        version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: mysql2
+  name: rspec
   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: EbisuConnection supports to connect with Mysql slave servers. It doesn't
   need Load Balancer.
 email:
@@ -119,7 +125,12 @@ 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
@@ -143,12 +154,17 @@ 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: 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