superfeedr-em-redis 0.2.3 → 0.2.4

data/.gitignore

@@ -0,0 +1,2 @@
+.DS_Store
+pkg

data/Rakefile

@@ -17,8 +17,8 @@ Bones {
   name 'superfeedr-em-redis'
   authors ['Jonathan Broad', 'Eugene Pimenov', 'Stephan Maka']
   email 'stephan@spaceboyz.net'
-  url 'http://github.com/libc/em-redis'
-  summary 'An eventmachine-based implementation of the Redis protocol'
+  url 'http://github.com/astro/em-redis'
+  summary 'An eventmachine-based implementation of the Redis protocol (forked)'
   description summary
   version EMRedis::VERSION
 

data/lib/em-redis/redis_protocol.rb

@@ -44,7 +44,7 @@ module EventMachine
         "multi_get" => true
       }
 
-      BOOLEAN_PROCESSOR = lambda{|r| r == 1 }
+      BOOLEAN_PROCESSOR = lambda{|r| %w(1 OK).include? r.to_s }
 
       REPLY_PROCESSOR = {
         "exists"    => BOOLEAN_PROCESSOR,
@@ -232,6 +232,32 @@ module EventMachine
       end
 
       def raw_call_command(argv, &blk)
+        argv[0] = argv[0].to_s unless argv[0].kind_of? String
+        send_command(argv)
+        @redis_callbacks << [REPLY_PROCESSOR[argv[0]], blk]
+      end
+
+      def call_commands(argvs, &blk)
+        callback { raw_call_commands(argvs, &blk) }
+      end
+
+      def raw_call_commands(argvs, &blk)
+        if argvs.empty?  # Shortcut
+          blk.call []
+          return
+        end
+
+        argvs.each do |argv|
+          argv[0] = argv[0].to_s unless argv[0].kind_of? String
+          send_command argv
+        end
+        # FIXME: argvs may contain heterogenous commands, storing all
+        # REPLY_PROCESSORs may turn out expensive and has been omitted
+        # for now.
+        @redis_callbacks << [nil, argvs.length, blk]
+      end
+
+      def send_command(argv)
         argv = argv.dup
 
         if MULTI_BULK_COMMANDS[argv.flatten[0].to_s]
@@ -261,7 +287,6 @@ module EventMachine
         end
 
         @logger.debug { "*** sending: #{command}" } if @logger
-        @redis_callbacks << [REPLY_PROCESSOR[argv[0]], blk]
         send_data command
       end
 
@@ -313,6 +338,7 @@ module EventMachine
           err.code = code
           raise err, "Redis server returned error code: #{code}"
         end
+        @values = []
 
         # These commands should be first
         auth_and_select_db
@@ -361,7 +387,7 @@ module EventMachine
         #e.g. -MISSING
         when MINUS
           # Missing, dispatch empty response
-          dispatch_response('')
+          dispatch_response(nil)
         # e.g. +OK
         when PLUS
           dispatch_response(reply_args)
@@ -409,9 +435,22 @@ module EventMachine
           end
         end
 
-        processor, blk = @redis_callbacks.shift
-        value = processor.call(value) if processor
-        blk.call(value) if blk
+        callback = @redis_callbacks.shift
+        if callback.length == 2
+          processor, blk = callback
+          value = processor.call(value) if processor
+          blk.call(value) if blk
+        else
+          processor, pipeline_count, blk = callback
+          value = processor.call(value) if processor
+          @values << value
+          if pipeline_count > 1
+            @redis_callbacks.unshift [processor, pipeline_count - 1, blk]
+          else
+            blk.call(@values) if blk
+            @values = []
+          end
+        end
       end
 
       def start_multibulk(multibulk_count)

data/lib/em-redis.rb

@@ -2,7 +2,7 @@
 module EMRedis
 
   # :stopdoc:
-  VERSION = '0.2.3'
+  VERSION = '0.2.4'
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
   PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
   # :startdoc:

data/spec/redis_commands_spec.rb

@@ -551,9 +551,8 @@ EM.describe EM::Protocols::Redis do
 
     # attempt to update a key that's not a zset
     @r["i_am_not_a_zet"] = "value"
-    # should raise error
-    @r.on_error { true.should == true }
-    @r.zset_incr_by("i_am_not_a_zet", 23, "element") { false.should == true }
+    # shouldn't raise error anymore
+    @r.zset_incr_by("i_am_not_a_zet", 23, "element") { |r| r.should == nil }
 
     @r.delete("hackers")
     @r.delete("i_am_not_a_zet") { done }
@@ -644,4 +643,27 @@ EM.describe EM::Protocols::Redis do
   #   # lambda { @r.sync }.should.raise
   #   done
   # end
-end
+
+  it "should work with 10 commands" do
+    @r.call_commands((1..10).map { |i|
+                       ['get', "foo"]
+                     }) do |rs|
+      rs.length.should == 10
+      rs.each { |r| r.should == "bar" }
+      done
+    end
+  end
+  it "should work with 1 command" do
+    @r.call_commands([['get', "foo"]]) do |rs|
+      rs.length.should == 1
+      rs[0].should == "bar"
+      done
+    end
+  end
+  it "should work with zero commands" do
+    @r.call_commands([]) do |rs|
+      rs.should == []
+      done
+    end
+  end
+end

data/spec/test_helper.rb

@@ -1,4 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + "/../lib/em-redis")
+require 'bacon'
 require 'em-spec/bacon'
 
 EM.spec_backend = EventMachine::Spec::Bacon

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: superfeedr-em-redis
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors: 
 - Jonathan Broad
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-31 00:00:00 +02:00
+date: 2010-04-01 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,7 +42,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.2.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: bones
@@ -54,7 +54,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 3.4.1
     version: 
-description: An eventmachine-based implementation of the Redis protocol
+description: An eventmachine-based implementation of the Redis protocol (forked)
 email: stephan@spaceboyz.net
 executables: []
 
@@ -64,6 +64,7 @@ extra_rdoc_files:
 - History.txt
 - README.rdoc
 files: 
+- .gitignore
 - History.txt
 - README.rdoc
 - Rakefile
@@ -74,7 +75,7 @@ files:
 - spec/redis_protocol_spec.rb
 - spec/test_helper.rb
 has_rdoc: true
-homepage: http://github.com/libc/em-redis
+homepage: http://github.com/astro/em-redis
 licenses: []
 
 post_install_message: 
@@ -101,6 +102,6 @@ rubyforge_project: superfeedr-em-redis
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: An eventmachine-based implementation of the Redis protocol
+summary: An eventmachine-based implementation of the Redis protocol (forked)
 test_files: []