superfeedr-em-redis 0.2.6 → 0.2.7

data/Rakefile

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

data/lib/em-redis.rb

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

data/lib/em-redis/redis_protocol.rb

@@ -34,12 +34,16 @@ module EventMachine
         "zadd"      => true,
         "zincrby"   => true,
         "zrem"      => true,
-        "zscore"    => true
+        "zscore"    => true,
+        "hget"      => true,
+        "hdel"      => true,
+        "hexists"   => true
       }
 
       MULTI_BULK_COMMANDS = {
         "mset"      => true,
         "msetnx"    => true,
+        "hset"      => true,
         # these aliases aren't in redis gem
         "multi_get" => true
       }
@@ -60,7 +64,16 @@ module EventMachine
         "renamenx"  => BOOLEAN_PROCESSOR,
         "expire"    => BOOLEAN_PROCESSOR,
         "select"    => BOOLEAN_PROCESSOR, # not in redis gem
-        "keys"      => lambda{|r| r.split(" ")},
+        "hset"      => BOOLEAN_PROCESSOR,
+        "hdel"      => BOOLEAN_PROCESSOR,
+        "hexists"   => BOOLEAN_PROCESSOR,
+        "keys"      => lambda {|r|
+          if r.is_a?(Array)
+            r
+          else
+            r.split(" ")
+          end
+        },
         "info"      => lambda{|r|
           info = {}
           r.each_line {|kv|
@@ -68,6 +81,9 @@ module EventMachine
             info[k.to_sym] = v
           }
           info
+        }, 
+        "hgetall"   => lambda{|r|
+          Hash[*r]
         }
       }
 
@@ -218,64 +234,80 @@ module EventMachine
         call_command(['quit'], &blk)
       end
 
-      def errback(&blk)
-        @error_callback = blk
+      def exec(&blk)
+        call_command(['exec'], &blk)
       end
-      alias_method :on_error, :errback
 
-      def method_missing(*argv, &blk)
-        call_command(argv, &blk)
+      # I'm not sure autocommit is a good idea.
+      # For example:
+      #   r.multi { r.set('a', 'b') { raise "kaboom" } }
+      # will commit "a" and will stop EM
+      def multi
+        call_command(['multi'])
+        if block_given?
+          begin
+            yield self
+            exec
+          rescue Exception => e
+            discard
+            raise e
+          end
+        end
       end
 
-      def call_command(argv, &blk)
-        callback { raw_call_command(argv, &blk) }
+      def mset(*args, &blk)
+        hsh = args.pop if Hash === args.last
+        if hsh
+          call_command(hsh.to_a.flatten.unshift(:mset), &blk)
+        else
+          call_command(args.unshift(:mset), &blk)
+        end
       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]
+      def msetnx(*args, &blk)
+        hsh = args.pop if Hash === args.last
+        if hsh
+          call_command(hsh.to_a.flatten.unshift(:msetnx), &blk)
+        else
+          call_command(args.unshift(:msetnx), &blk)
+        end
       end
 
-      def call_commands(argvs, &blk)
-        callback { raw_call_commands(argvs, &blk) }
+      def errback(&blk)
+        @error_callback = blk
       end
+      alias_method :on_error, :errback
 
-      def raw_call_commands(argvs, &blk)
-        if argvs.empty?  # Shortcut
-          blk.call []
-          return
-        end
+      def method_missing(*argv, &blk)
+        call_command(argv, &blk)
+      end
 
-        argvs.each do |argv|
-          argv[0] = argv[0].to_s unless argv[0].kind_of? String
-          send_command argv
+      def maybe_lock(&blk)
+        if !EM.reactor_thread?
+          EM.schedule { maybe_lock(&blk) }
+        elsif @connected
+          yield
+        else
+          callback { yield }
         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)
+      def call_command(argv, &blk)
         argv = argv.dup
 
-        if MULTI_BULK_COMMANDS[argv.flatten[0].to_s]
-          # TODO improve this code
-          argvp   = argv.flatten
-          values  = argvp.pop.to_a.flatten
-          argvp   = values.unshift(argvp[0])
-          command = ["*#{argvp.size}"]
-          argvp.each do |v|
-            v = v.to_s
-            command << "$#{get_size(v)}"
-            command << v
+        argv[0] = argv[0].to_s.downcase
+        if MULTI_BULK_COMMANDS[argv[0]]
+          command = ""
+          command << "*#{argv.size}\r\n"
+          argv.each do |a|
+            a = a.to_s
+            command << "$#{get_size(a)}\r\n"
+            command << a
+            command << "\r\n"
           end
-          command = command.map {|cmd| "#{cmd}\r\n"}.join
         else
           command = ""
           bulk = nil
-          argv[0] = argv[0].to_s.downcase
           argv[0] = ALIASES[argv[0]] if ALIASES[argv[0]]
           raise "#{argv[0]} command is disabled" if DISABLED_COMMANDS[argv[0]]
           if BULK_COMMANDS[argv[0]] and argv.length > 1
@@ -287,7 +319,27 @@ module EventMachine
         end
 
         @logger.debug { "*** sending: #{command}" } if @logger
-        send_data command
+        maybe_lock do
+          @redis_callbacks << [REPLY_PROCESSOR[argv[0]], blk]
+          send_data command
+        end
+      end
+
+      def call_commands(argvs, &blk)
+        pending = 0
+        results = []
+        check = lambda {
+          blk.call(results) if pending < 1
+        }
+        argvs.each do |argv|
+          call_command(argv) { |result|
+            results << result
+            pending -= 1
+            check.call
+          }
+          pending += 1
+        end
+        check.call
       end
 
       ##
