Merge branch 'bugfix-array-arguments-for-zadd'

guilleiguaran · Mar 7, 2013 · c3b7d4f · c3b7d4f
2 parents b6e7a61 + 8b74e90
commit c3b7d4f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/lib/redis/connection/memory.rb b/lib/redis/connection/memory.rb
@@ -726,7 +726,7 @@ def zadd(key, *args)
         data_type_check(key, ZSet)
         data[key] ||= ZSet.new
 
-        if args.size == 2
+        if args.size == 2 && !(Array === args.first)
           score, value = args
           exists = !data[key].key?(value.to_s)
           data[key][value.to_s] = score

diff --git a/spec/sorted_sets_spec.rb b/spec/sorted_sets_spec.rb
@@ -44,6 +44,10 @@ module FakeRedis
       @client.zscore("key", "val2").should be == 2
       @client.zscore("key", "val3").should be == 3
       @client.zscore("key", "val4").should be == 4
+
+      @client.zadd("key", [[5, "val5"], [3, "val6"]]).should be == 2
+      @client.zscore("key", "val5").should be == 5
+      @client.zscore("key", "val6").should be == 3
     end
 
     it "should error with wrong number of arguments when adding members" do