@@ -33,12 +33,15 @@ class Redis "sismember" => true, "echo" => true, "getset" => true, - "smove" => true + "smove" => true, + "zadd" => true, + "zrem" => true, + "zscore" => true } - + MULTI_BULK_COMMANDS = { - "mset" => true, - "msetnx" => true + "mset" => true, + "msetnx" => true } BOOLEAN_PROCESSOR = lambda{|r| r == 1 } @@ -49,6 +52,8 @@ class Redis "sadd" => BOOLEAN_PROCESSOR, "srem" => BOOLEAN_PROCESSOR, "smove" => BOOLEAN_PROCESSOR, + "zadd" => BOOLEAN_PROCESSOR, + "zrem" => BOOLEAN_PROCESSOR, "move" => BOOLEAN_PROCESSOR, "setnx" => BOOLEAN_PROCESSOR, "del" => BOOLEAN_PROCESSOR, @@ -97,7 +102,14 @@ class Redis "set_move" => "smove", "set_unless_exists" => "setnx", "rename_unless_exists" => "renamenx", - "type?" => "type" + "type?" => "type", + "zset_add" => "zadd", + "zset_count" => 'zcard', + "zset_range_by_score" => 'zrangebyscore', + "zset_reverse_range" => 'zrevrange', + "zset_range" => 'zrange', + "zset_delete" => 'zrem', + "zset_score" => 'zscore' } DISABLED_COMMANDS = { lib/redis.rb @@ -415,6 +415,103 @@ describe "redis" do @r.sort('dogs', :get => ['dog:*:name', 'dog:*:breed'], :limit => [0,1], :order => 'desc alpha').should == ['taj', 'terrier'] 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').should == 1 + @r.delete('set') + @r.delete('zset') + 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).should == ['set'] + @r.zset_count('zset').should == 1 + @r.delete('set') + @r.delete('zset') + end + # + it "should be able delete members to a zset" do + @r.set_add "set", 'key1' + @r.set_add "set", 'key2' + @r.type?('set').should == "set" + @r.set_add "set2", 'key3' + @r.set_add "set2", 'key4' + @r.type?('set2').should == "set" + @r.zset_add 'zset', 1, 'set' + @r.zset_count('zset').should == 1 + @r.zset_add 'zset', 2, 'set2' + @r.zset_count('zset').should == 2 + @r.zset_delete 'zset', 'set' + @r.zset_count('zset').should == 1 + @r.delete('set') + @r.delete('set2') + @r.delete('zset') + 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').should == 'set' + @r.type?('set2').should == 'set' + @r.type?('set3').should == 'set' + @r.zset_add 'zset', 1, 'set' + @r.zset_add 'zset', 2, 'set2' + @r.zset_add 'zset', 3, 'set3' + @r.zset_count('zset').should == 3 + @r.zset_range('zset', 0, 3).should == ['set', 'set2', 'set3'] + @r.delete('set') + @r.delete('set2') + @r.delete('set3') + @r.delete('zset') + 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').should == 'set' + @r.type?('set2').should == 'set' + @r.type?('set3').should == 'set' + @r.zset_add 'zset', 1, 'set' + @r.zset_add 'zset', 2, 'set2' + @r.zset_add 'zset', 3, 'set3' + @r.zset_count('zset').should == 3 + @r.zset_reverse_range('zset', 0, 3).should == ['set3', 'set2', 'set'] + @r.delete('set') + @r.delete('set2') + @r.delete('set3') + @r.delete('zset') + 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').should == 4 + @r.zset_range_by_score('zset', 2, 3).should == ['set2', 'set3'] + @r.delete('set') + @r.delete('set2') + @r.delete('set3') + @r.delete('set4') + @r.delete('zset') + end + it "should provide info (INFO)" do [: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.info.keys.should include(x) spec/redis_spec.rb edfb1f6d135d4af03b43b896508e0f08842020fb Ezra Zygmuntowicz ez@engineyard.com http://github.com/ezmobius/redis-rb/commit/4c07ac06e94e628ad3ce16dde6729c6ca418bc62 4c07ac06e94e628ad3ce16dde6729c6ca418bc62 2009-11-04T13:52:57-08:00 2009-11-04T13:52:57-08:00 adding support + specs for zset and friends 2d214549958bd004627e9ad6595bb0586cedfcc5 Ezra Zygmuntowicz ez@engineyard.com