@@ -318,7 +370,7 @@ module EventMachine
           else raise ArgumentError, 'first argument must be Hash or String'
           end
         when 2
-          options = {:host => args[1], :port => args[2]}
+          options = {:host => args[0], :port => args[1]}
         else
           raise ArgumentError, "wrong number of arguments (#{args.length} for 1)"
         end
@@ -338,7 +390,6 @@ module EventMachine
           err.code = code
           raise err, "Redis server returned error code: #{code}"
         end
-        @values = []
 
         # These commands should be first
         auth_and_select_db
@@ -410,10 +461,11 @@ module EventMachine
         #e.g. *2\r\n$1\r\na\r\n$1\r\nb\r\n 
         when ASTERISK
           multibulk_count = Integer(reply_args)
-          if multibulk_count == -1
+          if multibulk_count == -1 || multibulk_count == 0
             dispatch_response([])
           else
-            start_multibulk(multibulk_count)
+            @multibulk_n = multibulk_count
+            @multibulk_values = []
           end
         # Whu?
         else

data/spec/live_redis_protocol_spec.rb

@@ -53,14 +53,14 @@ EM.describe EM::Protocols::Redis, "connected to an empty db" do
 
   should "be able to 'lpush' to a nonexistent list" do
     @c.lpush("foo", "bar") do |r|
-      r.should == "OK"
+      r.should == 1
       done
     end
   end
 
   should "be able to 'rpush' to a nonexistent list" do
     @c.rpush("foo", "bar") do |r|
-      r.should == "OK"
+      r.should == 1
       done
     end
   end
@@ -222,7 +222,7 @@ EM.describe EM::Protocols::Redis, "connected to a db containing a list" do
 
   should "be able to 'rpush' onto the tail of the list" do
     @c.rpush "foo", "d" do |r|
-      r.should == "OK"
+      r.should == 4
       @c.rpop "foo" do |r|
         r.should == "d"
         done
@@ -232,7 +232,7 @@ EM.describe EM::Protocols::Redis, "connected to a db containing a list" do
 
   should "be able to 'lpush' onto the head of the list" do
     @c.lpush "foo", "d" do |r|
-      r.should == "OK"
+      r.should == 4
       @c.lpop "foo" do |r|
         r.should == "d"
         done

data/spec/redis_commands_spec.rb

@@ -10,6 +10,7 @@ EM.describe EM::Protocols::Redis do
     @r['foo'] = 'bar'
   end
 
+  after { @r.close_connection }
 
   should "be able to provide a logger" do
     log = StringIO.new
@@ -644,6 +645,90 @@ EM.describe EM::Protocols::Redis do
   #   done
   # end
 
