redisable 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c60132614f45c100a6eb6e9f4d26f7b06511763
-  data.tar.gz: 869ef874389194e1ce8d350d101ffc6d2a945e76
+  metadata.gz: b57212d5aeb166fba9f21be08b1ebe7dfc933c22
+  data.tar.gz: dc7696ee7a7793d7edb52a7c8d7be5ebebe2488b
 SHA512:
-  metadata.gz: 9da320a96cfe8a94ce11218ace6397b6bedb9444dc43a6eebd57c6ff49f9d0211808b1078c52d605d66efe1355918b658c59f962c5e7c4026116cef12d1ae544
-  data.tar.gz: de26ac62726a5750f90411353b3051355e73387ebde62ea6ea5565f10de1c68559ffcc9a356f02b6687f67889d848634177b5b6e902857c21a01e72ea55e51ad
+  metadata.gz: c5cf2c005bfbfb69921b083ba6a03f658d0c9e9dfbf0f66752c2018bf376f63e0874ce6c901547224aee6f9e7500460c36c9d552d6fce0e6b45ec0256b343b20
+  data.tar.gz: 322bf121d7ec72c32966623726611e69ddb7f2c22bbec37e6f773c3d02ffde2469322cab59d62d9a45c788c72268bd74e0a1cb9022f16337ee6d3602188f26ca

data/lib/redisable/connection.rb

@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+require 'redis/distributed'
+
 module Redisable
   module Connection
     def self.conn(server)
@@ -6,8 +8,16 @@ module Redisable
       @pool[server] ||=
         begin
           conf = Redisable::Config.conf(server)
-          redis = ::Redis.new(conf)
-          raise "Redis server[#{conf["host"]}:#{conf["port"]}] is down!" unless reachable?(redis)
+          redis = nil
+          if conf.is_a?(Array)
+            redis = ::Redis::Distributed.new(conf)
+            redis.nodes.each do |node|
+              raise "Redis server[#{node.id}] is down!" unless reachable?(node)
+            end
+          else
+            redis = ::Redis.new(conf)
+            raise "Redis server[#{redis.id}] is down!" unless reachable?(redis)
+          end
           redis
         end
     end

data/lib/redisable/version.rb

@@ -1,3 +1,3 @@
 module Redisable
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/spec/connection_spec.rb

@@ -11,25 +11,48 @@ describe Redisable::Connection do
     }
   }
   describe ".conn" do
+    before do
+      Redisable::Config.stub(:conf) { conf }
+      Redis.any_instance.stub(:ping) { "PONG" }
+    end
+    after do
+      Redisable::Connection.instance_variable_set("@pool", {})
+    end
+    subject { Redisable::Connection.conn(server) }
     context "in access ':application' first time" do
       it "create connection" do
-        Redisable::Config.stub(:conf) { conf }
-        Redis.any_instance.stub(:ping) { "PONG" }
-        Redisable::Connection.conn(server)
+        subject
         Redisable::Connection.instance_variable_get("@pool").size.should == 1
       end
-      after do
-        Redisable::Connection.instance_variable_set("@pool", {})
+    end
+    context "sharding conf" do
+      let(:conf) {
+        [
+          {
+            host: "localhost",
+            port: "6379",
+            db: "1",
+          },
+          {
+            host: "localhost",
+            port: "6379",
+            db: "2",
+          },
+        ]
+      }
+      it "create sharding connection" do
+        expect(subject).to be_a(Redis::Distributed)
       end
     end
     context "in request timeout" do
-      it "raise RuntimeError" do
+      before do
         Redisable::Config.stub(:conf) { conf }
         Redis.any_instance.stub(:ping) { "" }
-        expect {
-          Redisable::Connection.conn(server)
-        }.to raise_error(RuntimeError)
+      end
+      it "raise RuntimeError" do
+        expect {subject}.to raise_error(RuntimeError)
       end
     end
   end
+
 end

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: redisable
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - yoppi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-15 00:00:00.000000000 Z
+date: 2014-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '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'
 - !ruby/object:Gem::Dependency
   name: rspec
   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: Thin wrapper library for Redis, enable any Ruby class to access Redis.
@@ -73,8 +73,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -100,17 +100,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Thin wrapper library for Redis.
@@ -120,4 +120,3 @@ test_files:
 - spec/key_spec.rb
 - spec/redisable_spec.rb
 - spec/spec_helper.rb
-has_rdoc: