Remove client-side arguments checks

Also took the chance to prettify the code and cleanup tests.

Issue #545

Author: Joao Fernandes

lib/redis.rb

@@ -1440,8 +1440,6 @@ def zadd(key, *args) #, options
       xx = options[:xx]
       zadd_options << "XX" if xx
 
-      raise ArgumentError, "XX and NX options at the same time are not compatible" if nx && xx
-
       ch = options[:ch]
       zadd_options << "CH" if ch
 
@@ -1451,12 +1449,11 @@ def zadd(key, *args) #, options
 
     synchronize do |client|
       if args.size == 1 && args[0].is_a?(Array)
-        # Variadic: return integer
-        raise ArgumentError, "only one score-element pair can be specified with the :incr option" if incr
-        client.call([:zadd, key] + zadd_options + args[0])
+        # Variadic: return float if INCR, integer if !INCR
+        client.call([:zadd, key] + zadd_options + args[0], &(incr ? _floatify : _identity))
       elsif args.size == 2
         # Single pair: return float if INCR, boolean if !INCR
-        client.call([:zadd, key] + zadd_options + [args[0], args[1]], &(incr ? _floatify : _boolify))
+        client.call([:zadd, key] + zadd_options + args, &(incr ? _floatify : _boolify))
       else
         raise ArgumentError, "wrong number of arguments"
       end
@@ -2647,6 +2644,12 @@ def _pairify(array)
     array.each_slice(2).to_a
   end
 
+  def _identity
+    lambda { |value|
+      value
+    }
+  end
+
   def _subscription(method, channels, block)
     return @client.call([method] + channels) if subscribed?
 

test/lint/sorted_sets.rb

@@ -37,21 +37,14 @@ def test_zadd
         r.del "foo"
 
         # INCR option
-        rv = r.zadd("foo", 1, "s1", :incr => true)
-        assert_equal 1.0, rv
-
-        rv = r.zadd("foo", 10, "s1", :incr => true)
-        assert_equal 11.0, rv
-
-        rv = r.zadd("bar", "-inf", "s1", :incr => true)
-        assert_equal(-Infinity, rv)
-
-        rv = r.zadd("bar", "+inf", "s2", :incr => true)
-        assert_equal(+Infinity, rv)
+        assert_equal 1.0, r.zadd("foo", 1, "s1", :incr => true)
+        assert_equal 11.0, r.zadd("foo", 10, "s1", :incr => true)
+        assert_equal -Infinity, r.zadd("bar", "-inf", "s1", :incr => true)
+        assert_equal +Infinity, r.zadd("bar", "+inf", "s2", :incr => true)
         r.del "foo", "bar"
 
-        # Incompatible options combinations
-        assert_raise(ArgumentError) { r.zadd("foo", 1, "s1", :xx => true, :nx => true) }
+        # Incompatible options combination
+        assert_raise(Redis::CommandError) { r.zadd("foo", 1, "s1", :xx => true, :nx => true) }
       end
     end
 
@@ -106,10 +99,15 @@ def test_variadic_zadd
         r.del "foo"
 
         # INCR option
-        assert_raise(ArgumentError) { r.zadd("foo", [1, "s1"], :incr => true) }
+        assert_equal 1.0, r.zadd("foo", [1, "s1"], :incr => true)
+        assert_equal 11.0, r.zadd("foo", [10, "s1"], :incr => true)
+        assert_equal -Infinity, r.zadd("bar", ["-inf", "s1"], :incr => true)
+        assert_equal +Infinity, r.zadd("bar", ["+inf", "s2"], :incr => true)
+        assert_raise(Redis::CommandError) { r.zadd("foo", [1, "s1", 2, "s2"], :incr => true) }
+        r.del "foo", "bar"
 
-        # Incompatible options combinations
-        assert_raise(ArgumentError) { r.zadd("foo", [1, "s1"], :xx => true, :nx => true) }
+        # Incompatible options combination
+        assert_raise(Redis::CommandError) { r.zadd("foo", [1, "s1"], :xx => true, :nx => true) }
       end
     end