em-hiredis-sentinel 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14b1a2ac6854f9241493539a86a73a0b01ec4f31
-  data.tar.gz: a708acfa1ecc2809b39fd66e227192605241ce4a
+  metadata.gz: 2b613d496e821b9b4b98c013f30e7e1e5eb4318f
+  data.tar.gz: 552bbbc2ae7a3dbfab2d91c7f935fe600b64f59b
 SHA512:
-  metadata.gz: 2debe14cb60821b1eb203fd8fadc7585ad052ee389c9716371c3048c48aa68954a837f9fc66662aefdb324869941591d623c2acaad631de9cc294e022e4359c5
-  data.tar.gz: 43c042ca1d70523e065df6930cafc015efd713fe41c51649c6fc04c273faa20e04c2d459e072747c657c186fe3d16f78566ebc30a29010c258fd0733e0ed3fd4
+  metadata.gz: 73199802933daa001830560be03687da11732daf5ba33f17e4df7d6c93d6b2b1fd71dd938973f4af8f07e821adb50a156268f074ab3c2898bf3f2d41a2e01c3e
+  data.tar.gz: d9ea3be274c8c5c5c31c2909d66356f81a092a4bae51ffa7c8e650de836e9121bcc1a8488f4ac3bd4fdb4ddbad24d06a479c8b8ffc072b2bc1bc7334d7868cad

data/Gemfile

@@ -1,4 +1,3 @@
 source 'https://rubygems.org'
-gem 'em-hiredis', :git => 'git://github.com/mloughran/em-hiredis'
 # Specify your gem's dependencies in em-hiredis-sentinel.gemspec
 gemspec

data/em-hiredis-sentinel.gemspec

@@ -18,5 +18,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_dependency 'em-hiredis', "~> 0.3"
-end
+  spec.add_dependency 'em-hiredis', ">= 0.3.0"
+end

data/lib/em-hiredis-sentinel/redis_client.rb

@@ -100,7 +100,8 @@ module EventMachine::Hiredis::Sentinel
       @sentinel_pubsub_client.psubscribe('*') do |channel, message|
         EM::Hiredis.logger.debug("SENTINEL PUBSUB #{channel} #{message}")
 
-        if channel == '+switch-master'
+        case channel
+        when '+switch-master'
           master_name, old_host, old_port, new_host, new_port = message.split(" ")
 
           if master_name == @master_name
@@ -108,7 +109,7 @@ module EventMachine::Hiredis::Sentinel
             update_master_client(new_host, new_port.to_i)
           end
 
-        elsif channel == '-odown' #TODO necessary?
+        when '-odown' #TODO necessary?
           type, master_name, host, port = message.split(" ")
 
           if master_name == @master_name #&& type == 'master' type is always master for odown
@@ -327,26 +328,21 @@ module EventMachine::Hiredis::Sentinel
     private
 
     def _parse_sentinel_options(options)
-      opts = []
+      ret = []
+
       options.each do |o|
         o = o[:url] if o.is_a?(Hash) && o.key?(:url)
 
-        case o
-          when Hash
-            opts << {
-              host: o[:host],
-              port: o[:port] || 26379
-            }
-          else
-            uri = URI.parse(o)
-            opts << {
-              :host => uri.host,
-              :port => uri.port || 26379
-            }
+        if o.is_a?(String)
+            #URI requires scheme
+            o = o.prepend('redis://') if !o.include? '://'
+            o = URI.parse(o)
         end
+
+        ret << { :host => o.host, :port => o.port || 26379 }
       end
 
-      opts
+      ret
     end
   end
-end
+end

data/lib/em-hiredis-sentinel/version.rb

@@ -3,7 +3,7 @@ require 'eventmachine'
 module EventMachine
   module Hiredis
     module Sentinel
-      VERSION = '0.2.2'
+      VERSION = '0.2.3'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: em-hiredis-sentinel
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Justin Schneck
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-31 00:00:00.000000000 Z
+date: 2014-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -42,16 +42,16 @@ dependencies:
   name: em-hiredis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.3.0
 description: em-hiredis with sentinel support for failover
 email:
 - jschneck@mac.com