redic-sentinels 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54d236a916888c25a0413816ec6e2c649100db9c
-  data.tar.gz: 62b9e67398198edc52ce30b6956692eeb7f0c7da
+  metadata.gz: 00f2c98ea246c4dee97dca3fe3757fec01f0b1e3
+  data.tar.gz: 5c871add547ae0d15a034886e5480f284f000e7c
 SHA512:
-  metadata.gz: adb8e3aa13617616c2c3979b41ec105956b0473c3d0c16acdc5537b2a36fd5f31c22aef9ad68c8bc68899820bcf3e04ccd2224dd7d859035a7e476e3484ce651
-  data.tar.gz: 3c5b8d27b12d9585c2a11b2d8c7e924ed5260102c6ebf66b063a40718cae546d06a2234e577d492c82463335c1081243eb1bbad52cdfc62ea3739a484f7faac9
+  metadata.gz: 6740acd8892fe316e54a0af8847cb1a110e9e618c461e2c2cd08e68458b06f389e49a2a1cbf24e85146269c50f08d61b922073988e7e74626146534f95fae982
+  data.tar.gz: 06188323e825f5db6efe3aac9d2546d1c20491c89ff6b6cccdd1ae543c21a09312b780d4fe7f52e235a43cf276b4143f68cf1b7f4214c126dd3dbf52aedaf9f6

data/README.md

@@ -29,13 +29,13 @@ Or install it yourself as:
 ## Usage
 
 ```ruby
-sentinels = [
+hosts = [
   'localhost:26379',
   'localhost:26380',
   'localhost:26381'
 ]
 
-redis = Redic::Sentinels.new sentinels: sentinels, 
+redis = Redic::Sentinels.new hosts: hosts, 
                              master_name: 'mymaster', 
                              db: 1, # optional (default: 0)
                              password: 'pass' # optional

data/lib/redic/sentinels/version.rb

@@ -1,5 +1,5 @@
 class Redic
   class Sentinels
-    VERSION = '0.1.0'
+    VERSION = '0.2.0'
   end
 end

data/lib/redic/sentinels.rb

@@ -8,10 +8,10 @@ class Redic
     class UnreachableHosts < ArgumentError; end
     class UnknownMaster < ArgumentError; end
 
-    attr_reader :hosts, :master_name, :password, :db, :timeout, :client
+    attr_reader :hosts, :master_name, :password, :db, :timeout
 
     def initialize(options)
-      @hosts   = options.fetch(:hosts)
+      @hosts       = options.fetch(:hosts)
       @master_name = options.fetch(:master_name)
       @password    = options[:password]
       @db          = options.fetch(:db, 0)
@@ -21,32 +21,50 @@ class Redic
     end
 
     def call(*args)
-      forward { client.call *args }
+      forward { redis.call *args }
     end
 
     def call!(*args)
-      forward { client.call! *args }
+      forward { redis.call! *args }
     end
 
     def queue(*args)
-      forward { client.queue *args }
-    end
-
-    def clear
-      forward { client.clear }
+      forward { redis.queue *args }
     end
 
     def commit
-      buffer = client.buffer
+      buffer = redis.buffer
 
       forward do
-        client.buffer.replace(buffer)
-        client.commit
+        redis.buffer.replace(buffer)
+        redis.commit
       end
     end
 
+    def buffer
+      forward { redis.buffer }
+    end
+
+    def reset
+      forward { redis.reset }
+    end
+
+    def clear
+      forward { redis.clear }
+    end
+
+    def client
+      forward { redis.client }
+    end
+
+    def url
+      forward { redis.url }
+    end
+
     private
 
+    attr_reader :redis
+
     def forward
       yield
     rescue Errno::ECONNREFUSED
@@ -62,7 +80,7 @@ class Redic
           ip, port = sentinel.call 'SENTINEL', 'get-master-addr-by-name', master_name
           raise UnknownMaster if ip.nil? && port.nil?
 
-          @client = Redic.new "redis://#{password ? ":#{password}@" : ''}#{ip}:#{port}/#{db}"
+          @redis = Redic.new *["redis://#{password ? ":#{password}@" : ''}#{ip}:#{port}/#{db}", timeout].compact
           return
 
         rescue Errno::ECONNREFUSED

data/spec/coverage_helper.rb

@@ -0,0 +1,5 @@
+require 'simplecov'
+require 'coveralls'
+
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new [SimpleCov::Formatter::HTMLFormatter, Coveralls::SimpleCov::Formatter]
+SimpleCov.start

data/spec/minitest_helper.rb

@@ -1,6 +1,4 @@
-require 'simplecov'
-SimpleCov.start
-
+require 'coverage_helper'
 require 'redic-sentinels'
 require 'minitest/autorun'
 require 'minitest/colorin'

data/spec/sentinels_spec.rb

@@ -18,7 +18,7 @@ describe Redic::Sentinels do
   MASTER_NAME = 'mymaster'
 
   def disconnect(redis)
-    redis.client.configure "redis://#{INVALID_HOSTS.sample}"
+    redis.client.configure "redis://#{INVALID_HOSTS.sample}", 10_000_000
   end
 
   after do
@@ -46,12 +46,18 @@ describe Redic::Sentinels do
       redis.commit.must_equal ['PONG', 'PONG']
     end
 
-    it 'clear' do
+    it 'clear/reset' do
       redis.queue 'PING'
-      redis.client.buffer.must_equal [['PING']]
+      redis.buffer.must_equal [['PING']]
 
       redis.clear
-      redis.client.buffer.must_be_empty
+      redis.buffer.must_be_empty
+
+      redis.queue 'PING'
+      redis.buffer.must_equal [['PING']]
+
+      redis.reset
+      redis.buffer.must_be_empty
     end
 
     it 'get/set' do
@@ -75,17 +81,17 @@ describe Redic::Sentinels do
     end
 
     it 'Default DB' do
-      redis.client.url.must_equal 'redis://127.0.0.1:16379/0'
+      redis.url.must_equal 'redis://127.0.0.1:16379/0'
     end
 
     it 'Custom DB' do
       redis = Redic::Sentinels.new hosts: HOSTS, master_name: MASTER_NAME, db: 7
-      redis.client.url.must_equal 'redis://127.0.0.1:16379/7'
+      redis.url.must_equal 'redis://127.0.0.1:16379/7'
     end
 
     it 'Auth' do
       redis = Redic::Sentinels.new hosts: HOSTS, master_name: MASTER_NAME, password: 'pass'
-      redis.client.url.must_equal 'redis://:pass@127.0.0.1:16379/0'
+      redis.url.must_equal 'redis://:pass@127.0.0.1:16379/0'
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redic-sentinels
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Gabriel Naiman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-08 00:00:00.000000000 Z
+date: 2017-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redic
@@ -162,6 +162,7 @@ files:
 - lib/redic/sentinels.rb
 - lib/redic/sentinels/version.rb
 - redic-sentinels.gemspec
+- spec/coverage_helper.rb
 - spec/minitest_helper.rb
 - spec/sentinels_spec.rb
 homepage: https://github.com/gabynaiman/redic-sentinels
@@ -190,5 +191,6 @@ specification_version: 4
 summary: Redic::Sentinels is a wrapper for the Redis client that fetches configuration
   details from sentinels
 test_files:
+- spec/coverage_helper.rb
 - spec/minitest_helper.rb
 - spec/sentinels_spec.rb