superfeedr-em-redis 0.3.5 → 0.3.6

data/lib/em-redis/redis_protocol.rb

@@ -342,6 +342,7 @@ module EventMachine
         @db             = (options[:db] || 0).to_i
         @password       = options[:password]
         @logger         = options[:logger]
+        @subscriptions  = {} # Subscriptions are empty
         @error_callback = lambda do |code|
           err = RedisError.new
           err.code = code
@@ -452,27 +453,42 @@ module EventMachine
             return
           end
         end
-
-        callback = @redis_callbacks.shift
-        commands, pipelined, blk = callback
-        @values ||= []
-        command = commands[@values.size]
         
-        processor = REPLY_PROCESSOR[command[0]]
-        value = processor.call(value) if processor
-        @values.push(value)
-        if @values.size == commands.size
-          if !pipelined
-            # This was not a PIPELINE!
-            blk.call(@values[0]) if blk
+        if value && value[0] == "message"
+          # PubSub
+          ## We need to call the subscription block!
+          @subscriptions[value[1]].call(value[2]) if @subscriptions[value[1]]
+        else 
+          # Others
+          @values ||= []
+          callback = @redis_callbacks.shift
+          commands, pipelined, blk = callback
+          command = commands[@values.size]
+          processor = REPLY_PROCESSOR[command[0]]
+          value = processor.call(value) if processor
+          @values.push(value)
+          if @values.size == commands.size
+            if !pipelined
+              # This was not a PIPELINE!
+              # If the command was a subscribe, we want to keep track of it!
+              if(@values[0] && @values[0][0] == "subscribe")
+                @subscriptions[@values[0][1]] = blk
+              else
+                blk.call(@values[0]) if blk
+              end
+            else
+              if(@values && @values[0] == "subscribe")
+                @subscriptions[@values[1]] = blk
+              else
+                blk.call(@values) if blk
+              end
+            end
+            @values = []
           else
-            blk.call(@values) if blk
+            # We need to wait for the other commands to succeed as well, so we repipe.
+            @redis_callbacks.unshift([commands, pipelined, blk])
           end
-          @values = []
-        else
-          # We need to wait for the other commands to succeed as well
-          @redis_callbacks.unshift([commands, pipelined, blk])
-        end 
+        end
       end
 
       def unbind

data/lib/em-redis/version.rb

@@ -1,3 +1,3 @@
 module EMRedis
-  VERSION = '0.3.5' unless defined? ::EMRedis::VERSION
+  VERSION = '0.3.6' unless defined? ::EMRedis::VERSION
 end

metadata

@@ -1,15 +1,10 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: superfeedr-em-redis
-version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: false
-  segments: 
-  - 0
-  - 3
-  - 5
-  version: 0.3.5
+version: !ruby/object:Gem::Version
+  version: 0.3.6
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Jonathan Broad
 - Eugene Pimenov
 - Stephan Maka
@@ -17,50 +12,37 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-02-26 00:00:00 +01:00
+date: 2012-02-13 00:00:00.000000000 -08:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: eventmachine
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2164384740 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2164384740
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &2164384120 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15424249
-        segments: 
-        - 1
-        - 0
-        - rc
-        - 6
+      - !ruby/object:Gem::Version
         version: 1.0.rc.6
   type: :development
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: *2164384120
 description: An eventmachine-based implementation of the Redis protocol
 email: 
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/em-redis/redis_protocol.rb
 - lib/em-redis/version.rb
 - lib/em-redis.rb
@@ -68,36 +50,26 @@ files:
 has_rdoc: true
 homepage: http://github.com/superfeedr/em-redis
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: An eventmachine-based implementation of the Redis protocol
 test_files: []
-