em-hiredis-sentinel 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 104a38dedcc6966ffbc70bbc9d75aa9f4575355c
-  data.tar.gz: 33f24f9988e59d6949f2dab4061c7cbe749b7bca
+  metadata.gz: 14b1a2ac6854f9241493539a86a73a0b01ec4f31
+  data.tar.gz: a708acfa1ecc2809b39fd66e227192605241ce4a
 SHA512:
-  metadata.gz: 3bf1bb72150d1bf7ccd0b68e2c6a9c49c8c09bb19c79820f6c6d5ad25857d4dc56a9f1bb8a8360532940e899ea7277959eda4cd179e26fd7cd66de66d9b54a7b
-  data.tar.gz: 0e4f3e54b0cdf3a8cf2c2e67a2a841e194a230ee4b983e11bce6cc70421f4c40142178ff662c04a534f1d054e47f753bf12bca9b462e7a7efabeb3925b382a0b
+  metadata.gz: 2debe14cb60821b1eb203fd8fadc7585ad052ee389c9716371c3048c48aa68954a837f9fc66662aefdb324869941591d623c2acaad631de9cc294e022e4359c5
+  data.tar.gz: 43c042ca1d70523e065df6930cafc015efd713fe41c51649c6fc04c273faa20e04c2d459e072747c657c186fe3d16f78566ebc30a29010c258fd0733e0ed3fd4

data/em-hiredis-sentinel.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Justin Schneck"]
   spec.email         = ["jschneck@mac.com"]
   spec.summary       = %q{Redis Sentinel for em-hiredis}
-  spec.description   = %q{Monkey patches em-hiredis with sentinel support for failover}
+  spec.description   = %q{em-hiredis with sentinel support for failover}
   spec.homepage      = "https://github.com/mobileoverlord/em-hiredis-sentinel"
   spec.license       = "MIT"
 
@@ -17,6 +17,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.6"
-  spec.add_development_dependency "rake"
-  spec.add_dependency 'em-hiredis'
+  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_dependency 'em-hiredis', "~> 0.3"
 end

data/lib/em-hiredis-sentinel.rb

@@ -1,2 +1,3 @@
 require 'em-hiredis'
+require 'em-hiredis-sentinel/pubsub_client'
 require 'em-hiredis-sentinel/redis_client'

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

@@ -0,0 +1,24 @@
+module EventMachine::Hiredis
+  class PubsubClient < BaseClient
+    class_eval {
+      def initialize(host='localhost', port='6379', password=nil, db=0)
+        @subs, @psubs = [], []
+        @pubsub_defs = Hash.new { |h,k| h[k] = [] }
+
+        @sub_callbacks = Hash.new { |h, k| h[k] = [] }
+        @psub_callbacks = Hash.new { |h, k| h[k] = [] }
+
+        super
+      end
+
+      def connect
+        # Resubsubscribe to channels on reconnect
+        on(:reconnected) {
+          raw_send_command(:subscribe, @subs) if @subs.any?
+          raw_send_command(:psubscribe, @psubs) if @psubs.any?
+        }
+        super
+      end
+    }
+  end
+end

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

@@ -7,7 +7,7 @@ module EventMachine::Hiredis::Sentinel
     def initialize(sentinels:[], master_name:'mymaster', db:0, password:nil)
       @master_name = master_name
       @sentinels = _parse_sentinel_options(sentinels)
-      p @sentinels
+      #p @sentinels
       raise "Need at least 1 sentinel" if @sentinels.nil? || @sentinels.count < 1
       @sentinels.uniq! {|h| h.values_at(:host, :port) }
       @sentinels.shuffle! #try to randomize

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: em-hiredis-sentinel
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Justin Schneck
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-18 00:00:00.000000000 Z
+date: 2014-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,31 +28,31 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: em-hiredis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-description: Monkey patches em-hiredis with sentinel support for failover
+        version: '0.3'
+description: em-hiredis with sentinel support for failover
 email:
 - jschneck@mac.com
 executables: []
@@ -66,6 +66,7 @@ files:
 - Rakefile
 - em-hiredis-sentinel.gemspec
 - lib/em-hiredis-sentinel.rb
+- lib/em-hiredis-sentinel/pubsub_client.rb
 - lib/em-hiredis-sentinel/redis_client.rb
 - lib/em-hiredis-sentinel/version.rb
 homepage: https://github.com/mobileoverlord/em-hiredis-sentinel