+  it "should run MULTI without a block" do
+    @r.multi
+    @r.get("key1") { |r| r.should == "QUEUED" }
+    @r.discard { done }
+  end
+
+  it "should run MULTI/EXEC with a block" do
+    @r.multi do
+      @r.set "key1", "value1"
+    end
+
+    @r.get("key1") { |r| r.should == "value1" }
+
+    begin
+      @r.multi do
+        @r.set "key2", "value2"
+        raise "Some error"
+        @r.set "key3", "value3"
+      end
+    rescue
+    end
+
+    @r.get("key2") { |r| r.should == nil }
+    @r.get("key3") { |r| r.should == nil; done}
+  end
+
+  it "should yield the Redis object when using #multi with a block" do
+    @r.multi do |multi|
+      multi.set "key1", "value1"
+    end
+
+    @r.get("key1") { |r| r.should == "value1"; done }
+  end
+
+  it "can set and get hash values" do
+    @r.hset("rush", "signals", "1982") { |r| r.should == true }
+    @r.hexists("rush", "signals") { |r| r.should == true }
+    @r.hget("rush", "signals") { |r| r.should == "1982"; done }
+  end
+
+  it "can delete hash values" do
+    @r.hset("rush", "YYZ", "1981")
+    @r.hdel("rush", "YYZ") { |r| r.should == true }
+    @r.hexists("rush", "YYZ") { |r| r.should == false; done }
+  end
+end
+
+# Yup, bacon can't handle nested describe blocks properly
+EM.describe EM::Protocols::Redis, "with some hash values" do
+  default_timeout 1
+
+  before do
+    @r = EM::Protocols::Redis.connect :db => 14
+    @r.flushdb
+    @r['foo'] = 'bar'
+    @r.hset("rush", "permanent waves", "1980")
+    @r.hset("rush", "moving pictures", "1981")
+    @r.hset("rush", "signals", "1982")
+  end
+
+  after { @r.close_connection }
+
+  it "can get the length of the hash" do
+    @r.hlen("rush") { |r| r.should == 3 }
+    @r.hlen("yyz") { |r| r.should == 0; done }
+  end
+
+  it "can get the keys and values of the hash" do
+    @r.hkeys("rush") { |r| r.should == ["permanent waves", "moving pictures", "signals"] }
+    @r.hvals("rush") { |r| r.should == %w[1980 1981 1982] }
+    @r.hvals("yyz") { |r| r.should == []; done }
+  end
+
+  it "returns a hash for HGETALL" do
+    @r.hgetall("rush") do |r|
+        r.should == {
+        "permanent waves" => "1980",
+        "moving pictures" => "1981",
+        "signals"         => "1982"
+      }
+    end
+    @r.hgetall("yyz") { |r| r.should == {}; done }
+  end
+
   it "should work with 10 commands" do
     @r.call_commands((1..10).map { |i|
                        ['get', "foo"]

data/spec/redis_commands_spec.rb.orig

@@ -0,0 +1,731 @@
+require File.expand_path(File.dirname(__FILE__) + "/test_helper.rb")
+require 'logger'
+
+EM.describe EM::Protocols::Redis do
+  default_timeout 1
+
+  before do
+    @r = EM::Protocols::Redis.connect :db => 14
+    @r.flushdb
+    @r['foo'] = 'bar'
+  end
+
+  after { @r.close_connection }
+
+  should "be able to provide a logger" do
+    log = StringIO.new
+    r = EM::Protocols::Redis.connect :db => 14, :logger => Logger.new(log)
+    r.ping do
+      log.string.should.include "ping"
+      done
+    end
+  end
+
+  it "should be able to PING" do
+    @r.ping { |r| r.should == 'PONG'; done }
+  end
+
+  it "should be able to GET a key" do
+    @r.get('foo') { |r| r.should == 'bar'; done }
+  end
+
+  it "should be able to SET a key" do
+    @r['foo'] = 'nik'
+    @r.get('foo') { |r| r.should == 'nik'; done }
+  end
+
+  it "should properly handle trailing newline characters" do
+    @r['foo'] = "bar\n"
+    @r.get('foo') { |r| r.should == "bar\n"; done }
+  end
+
+  it "should store and retrieve all possible characters at the beginning and the end of a string" do
+    (0..255).each do |char_idx|
+      string = "#{char_idx.chr}---#{char_idx.chr}"
+      @r['foo'] = string
+      @r.get('foo') { |r| r.should == string }
+    end
+    @r.ping { done }
+  end
+
+  it "should be able to SET a key with an expiry" do
+    timeout(3)
+
+    @r.set('foo', 'bar', 1)
+    @r.get('foo') { |r| r.should == 'bar' }
+    EM.add_timer(2) do
+      @r.get('foo') { |r| r.should == nil }
+      @r.ping { done }
+    end
+  end
+
+  it "should be able to return a TTL for a key" do
+    @r.set('foo', 'bar', 1)
+    @r.ttl('foo') { |r| r.should == 1; done }
+  end
+
+  it "should be able to SETNX" do
+    @r['foo'] = 'nik'
+    @r.get('foo') { |r| r.should == 'nik' }
+    @r.setnx 'foo', 'bar'
+    @r.get('foo') { |r| r.should == 'nik' }
+
+    @r.ping { done }
+  end
+  #
+  it "should be able to GETSET" do
+   @r.getset('foo', 'baz') { |r| r.should == 'bar' }
+   @r.get('foo') { |r| r.should == 'baz'; done }
+  end
+  #
+  it "should be able to INCR a key" do
+    @r.del('counter')
+    @r.incr('counter') { |r| r.should == 1 }
+    @r.incr('counter') { |r| r.should == 2 }
+    @r.incr('counter') { |r| r.should == 3 }
+
+    @r.ping { done }
+  end
+  #
+  it "should be able to INCRBY a key" do
+    @r.del('counter')
+    @r.incrby('counter', 1) { |r| r.should == 1 }
+    @r.incrby('counter', 2) { |r| r.should == 3 }
+    @r.incrby('counter', 3) { |r| r.should == 6 }
+
+    @r.ping { done }
+  end
+  #
+  it "should be able to DECR a key" do
+    @r.del('counter')
+    @r.incr('counter') { |r| r.should == 1 }
+    @r.incr('counter') { |r| r.should == 2 }
+    @r.incr('counter') { |r| r.should == 3 }
+    @r.decr('counter') { |r| r.should == 2 }
+    @r.decr('counter', 2) { |r| r.should == 0; done }
+  end
+  #
+  it "should be able to RANDKEY" do
+    @r.randkey { |r| r.should.not == nil; done }
+  end
+  #
+  it "should be able to RENAME a key" do
+    @r.del 'foo'
+    @r.del 'bar'
+    @r['foo'] = 'hi'
+    @r.rename 'foo', 'bar'
+    @r.get('bar') { |r| r.should == 'hi' ; done }
+  end
+  #
+  it "should be able to RENAMENX a key" do
+    @r.del 'foo'
+    @r.del 'bar'
+    @r['foo'] = 'hi'
+    @r['bar'] = 'ohai'
+    @r.renamenx 'foo', 'bar'
+    @r.get('bar') { |r| r.should == 'ohai' ; done }
+  end
+  #
+  it "should be able to get DBSIZE of the database" do
+    dbsize_without_foo, dbsize_with_foo = nil
+    @r.delete 'foo'
+    @r.dbsize { |r| dbsize_without_foo = r }
+    @r['foo'] = 0
+    @r.dbsize { |r| dbsize_with_foo = r }
+
+    @r.ping do
+      dbsize_with_foo.should == dbsize_without_foo + 1
+      done
+    end
+  end
+  #
+  it "should be able to EXPIRE a key" do
+    timeout(3)
+
+    @r['foo'] = 'bar'
+    @r.expire 'foo', 1
+    @r.get('foo') { |r| r.should == "bar" }
+    EM.add_timer(2) do
+      @r.get('foo') { |r| r.should == nil }
+      @r.ping { done }
+    end
+  end
+  #
+  it "should be able to EXISTS" do
+    @r['foo'] = 'nik'
+    @r.exists('foo') { |r| r.should == true }
+    @r.del 'foo'
+    @r.exists('foo') { |r| r.should == false ; done }
+  end
+  #
+  it "should be able to KEYS" do
+    @r.keys("f*") { |keys| keys.each { |key| @r.del key } }
+    @r['f'] = 'nik'
+    @r['fo'] = 'nak'
+    @r['foo'] = 'qux'
+    @r.keys("f*") { |r| r.sort.should == ['f', 'fo', 'foo'].sort }
+
+    @r.ping { done }
+  end
+  #
+  it "should be able to return a random key (RANDOMKEY)" do
+    3.times do |i|
+      @r.randomkey do |r|
+        @r.exists(r) do |e|
+          e.should == true
+          done if i == 2
+        end
+      end
+    end
+  end
+  #
+  it "should be able to check the TYPE of a key" do
+    @r['foo'] = 'nik'
+    @r.type('foo') { |r| r.should == "string" }
+    @r.del 'foo'
+    @r.type('foo') { |r| r.should == "none" ; done }
+  end
+  #
+  it "should be able to push to the head of a list (LPUSH)" do
+    @r.lpush "list", 'hello'
+    @r.lpush "list", 42
+    @r.type('list') { |r| r.should == "list" }
+    @r.llen('list') { |r| r.should == 2 }
+    @r.lpop('list') { |r| r.should == '42'; done }
+  end
+  #
+  it "should be able to push to the tail of a list (RPUSH)" do
+    @r.rpush "list", 'hello'
+    @r.type('list') { |r| r.should == "list" }
+    @r.llen('list') { |r| r.should == 1 ; done }
+  end
+  #
+  it "should be able to pop the tail of a list (RPOP)" do
+    @r.rpush "list", 'hello'
+    @r.rpush"list", 'goodbye'
+    @r.type('list') { |r| r.should == "list" }
+    @r.llen('list') { |r| r.should == 2 }
+    @r.rpop('list') { |r| r.should == 'goodbye'; done }
+  end
+  #
+  it "should be able to pop the head of a list (LPOP)" do
+    @r.rpush "list", 'hello'
+    @r.rpush "list", 'goodbye'
+    @r.type('list') { |r| r.should == "list" }
+    @r.llen('list') { |r| r.should == 2 }
+    @r.lpop('list') { |r| r.should == 'hello'; done }
+  end
+  #
+  it "should be able to get the length of a list (LLEN)" do
+    @r.rpush "list", 'hello'
+    @r.rpush "list", 'goodbye'
+    @r.type('list') { |r| r.should == "list" }
+    @r.llen('list') { |r| r.should == 2 ; done }
+  end
+  #
+  it "should be able to get a range of values from a list (LRANGE)" do
+    @r.rpush "list", 'hello'
+    @r.rpush "list", 'goodbye'
+    @r.rpush "list", '1'
+    @r.rpush "list", '2'
+    @r.rpush "list", '3'
+    @r.type('list') { |r| r.should == "list" }
+    @r.llen('list') { |r| r.should == 5 }
+    @r.lrange('list', 2, -1) { |r| r.should == ['1', '2', '3']; done }
+  end
+  #
+  it "should be able to trim a list (LTRIM)" do
+    @r.rpush "list", 'hello'
+    @r.rpush "list", 'goodbye'
+    @r.rpush "list", '1'
+    @r.rpush "list", '2'
+    @r.rpush "list", '3'
+    @r.type('list') { |r| r.should == "list" }
+    @r.llen('list') { |r| r.should == 5 }
+    @r.ltrim 'list', 0, 1
+    @r.llen('list') { |r| r.should == 2 }
+    @r.lrange('list', 0, -1) { |r| r.should == ['hello', 'goodbye']; done }
+  end
+  #
+  it "should be able to get a value by indexing into a list (LINDEX)" do
+    @r.rpush "list", 'hello'
+    @r.rpush "list", 'goodbye'
+    @r.type('list') { |r| r.should == "list" }
+    @r.llen('list') { |r| r.should == 2 }
+    @r.lindex('list', 1) { |r| r.should == 'goodbye'; done }
+  end
+  #
+  it "should be able to set a value by indexing into a list (LSET)" do
+    @r.rpush "list", 'hello'
+    @r.rpush "list", 'hello'
+    @r.type('list') { |r| r.should == "list" }
+    @r.llen('list') { |r| r.should == 2 }
+    @r.lset('list', 1, 'goodbye') { |r| r.should == 'OK' }
+    @r.lindex('list', 1) { |r| r.should == 'goodbye'; done }
+  end
+  #
+  it "should be able to remove values from a list (LREM)" do
+    @r.rpush "list", 'hello'
+    @r.rpush "list", 'goodbye'
+    @r.type('list') { |r| r.should == "list" }
+    @r.llen('list') { |r| r.should == 2 }
+    @r.lrem('list', 1, 'hello') { |r| r.should == 1 }
+    @r.lrange('list', 0, -1) { |r| r.should == ['goodbye']; done }
+  end
+
+  it "should be able to pop values from a list and push them onto a temp list(RPOPLPUSH)" do
+    @r.rpush "list", 'one'
+    @r.rpush "list", 'two'
+    @r.rpush "list", 'three'
+    @r.type('list') { |r| r.should == "list" }
+    @r.llen('list') { |r| r.should == 3 }
+    @r.lrange('list', 0, -1) { |r| r.should == ['one', 'two', 'three'] }
+    @r.lrange('tmp', 0, -1) { |r| r.should == [] }
+    @r.rpoplpush('list', 'tmp') { |r| r.should == 'three' }
+    @r.lrange('tmp', 0, -1) { |r| r.should == ['three'] }
+    @r.rpoplpush('list', 'tmp') { |r| r.should == 'two' }
+    @r.lrange('tmp', 0, -1) { |r| r.should == ['two', 'three'] }
+    @r.rpoplpush('list', 'tmp') { |r| r.should == 'one' }
+    @r.lrange('tmp', 0, -1) { |r| r.should == ['one', 'two', 'three']; done }
+  end
+  #
+  it "should be able add members to a set (SADD)" do
+    @r.sadd "set", 'key1'
+    @r.sadd "set", 'key2'
+    @r.type('set') { |r| r.should == "set" }
+    @r.scard('set') { |r| r.should == 2 }
+    @r.smembers('set') { |r| r.sort.should == ['key1', 'key2'].sort; done }
+  end
+  #
+  it "should be able delete members to a set (SREM)" do
+    @r.sadd "set", 'key1'
+    @r.sadd "set", 'key2'
+    @r.type('set') { |r| r.should == "set" }
+    @r.scard('set') { |r| r.should == 2 }
+    @r.smembers('set') { |r| r.sort.should == ['key1', 'key2'].sort }
+    @r.srem('set', 'key1')
+    @r.scard('set') { |r| r.should == 1 }
+    @r.smembers('set') { |r| r.should == ['key2']; done }
+  end
+  #
+  it "should be able to return and remove random key from set (SPOP)" do
+    @r.sadd "set_pop", "key1"
+    @r.sadd "set_pop", "key2"
+    @r.spop("set_pop") { |r| r.should.not == nil }
+    @r.scard("set_pop") { |r| r.should == 1; done }
+  end
+  #
+  it "should be able to return random key without delete the key from a set (SRANDMEMBER)" do
+    @r.sadd "set_srandmember", "key1"
+    @r.sadd "set_srandmember", "key2"
+    @r.srandmember("set_srandmember") { |r| r.should.not == nil }
+    @r.scard("set_srandmember") { |r| r.should == 2; done }
+  end
+  #
+  it "should be able count the members of a set (SCARD)" do
+    @r.sadd "set", 'key1'
+    @r.sadd "set", 'key2'
+    @r.type('set') { |r| r.should == "set" }
+    @r.scard('set') { |r| r.should == 2; done }
+  end
+  #
+  it "should be able test for set membership (SISMEMBER)" do
+    @r.sadd "set", 'key1'
+    @r.sadd "set", 'key2'
+    @r.type('set') { |r| r.should == "set" }
+    @r.scard('set') { |r| r.should == 2 }
+    @r.sismember('set', 'key1') { |r| r.should == true }
+    @r.sismember('set', 'key2') { |r| r.should == true }
+    @r.sismember('set', 'notthere') { |r| r.should == false; done }
+  end
+  #
+  it "should be able to do set intersection (SINTER)" do
+    @r.sadd "set", 'key1'
+    @r.sadd "set", 'key2'
+    @r.sadd "set2", 'key2'
+    @r.sinter('set', 'set2') { |r| r.should == ['key2']; done }
+  end
+  #
+  it "should be able to do set intersection and store the results in a key (SINTERSTORE)" do
+    @r.sadd "set", 'key1'
+    @r.sadd "set", 'key2'
+    @r.sadd "set2", 'key2'
+    @r.sinterstore('newone', 'set', 'set2') { |r| r.should == 1 }
+    @r.smembers('newone') { |r| r.should == ['key2']; done }
+  end
+  #
+  it "should be able to do set union (SUNION)" do
+    @r.sadd "set", 'key1'
+    @r.sadd "set", 'key2'
+    @r.sadd "set2", 'key2'
+    @r.sadd "set2", 'key3'
+    @r.sunion('set', 'set2') { |r| r.sort.should == ['key1','key2','key3'].sort; done }
+  end
+  #
+  it "should be able to do set union and store the results in a key (SUNIONSTORE)" do
+    @r.sadd "set", 'key1'
+    @r.sadd "set", 'key2'
+    @r.sadd "set2", 'key2'
+    @r.sadd "set2", 'key3'
+    @r.sunionstore('newone', 'set', 'set2') { |r| r.should == 3 }
+    @r.smembers('newone') { |r| r.sort.should == ['key1','key2','key3'].sort; done }
+  end
+  #
+  it "should be able to do set difference (SDIFF)" do
+     @r.sadd "set", 'a'
+     @r.sadd "set", 'b'
+     @r.sadd "set2", 'b'
+     @r.sadd "set2", 'c'
+     @r.sdiff('set', 'set2') { |r| r.should == ['a']; done }
+   end
+  #
+  it "should be able to do set difference and store the results in a key (SDIFFSTORE)" do
+     @r.sadd "set", 'a'
+     @r.sadd "set", 'b'
+     @r.sadd "set2", 'b'
+     @r.sadd "set2", 'c'
+     @r.sdiffstore('newone', 'set', 'set2')
+     @r.smembers('newone') { |r| r.should == ['a']; done }
+   end
+  #
+  it "should be able move elements from one set to another (SMOVE)" do
+    @r.sadd 'set1', 'a'
+    @r.sadd 'set1', 'b'
+    @r.sadd 'set2', 'x'
+    @r.smove('set1', 'set2', 'a') { |r| r.should == true }
+    @r.sismember('set2', 'a') { |r| r.should == true }
+    @r.delete('set1') { done }
+  end
+  #
+  it "should be able to do crazy SORT queries" do
+    # The 'Dogs' is capitialized on purpose
+    @r['dog_1'] = 'louie'
+    @r.rpush 'Dogs', 1
+    @r['dog_2'] = 'lucy'
+    @r.rpush 'Dogs', 2
+    @r['dog_3'] = 'max'
+    @r.rpush 'Dogs', 3
+    @r['dog_4'] = 'taj'
+    @r.rpush 'Dogs', 4
+    @r.sort('Dogs', :get => 'dog_*', :limit => [0,1]) { |r| r.should == ['louie'] }
+    @r.sort('Dogs', :get => 'dog_*', :limit => [0,1], :order => 'desc alpha') { |r| r.should == ['taj'] }
+    @r.ping { done }
+  end
+
+  it "should be able to handle array of :get using SORT" do
+    @r['dog:1:name'] = 'louie'
+    @r['dog:1:breed'] = 'mutt'
+    @r.rpush 'dogs', 1
+    @r['dog:2:name'] = 'lucy'
+    @r['dog:2:breed'] = 'poodle'
+    @r.rpush 'dogs', 2
+    @r['dog:3:name'] = 'max'
+    @r['dog:3:breed'] = 'hound'
+    @r.rpush 'dogs', 3
+    @r['dog:4:name'] = 'taj'
+    @r['dog:4:breed'] = 'terrier'
+    @r.rpush 'dogs', 4
+    @r.sort('dogs', :get => ['dog:*:name', 'dog:*:breed'], :limit => [0,1]) { |r| r.should == ['louie', 'mutt'] }
+    @r.sort('dogs', :get => ['dog:*:name', 'dog:*:breed'], :limit => [0,1], :order => 'desc alpha') { |r| r.should == ['taj', 'terrier'] }
+    @r.ping { done }
+  end
+  #
+  it "should be able count the members of a zset" do
+    @r.set_add "set", 'key1'
+    @r.set_add "set", 'key2'
+    @r.zset_add 'zset', 1, 'set'
+    @r.zset_count('zset') { |r| r.should == 1 }
+    @r.delete('set')
+    @r.delete('zset') { done }
+  end
+  # 
+  it "should be able add members to a zset" do
+    @r.set_add "set", 'key1'
+    @r.set_add "set", 'key2'
+    @r.zset_add 'zset', 1, 'set'
+    @r.zset_range('zset', 0, 1) { |r| r.should == ['set'] }
+    @r.zset_count('zset') { |r| r.should == 1 }
+    @r.delete('set')
+    @r.delete('zset') { done }
+  end
+  # 
+  it "should be able delete members to a zset" do
+    @r.set_add "set", 'key1'
+    @r.set_add "set", 'key2'
+    @r.type?('set') { |r| r.should == "set" }
+    @r.set_add "set2", 'key3'
+    @r.set_add "set2", 'key4'
+    @r.type?('set2') { |r| r.should == "set" }
+    @r.zset_add 'zset', 1, 'set'
+    @r.zset_count('zset') { |r| r.should == 1 }
+    @r.zset_add 'zset', 2, 'set2'
+    @r.zset_count('zset') { |r| r.should == 2 }
+    @r.zset_delete 'zset', 'set'
+    @r.zset_count('zset') { |r| r.should == 1 }
+    @r.delete('set')
+    @r.delete('set2')
+    @r.delete('zset') { done }
+  end
+  # 
+  it "should be able to get a range of values from a zset" do
+    @r.set_add "set", 'key1'
+    @r.set_add "set", 'key2'
+    @r.set_add "set2", 'key3'
+    @r.set_add "set2", 'key4'
+    @r.set_add "set3", 'key1'
+    @r.type?('set') { |r| r.should == 'set' }
+    @r.type?('set2') { |r| r.should == 'set' }
+    @r.type?('set3') { |r| r.should == 'set' }
+    @r.zset_add 'zset', 1, 'set'
+    @r.zset_add 'zset', 2, 'set2'
+    @r.zset_add 'zset', 3, 'set3'
+    @r.zset_count('zset') { |r| r.should == 3 }
+    @r.zset_range('zset', 0, 3) { |r| r.should == ['set', 'set2', 'set3'] }
+    @r.delete('set')
+    @r.delete('set2')
+    @r.delete('set3')
+    @r.delete('zset') { done }
+  end
+  # 
+  it "should be able to get a reverse range of values from a zset" do
+    @r.set_add "set", 'key1'
+    @r.set_add "set", 'key2'
+    @r.set_add "set2", 'key3'
+    @r.set_add "set2", 'key4'
+    @r.set_add "set3", 'key1'
+    @r.type?('set') { |r| r.should == 'set' }
+    @r.type?('set2') { |r| r.should == 'set' }
+    @r.type?('set3') { |r| r.should == 'set' }
+    @r.zset_add 'zset', 1, 'set'
+    @r.zset_add 'zset', 2, 'set2'
+    @r.zset_add 'zset', 3, 'set3'
+    @r.zset_count('zset') { |r| r.should == 3 }
+    @r.zset_reverse_range('zset', 0, 3) { |r| r.should == ['set3', 'set2', 'set'] }
+    @r.delete('set')
+    @r.delete('set2')
+    @r.delete('set3')
+    @r.delete('zset') { done }
+  end
+  # 
+  it "should be able to get a range by score of values from a zset" do
+    @r.set_add "set", 'key1'
+    @r.set_add "set", 'key2'
+    @r.set_add "set2", 'key3'
+    @r.set_add "set2", 'key4'
+    @r.set_add "set3", 'key1'
+    @r.set_add "set4", 'key4'
+    @r.zset_add 'zset', 1, 'set'
+    @r.zset_add 'zset', 2, 'set2'
+    @r.zset_add 'zset', 3, 'set3'
+    @r.zset_add 'zset', 4, 'set4'
+    @r.zset_count('zset') { |r| r.should == 4 }
+    @r.zset_range_by_score('zset', 2, 3) { |r| r.should == ['set2', 'set3'] }
+    @r.delete('set')
+    @r.delete('set2')
+    @r.delete('set3')
+    @r.delete('set4')
+    @r.delete('zset') { done }
+  end
+  #
+  it "should be able to get a score for a specific value in a zset (ZSCORE)" do
+    @r.zset_add "zset", 23, "value"
+    @r.zset_score("zset", "value") { |r| r.should == "23" }
+
+    @r.zset_score("zset", "value2") { |r| r.should == nil }
+    @r.zset_score("unknown_zset", "value") { |r| r.should == nil }
+
+    @r.delete("zset") { done }
+  end
+  #
+  it "should be able to increment a range score of a zset (ZINCRBY)" do
+    # create a new zset
+    @r.zset_increment_by "hackers", 1965, "Yukihiro Matsumoto"
+    @r.zset_score("hackers", "Yukihiro Matsumoto") { |r| r.should == "1965" }
+
+    # add a new element
+    @r.zset_increment_by "hackers", 1912, "Alan Turing"
+    @r.zset_score("hackers", "Alan Turing") { |r| r.should == "1912" }
+
+    # update the score
+    @r.zset_increment_by "hackers", 100, "Alan Turing" # yeah, we are making Turing a bit younger
+    @r.zset_score("hackers", "Alan Turing") { |r| r.should == "2012" }
+
+    # attempt to update a key that's not a zset
+    @r["i_am_not_a_zet"] = "value"
+    # 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 }
+  end
+  #
+  it "should provide info (INFO)" do
+    @r.info do |r|
+      [:last_save_time, :redis_version, :total_connections_received, :connected_clients, :total_commands_processed, :connected_slaves, :uptime_in_seconds, :used_memory, :uptime_in_days, :changes_since_last_save].each do |x|
+        r.keys.include?(x).should == true
+      end
+      done
+    end
+  end
+  #
+  it "should be able to flush the database (FLUSHDB)" do
+    @r['key1'] = 'keyone'
+    @r['key2'] = 'keytwo'
+    @r.keys('*') { |r| r.sort.should == ['foo', 'key1', 'key2'].sort } #foo from before
+    @r.flushdb
+    @r.keys('*') { |r| r.should == []; done }
+  end
+  #
+  it "should be able to SELECT database" do
+    @r.select(15)
+    @r.get('foo') { |r| r.should == nil; done }
+  end
+  #
+  it "should be able to provide the last save time (LASTSAVE)" do
+    @r.lastsave do |savetime|
+      Time.at(savetime).class.should == Time
+      Time.at(savetime).should <= Time.now
+      done
+    end
+  end
+
+  it "should be able to MGET keys" do
+    @r['foo'] = 1000
+    @r['bar'] = 2000
+    @r.mget('foo', 'bar') { |r| r.should == ['1000', '2000'] }
+    @r.mget('foo', 'bar', 'baz') { |r| r.should == ['1000', '2000', nil] }
+    @r.ping { done }
+  end
+
+  it "should be able to mapped MGET keys" do
+    @r['foo'] = 1000
+    @r['bar'] = 2000
+    @r.mapped_mget('foo', 'bar') { |r| r.should == { 'foo' => '1000', 'bar' => '2000'} }
+    @r.mapped_mget('foo', 'baz', 'bar') { |r| r.should == { 'foo' => '1000', 'bar' => '2000'} }
+    @r.ping { done }
+  end
+
+  it "should be able to MSET values" do
+    @r.mset :key1 => "value1", :key2 => "value2"
+    @r.get('key1') { |r| r.should == "value1" }
+    @r.get('key2') { |r| r.should == "value2"; done }
+  end
+
+  it "should be able to MSETNX values" do
+    @r.msetnx :keynx1 => "valuenx1", :keynx2 => "valuenx2"
+    @r.mget('keynx1', 'keynx2') { |r| r.should == ["valuenx1", "valuenx2"] }
+
+    @r["keynx1"] = "value1"
+    @r["keynx2"] = "value2"
+    @r.msetnx :keynx1 => "valuenx1", :keynx2 => "valuenx2"
+    @r.mget('keynx1', 'keynx2') { |r| r.should == ["value1", "value2"]; done }
+  end
+
+  it "should bgsave" do
+    @r.bgsave do |r|
+      ['OK', 'Background saving started'].include?(r).should == true
+      done
+    end
+  end
+
+  it "should be able to ECHO" do
+    @r.echo("message in a bottle\n") { |r| r.should == "message in a bottle\n"; done }
+  end
+
+  # Tests are disabled due uncatchable exceptions. We should use on_error callback,
+  # intead of raising exceptions in random places.
+  #
+  # it "should raise error when invoke MONITOR" do
+  #   # lambda { @r.monitor }.should.raise
+  #   done
+  # end
+  # 
+  # it "should raise error when invoke SYNC" do
+  #   # lambda { @r.sync }.should.raise
+  #   done
+  # end
+
+  it "should run MULTI without a block" do
+    @r.multi
+    @r.get("key1") { |r| r.should == "QUEUED" }
+    @r.discard { done }
+  end
+
+  it "should run MULTI/EXEC with a block" do
+    @r.multi do
+      @r.set "key1", "value1"
+    end
+
+    @r.get("key1") { |r| r.should == "value1" }
+
+    begin
+      @r.multi do
+        @r.set "key2", "value2"
+        raise "Some error"
+        @r.set "key3", "value3"
+      end
+    rescue
+    end
+
+    @r.get("key2") { |r| r.should == nil }
+    @r.get("key3") { |r| r.should == nil; done}
+  end
+
+  it "should yield the Redis object when using #multi with a block" do
+    @r.multi do |multi|
+      multi.set "key1", "value1"
+    end
+
+    @r.get("key1") { |r| r.should == "value1"; done }
+  end
+
+  it "can set and get hash values" do
+    @r.hset("rush", "signals", "1982") { |r| r.should == true }
+    @r.hexists("rush", "signals") { |r| r.should == true }
+    @r.hget("rush", "signals") { |r| r.should == "1982"; done }
+  end
+
+  it "can delete hash values" do
+    @r.hset("rush", "YYZ", "1981")
+    @r.hdel("rush", "YYZ") { |r| r.should == true }
+    @r.hexists("rush", "YYZ") { |r| r.should == false; done }
+  end
+end
+
+# Yup, bacon can't handle nested describe blocks properly
+EM.describe EM::Protocols::Redis, "with some hash values" do
+  default_timeout 1
+
+  before do
+    @r = EM::Protocols::Redis.connect :db => 14
+    @r.flushdb
+    @r['foo'] = 'bar'
+    @r.hset("rush", "permanent waves", "1980")
+    @r.hset("rush", "moving pictures", "1981")
+    @r.hset("rush", "signals", "1982")
+  end
+
+  after { @r.close_connection }
+
+  it "can get the length of the hash" do
+    @r.hlen("rush") { |r| r.should == 3 }
+    @r.hlen("yyz") { |r| r.should == 0; done }
+  end
+
+  it "can get the keys and values of the hash" do
+    @r.hkeys("rush") { |r| r.should == ["permanent waves", "moving pictures", "signals"] }
+    @r.hvals("rush") { |r| r.should == %w[1980 1981 1982] }
+    @r.hvals("yyz") { |r| r.should == []; done }
+  end
+
+  it "returns a hash for HGETALL" do
+    @r.hgetall("rush") do |r|
+        r.should == {
+        "permanent waves" => "1980",
+        "moving pictures" => "1981",
+        "signals"         => "1982"
+      }
+    end
+    @r.hgetall("yyz") { |r| r.should == {}; done }
+  end
+end

data/spec/redis_protocol_spec.rb

@@ -83,11 +83,11 @@ EM.describe EM::Protocols::Redis do
   end
 
   should "parse an inline error response" do
-    lambda do
-      @c.call_command(["blarg"])
-      @c.receive_data "-FAIL\r\n"
-    end.should.raise(EM::P::Redis::RedisError)
-    done
+    @c.call_command(["blarg"]) do |resp|
+      resp.should == nil
+      done
+    end
+    @c.receive_data "-FAIL\r\n"
   end
 
   should "trigger a given error callback (specified with on_error) for inline error response instead of raising an error" do

data/spec/test_helper.rb

@@ -15,6 +15,10 @@ class TestConnection
     @sent_data ||= ''
   end
 
+  def maybe_lock
+    yield
+  end
+
   def initialize
     super
     connection_completed

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: superfeedr-em-redis
 version: !ruby/object:Gem::Version 
-  version: 0.2.6
+  hash: 25
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 7
+  version: 0.2.7
 platform: ruby
 authors: 
 - Jonathan Broad
@@ -11,50 +17,74 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-08 00:00:00 +02:00
+date: 2010-06-22 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: eventmachine
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 59
+        segments: 
+        - 0
+        - 12
+        - 10
         version: 0.12.10
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: bacon
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 1
+        - 1
+        - 0
         version: 1.1.0
-    version: 
+  type: :development
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: em-spec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 0
+        - 2
+        - 1
         version: 0.2.1
-    version: 
+  type: :development
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: bones
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 3
+        - 4
+        - 1
         version: 3.4.1
-    version: 
-description: An eventmachine-based implementation of the Redis protocol (forked)
+  type: :development
+  version_requirements: *id004
+description: An eventmachine-based implementation of the Redis protocol
 email: stephan@spaceboyz.net
 executables: []
 
@@ -64,7 +94,6 @@ extra_rdoc_files:
 - History.txt
 - README.rdoc
 files: 
-- .gitignore
 - History.txt
 - README.rdoc
 - Rakefile
@@ -73,6 +102,7 @@ files:
 - lib/em-redis/redis_protocol.rb
 - spec/live_redis_protocol_spec.rb
 - spec/redis_commands_spec.rb
+- spec/redis_commands_spec.rb.orig
 - spec/redis_protocol_spec.rb
 - spec/test_helper.rb
 has_rdoc: true
@@ -86,23 +116,29 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: superfeedr-em-redis
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: An eventmachine-based implementation of the Redis protocol (forked)
+summary: An eventmachine-based implementation of the Redis protocol
 test_files: []
 

data/.gitignore

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