redis 0.1.1 → 0.1.2

data/Rakefile

@@ -8,7 +8,7 @@ require 'tasks/redis.tasks'
 
 GEM = 'redis'
 GEM_NAME = 'redis'
-GEM_VERSION = '0.1.1'
+GEM_VERSION = '0.1.2'
 AUTHORS = ['Ezra Zygmuntowicz', 'Taylor Weibley', 'Matthew Clark', 'Brian McKinney', 'Salvatore Sanfilippo', 'Luca Guidi']
 EMAIL = "ez@engineyard.com"
 HOMEPAGE = "http://github.com/ezmobius/redis-rb"
@@ -25,7 +25,7 @@ spec = Gem::Specification.new do |s|
   s.authors = AUTHORS
   s.email = EMAIL
   s.homepage = HOMEPAGE
-  s.add_dependency "rspec"
+  s.add_development_dependency "rspec"
   s.require_path = 'lib'
   s.autorequire = GEM
   s.files = %w(LICENSE README.markdown Rakefile) + Dir.glob("{lib,tasks,spec}/**/*")

data/lib/dist_redis.rb

@@ -77,7 +77,32 @@ class DistRedis
       red.send(command, *args)
     end
   end
+  
+  def mset()
+    
+  end
 
+  def mget(*keyz)
+    results = {}
+    kbn = keys_by_node(keyz)
+    kbn.each do |node, node_keyz| 
+      node.mapped_mget(*node_keyz).each do |k, v|
+        results[k] = v
+      end
+    end
+    keyz.flatten.map { |k| results[k] }
+  end
+ 
+  def keys_by_node(*keyz)
+    keyz.flatten.inject({}) do |kbn, k|
+      node = node_for_key(k)
+      next if kbn[node] && kbn[node].include?(k)
+      kbn[node] ||= []
+      kbn[node] << k 
+      kbn
+    end
+  end
+  
 end
 
 

data/lib/hash_ring.rb

@@ -90,6 +90,9 @@ class HashRing
                     lower = idx + 1;
                 }
             }
+            if (upper < 0) {
+              upper = RARRAY_LEN(ary) - 1;
+            }
             return upper;
         }
         EOM
@@ -113,6 +116,10 @@ class HashRing
             lower = idx + 1
           end
         end
+        
+        if upper < 0
+          upper = ary.size - 1
+        end
         return upper
       end
 

data/lib/redis.rb

@@ -31,11 +31,11 @@ class Redis
     "sadd"      => true,
     "srem"      => true,
     "sismember" => true,
-    "rpoplpush" => true,
     "echo"      => true,
     "getset"    => true,
     "smove"     => true,
     "zadd"      => true,
+    "zincrby"   => true,
     "zrem"      => true,
     "zscore"    => true
   }
@@ -105,12 +105,14 @@ class Redis
     "rename_unless_exists" => "renamenx",
     "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'
+    "zset_count"           => "zcard",
+    "zset_range_by_score"  => "zrangebyscore",
+    "zset_reverse_range"   => "zrevrange",
+    "zset_range"           => "zrange",
+    "zset_delete"          => "zrem",
+    "zset_score"           => "zscore",
+    "zset_incr_by"         => "zincrby",
+    "zset_increment_by"    => "zincrby"
   }
 
   DISABLED_COMMANDS = {
@@ -127,6 +129,7 @@ class Redis
     @logger  =  options[:logger]
     @thread_safe = options[:thread_safe]
     @mutex = Mutex.new if @thread_safe
+    @sock = nil
 
     @logger.info { self.to_s } if @logger
   end
@@ -194,7 +197,7 @@ class Redis
     begin
       raw_call_command(argv.dup)
     rescue Errno::ECONNRESET, Errno::EPIPE, Errno::ECONNABORTED
-      @sock.close
+      @sock.close rescue nil
       @sock = nil
       connect_to_server
       raw_call_command(argv.dup)

data/spec/redis_spec.rb

@@ -527,7 +527,38 @@ describe "redis" do
     @r.delete('set4')
     @r.delete('zset')
   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").should == "23"
+
+    @r.zset_score("zset", "value2").should be_nil
+    @r.zset_score("unknown_zset", "value").should be_nil
+
+    @r.delete("zset")
+  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").should == "1965"
+
+    # add a new element
+    @r.zset_increment_by "hackers", 1912, "Alan Turing"
+    @r.zset_score("hackers", "Alan Turing").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").should == "2012"
+
+    # attempt to update a key that's not a zset
+    @r["i_am_not_a_zet"] = "value"
+    lambda { @r.zset_incr_by "i_am_not_a_zet", 23, "element" }.should raise_error
+
+    @r.delete("hackers")
+    @r.delete("i_am_not_a_zet")
+  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)
@@ -583,7 +614,7 @@ describe "redis" do
   end
 
   it "should bgsave" do
-    @r.bgsave.should == 'OK'
+    ['OK', 'Background saving started'].include?( @r.bgsave).should == true
   end
 
   it "should be able to ECHO" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: redis
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Ezra Zygmuntowicz
@@ -14,12 +14,12 @@ autorequire: redis
 bindir: bin
 cert_chain: []
 
-date: 2009-12-03 00:00:00 -08:00
+date: 2010-01-27 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :runtime
+  type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: