redis 3.3.5 → 4.0.3

data/test/commands_on_geo_test.rb

@@ -0,0 +1,116 @@
+require_relative "helper"
+
+class TestCommandsGeo < Test::Unit::TestCase
+  include Helper::Client
+
+  def setup
+    super
+
+    target_version "3.2.0" do
+      added_items_count = r.geoadd("Sicily", 13.361389, 38.115556, "Palermo", 15.087269, 37.502669, "Catania")
+      assert_equal 2, added_items_count
+    end
+  end
+
+  def test_georadius_with_sort
+    target_version "3.2.0" do
+      nearest_cities = r.georadius("Sicily", 15, 37, 200, 'km', sort: 'asc')
+      assert_equal %w(Catania Palermo), nearest_cities
+
+      farthest_cities = r.georadius("Sicily", 15, 37, 200, 'km', sort: 'desc')
+      assert_equal %w(Palermo Catania), farthest_cities
+    end
+  end
+
+  def test_georadius_with_count
+    target_version "3.2.0" do
+      city = r.georadius("Sicily", 15, 37, 200, 'km', count: 1)
+      assert_equal %w(Catania), city
+    end
+  end
+
+  def test_georadius_with_options_count_sort
+    target_version "3.2.0" do
+      city = r.georadius("Sicily", 15, 37, 200, 'km', sort: :desc, options: :WITHDIST, count: 1)
+      assert_equal [["Palermo", "190.4424"]], city
+    end
+  end
+
+  def test_georadiusbymember_with_sort
+    target_version "3.2.0" do
+      nearest_cities = r.georadiusbymember("Sicily", "Catania", 200, 'km', sort: 'asc')
+      assert_equal %w(Catania Palermo), nearest_cities
+
+      farthest_cities = r.georadiusbymember("Sicily", "Catania", 200, 'km', sort: 'desc')
+      assert_equal %w(Palermo Catania), farthest_cities
+    end
+  end
+
+  def test_georadiusbymember_with_count
+    target_version "3.2.0" do
+      city = r.georadiusbymember("Sicily", "Catania", 200, 'km', count: 1)
+      assert_equal %w(Catania), city
+    end
+  end
+
+  def test_georadiusbymember_with_options_count_sort
+    target_version "3.2.0" do
+      city = r.georadiusbymember("Sicily", "Catania", 200, 'km', sort: :desc, options: :WITHDIST, count: 1)
+      assert_equal [["Palermo", "166.2742"]], city
+    end
+  end
+
+  def test_geopos
+    target_version "3.2.0" do
+      location = r.geopos("Sicily", "Catania")
+      assert_equal [["15.08726745843887329", "37.50266842333162032"]], location
+
+      locations = r.geopos("Sicily", ["Palermo", "Catania"])
+      assert_equal [["13.36138933897018433", "38.11555639549629859"], ["15.08726745843887329", "37.50266842333162032"]], locations
+    end
+  end
+
+  def test_geopos_nonexistant_location
+    target_version "3.2.0" do
+      location = r.geopos("Sicily", "Rome")
+      assert_equal [nil], location
+
+      locations = r.geopos("Sicily", ["Rome", "Catania"])
+      assert_equal [nil, ["15.08726745843887329", "37.50266842333162032"]], locations
+    end
+  end
+
+  def test_geodist
+    target_version "3.2.0" do
+      distination_in_meters = r.geodist("Sicily", "Palermo", "Catania")
+      assert_equal "166274.1516", distination_in_meters
+
+      distination_in_feet = r.geodist("Sicily", "Palermo", "Catania", 'ft')
+      assert_equal "545518.8700", distination_in_feet
+    end
+  end
+
+  def test_geodist_with_nonexistant_location
+    target_version "3.2.0" do
+      distination = r.geodist("Sicily", "Palermo", "Rome")
+      assert_equal nil, distination
+    end
+  end
+
+  def test_geohash
+    target_version "3.2.0" do
+      geohash = r.geohash("Sicily", "Palermo")
+      assert_equal ["sqc8b49rny0"], geohash
+
+      geohashes = r.geohash("Sicily", ["Palermo", "Catania"])
+      assert_equal %w(sqc8b49rny0 sqdtr74hyu0), geohashes
+    end
+  end
+
+  def test_geohash_with_nonexistant_location
+    target_version "3.2.0" do
+      geohashes = r.geohash("Sicily", ["Palermo", "Rome"])
+      assert_equal ["sqc8b49rny0", nil], geohashes
+    end
+  end
+end

data/test/commands_on_hashes_test.rb

@@ -1,21 +1,7 @@
-# encoding: UTF-8
-
-require File.expand_path("helper", File.dirname(__FILE__))
-require "lint/hashes"
+require_relative 'helper'
+require_relative 'lint/hashes'
 
 class TestCommandsOnHashes < Test::Unit::TestCase
-
   include Helper::Client
   include Lint::Hashes
-
-  def test_mapped_hmget_in_a_pipeline_returns_hash
-    r.hset("foo", "f1", "s1")
-    r.hset("foo", "f2", "s2")
-
-    result = r.pipelined do
-      r.mapped_hmget("foo", "f1", "f2")
-    end
-
-    assert_equal result[0], { "f1" => "s1", "f2" => "s2" }
-  end
 end

data/test/commands_on_hyper_log_log_test.rb

@@ -1,21 +1,7 @@
-# encoding: UTF-8
-
-require File.expand_path("helper", File.dirname(__FILE__))
-require "lint/hyper_log_log"
+require_relative 'helper'
+require_relative 'lint/hyper_log_log'
 
 class TestCommandsOnHyperLogLog < Test::Unit::TestCase
-
   include Helper::Client
   include Lint::HyperLogLog
-
-  def test_pfmerge
-    target_version "2.8.9" do
-      r.pfadd "foo", "s1"
-      r.pfadd "bar", "s2"
-
-      assert_equal true, r.pfmerge("res", "foo", "bar")
-      assert_equal 2, r.pfcount("res")
-    end
-  end
-
-end
+end

data/test/commands_on_lists_test.rb

@@ -1,20 +1,7 @@
-# encoding: UTF-8
-
-require File.expand_path("helper", File.dirname(__FILE__))
-require "lint/lists"
+require_relative 'helper'
+require_relative 'lint/lists'
 
 class TestCommandsOnLists < Test::Unit::TestCase
-
   include Helper::Client
   include Lint::Lists
-
-  def test_rpoplpush
-    r.rpush "foo", "s1"
-    r.rpush "foo", "s2"
-
-    assert_equal "s2", r.rpoplpush("foo", "bar")
-    assert_equal ["s2"], r.lrange("bar", 0, -1)
-    assert_equal "s1", r.rpoplpush("foo", "bar")
-    assert_equal ["s1", "s2"], r.lrange("bar", 0, -1)
-  end
 end

data/test/commands_on_sets_test.rb

@@ -1,77 +1,7 @@
-# encoding: UTF-8
-
-require File.expand_path("helper", File.dirname(__FILE__))
-require "lint/sets"
+require_relative 'helper'
+require_relative 'lint/sets'
 
 class TestCommandsOnSets < Test::Unit::TestCase
-
   include Helper::Client
   include Lint::Sets
-
-  def test_smove
-    r.sadd "foo", "s1"
-    r.sadd "bar", "s2"
-
-    assert r.smove("foo", "bar", "s1")
-    assert r.sismember("bar", "s1")
-  end
-
-  def test_sinter
-    r.sadd "foo", "s1"
-    r.sadd "foo", "s2"
-    r.sadd "bar", "s2"
-
-    assert_equal ["s2"], r.sinter("foo", "bar")
-  end
-
-  def test_sinterstore
-    r.sadd "foo", "s1"
-    r.sadd "foo", "s2"
-    r.sadd "bar", "s2"
-
-    r.sinterstore("baz", "foo", "bar")
-
-    assert_equal ["s2"], r.smembers("baz")
-  end
-
-  def test_sunion
-    r.sadd "foo", "s1"
-    r.sadd "foo", "s2"
-    r.sadd "bar", "s2"
-    r.sadd "bar", "s3"
-
-    assert_equal ["s1", "s2", "s3"], r.sunion("foo", "bar").sort
-  end
-
-  def test_sunionstore
-    r.sadd "foo", "s1"
-    r.sadd "foo", "s2"
-    r.sadd "bar", "s2"
-    r.sadd "bar", "s3"
-
-    r.sunionstore("baz", "foo", "bar")
-
-    assert_equal ["s1", "s2", "s3"], r.smembers("baz").sort
-  end
-
-  def test_sdiff
-    r.sadd "foo", "s1"
-    r.sadd "foo", "s2"
-    r.sadd "bar", "s2"
-    r.sadd "bar", "s3"
-
-    assert_equal ["s1"], r.sdiff("foo", "bar")
-    assert_equal ["s3"], r.sdiff("bar", "foo")
-  end
-
-  def test_sdiffstore
-    r.sadd "foo", "s1"
-    r.sadd "foo", "s2"
-    r.sadd "bar", "s2"
-    r.sadd "bar", "s3"
-
-    r.sdiffstore("baz", "foo", "bar")
-
-    assert_equal ["s1"], r.smembers("baz")
-  end
 end

data/test/commands_on_sorted_sets_test.rb

@@ -1,137 +1,7 @@
-# encoding: UTF-8
-
-require File.expand_path("helper", File.dirname(__FILE__))
-require "lint/sorted_sets"
+require_relative 'helper'
+require_relative 'lint/sorted_sets'
 
 class TestCommandsOnSortedSets < Test::Unit::TestCase
-
   include Helper::Client
   include Lint::SortedSets
-
-  def test_zrangebylex
-    target_version "2.8.9" do
-      r.zadd "foo", 0, "aaren"
-      r.zadd "foo", 0, "abagael"
-      r.zadd "foo", 0, "abby"
-      r.zadd "foo", 0, "abbygail"
-
-      assert_equal ["aaren", "abagael", "abby", "abbygail"], r.zrangebylex("foo", "[a", "[a\xff")
-      assert_equal ["aaren", "abagael"], r.zrangebylex("foo", "[a", "[a\xff", :limit => [0, 2])
-      assert_equal ["abby", "abbygail"], r.zrangebylex("foo", "(abb", "(abb\xff")
-      assert_equal ["abbygail"], r.zrangebylex("foo", "(abby", "(abby\xff")
-    end
-  end
-
-  def test_zrevrangebylex
-    target_version "2.9.9" do
-      r.zadd "foo", 0, "aaren"
-      r.zadd "foo", 0, "abagael"
-      r.zadd "foo", 0, "abby"
-      r.zadd "foo", 0, "abbygail"
-
-      assert_equal ["abbygail", "abby", "abagael", "aaren"], r.zrevrangebylex("foo", "[a\xff", "[a")
-      assert_equal ["abbygail", "abby"], r.zrevrangebylex("foo", "[a\xff", "[a", :limit => [0, 2])
-      assert_equal ["abbygail", "abby"], r.zrevrangebylex("foo", "(abb\xff", "(abb")
-      assert_equal ["abbygail"], r.zrevrangebylex("foo", "(abby\xff", "(abby")
-    end
-  end
-
-  def test_zcount
-    r.zadd "foo", 1, "s1"
-    r.zadd "foo", 2, "s2"
-    r.zadd "foo", 3, "s3"
-
-    assert_equal 2, r.zcount("foo", 2, 3)
-  end
-
-  def test_zunionstore
-    r.zadd "foo", 1, "s1"
-    r.zadd "bar", 2, "s2"
-    r.zadd "foo", 3, "s3"
-    r.zadd "bar", 4, "s4"
-
-    assert_equal 4, r.zunionstore("foobar", ["foo", "bar"])
-    assert_equal ["s1", "s2", "s3", "s4"], r.zrange("foobar", 0, -1)
-  end
-
-  def test_zunionstore_with_weights
-    r.zadd "foo", 1, "s1"
-    r.zadd "foo", 3, "s3"
-    r.zadd "bar", 20, "s2"
-    r.zadd "bar", 40, "s4"
-
-    assert_equal 4, r.zunionstore("foobar", ["foo", "bar"])
-    assert_equal ["s1", "s3", "s2", "s4"], r.zrange("foobar", 0, -1)
-
-    assert_equal 4, r.zunionstore("foobar", ["foo", "bar"], :weights => [10, 1])
-    assert_equal ["s1", "s2", "s3", "s4"], r.zrange("foobar", 0, -1)
-  end
-
-  def test_zunionstore_with_aggregate
-    r.zadd "foo", 1, "s1"
-    r.zadd "foo", 2, "s2"
-    r.zadd "bar", 4, "s2"
-    r.zadd "bar", 3, "s3"
-
-    assert_equal 3, r.zunionstore("foobar", ["foo", "bar"])
-    assert_equal ["s1", "s3", "s2"], r.zrange("foobar", 0, -1)
-
-    assert_equal 3, r.zunionstore("foobar", ["foo", "bar"], :aggregate => :min)
-    assert_equal ["s1", "s2", "s3"], r.zrange("foobar", 0, -1)
-
-    assert_equal 3, r.zunionstore("foobar", ["foo", "bar"], :aggregate => :max)
-    assert_equal ["s1", "s3", "s2"], r.zrange("foobar", 0, -1)
-  end
-
-  def test_zinterstore
-    r.zadd "foo", 1, "s1"
-    r.zadd "bar", 2, "s1"
-    r.zadd "foo", 3, "s3"
-    r.zadd "bar", 4, "s4"
-
-    assert_equal 1, r.zinterstore("foobar", ["foo", "bar"])
-    assert_equal ["s1"], r.zrange("foobar", 0, -1)
-  end
-
-  def test_zinterstore_with_weights
-    r.zadd "foo", 1, "s1"
-    r.zadd "foo", 2, "s2"
-    r.zadd "foo", 3, "s3"
-    r.zadd "bar", 20, "s2"
-    r.zadd "bar", 30, "s3"
-    r.zadd "bar", 40, "s4"
-
-    assert_equal 2, r.zinterstore("foobar", ["foo", "bar"])
-    assert_equal ["s2", "s3"], r.zrange("foobar", 0, -1)
-
-    assert_equal 2, r.zinterstore("foobar", ["foo", "bar"], :weights => [10, 1])
-    assert_equal ["s2", "s3"], r.zrange("foobar", 0, -1)
-
-    assert_equal 40.0, r.zscore("foobar", "s2")
-    assert_equal 60.0, r.zscore("foobar", "s3")
-  end
-
-  def test_zinterstore_with_aggregate
-    r.zadd "foo", 1, "s1"
-    r.zadd "foo", 2, "s2"
-    r.zadd "foo", 3, "s3"
-    r.zadd "bar", 20, "s2"
-    r.zadd "bar", 30, "s3"
-    r.zadd "bar", 40, "s4"
-
-    assert_equal 2, r.zinterstore("foobar", ["foo", "bar"])
-    assert_equal ["s2", "s3"], r.zrange("foobar", 0, -1)
-    assert_equal 22.0, r.zscore("foobar", "s2")
-    assert_equal 33.0, r.zscore("foobar", "s3")
-
-    assert_equal 2, r.zinterstore("foobar", ["foo", "bar"], :aggregate => :min)
-    assert_equal ["s2", "s3"], r.zrange("foobar", 0, -1)
-    assert_equal 2.0, r.zscore("foobar", "s2")
-    assert_equal 3.0, r.zscore("foobar", "s3")
-
-    assert_equal 2, r.zinterstore("foobar", ["foo", "bar"], :aggregate => :max)
-    assert_equal ["s2", "s3"], r.zrange("foobar", 0, -1)
-    assert_equal 20.0, r.zscore("foobar", "s2")
-    assert_equal 30.0, r.zscore("foobar", "s3")
-  end
 end

data/test/commands_on_strings_test.rb

@@ -1,101 +1,7 @@
-# encoding: UTF-8
-
-require File.expand_path("helper", File.dirname(__FILE__))
-require "lint/strings"
+require_relative 'helper'
+require_relative 'lint/strings'
 
 class TestCommandsOnStrings < Test::Unit::TestCase
-
   include Helper::Client
   include Lint::Strings
-
-  def test_mget
-    r.set("foo", "s1")
-    r.set("bar", "s2")
-
-    assert_equal ["s1", "s2"]     , r.mget("foo", "bar")
-    assert_equal ["s1", "s2", nil], r.mget("foo", "bar", "baz")
-  end
-
-  def test_mget_mapped
-    r.set("foo", "s1")
-    r.set("bar", "s2")
-
-    response = r.mapped_mget("foo", "bar")
-
-    assert_equal "s1", response["foo"]
-    assert_equal "s2", response["bar"]
-
-    response = r.mapped_mget("foo", "bar", "baz")
-
-    assert_equal "s1", response["foo"]
-    assert_equal "s2", response["bar"]
-    assert_equal nil , response["baz"]
-  end
-
-  def test_mapped_mget_in_a_pipeline_returns_hash
-    r.set("foo", "s1")
-    r.set("bar", "s2")
-
-    result = r.pipelined do
-      r.mapped_mget("foo", "bar")
-    end
-
-    assert_equal result[0], { "foo" => "s1", "bar" => "s2" }
-  end
-
-  def test_mset
-    r.mset(:foo, "s1", :bar, "s2")
-
-    assert_equal "s1", r.get("foo")
-    assert_equal "s2", r.get("bar")
-  end
-
-  def test_mset_mapped
-    r.mapped_mset(:foo => "s1", :bar => "s2")
-
-    assert_equal "s1", r.get("foo")
-    assert_equal "s2", r.get("bar")
-  end
-
-  def test_msetnx
-    r.set("foo", "s1")
-    assert_equal false, r.msetnx(:foo, "s2", :bar, "s3")
-    assert_equal "s1", r.get("foo")
-    assert_equal nil, r.get("bar")
-
-    r.del("foo")
-    assert_equal true, r.msetnx(:foo, "s2", :bar, "s3")
-    assert_equal "s2", r.get("foo")
-    assert_equal "s3", r.get("bar")
-  end
-
-  def test_msetnx_mapped
-    r.set("foo", "s1")
-    assert_equal false, r.mapped_msetnx(:foo => "s2", :bar => "s3")
-    assert_equal "s1", r.get("foo")
-    assert_equal nil, r.get("bar")
-
-    r.del("foo")
-    assert_equal true, r.mapped_msetnx(:foo => "s2", :bar => "s3")
-    assert_equal "s2", r.get("foo")
-    assert_equal "s3", r.get("bar")
-  end
-
-  def test_bitop
-    try_encoding("UTF-8") do
-      target_version "2.5.10" do
-        r.set("foo", "a")
-        r.set("bar", "b")
-
-        r.bitop(:and, "foo&bar", "foo", "bar")
-        assert_equal "\x60", r.get("foo&bar")
-        r.bitop(:or, "foo|bar", "foo", "bar")
-        assert_equal "\x63", r.get("foo|bar")
-        r.bitop(:xor, "foo^bar", "foo", "bar")
-        assert_equal "\x03", r.get("foo^bar")
-        r.bitop(:not, "~foo", "foo")
-        assert_equal "\x9E", r.get("~foo")
-      end
-    end
-  end
 end

data/test/commands_on_value_types_test.rb

@@ -1,7 +1,5 @@
-# encoding: UTF-8
-
-require File.expand_path("helper", File.dirname(__FILE__))
-require "lint/value_types"
+require_relative "helper"
+require_relative "lint/value_types"
 
 class TestCommandsOnValueTypes < Test::Unit::TestCase
 
@@ -40,6 +38,42 @@ class TestCommandsOnValueTypes < Test::Unit::TestCase
     assert_equal [], r.keys("*").sort
   end
 
+  def test_unlink
+    target_version "4.0.0" do
+      r.set "foo", "s1"
+      r.set "bar", "s2"
+      r.set "baz", "s3"
+
+      assert_equal ["bar", "baz", "foo"], r.keys("*").sort
+
+      assert_equal 1, r.unlink("foo")
+
+      assert_equal ["bar", "baz"], r.keys("*").sort
+
+      assert_equal 2, r.unlink("bar", "baz")
+
+      assert_equal [], r.keys("*").sort
+    end
+  end
+
+  def test_unlink_with_array_argument
+    target_version "4.0.0" do
+      r.set "foo", "s1"
+      r.set "bar", "s2"
+      r.set "baz", "s3"
+
+      assert_equal ["bar", "baz", "foo"], r.keys("*").sort
+
+      assert_equal 1, r.unlink(["foo"])
+
+      assert_equal ["bar", "baz"], r.keys("*").sort
+
+      assert_equal 2, r.unlink(["bar", "baz"])
+
+      assert_equal [], r.keys("*").sort
+    end
+  end
+
   def test_randomkey
     assert r.randomkey.to_s.empty?
 
@@ -81,6 +115,7 @@ class TestCommandsOnValueTypes < Test::Unit::TestCase
   end
 
   def test_flushdb
+    # Test defaults
     r.set("foo", "s1")
     r.set("bar", "s2")
 
@@ -89,12 +124,51 @@ class TestCommandsOnValueTypes < Test::Unit::TestCase
     r.flushdb
 
     assert_equal 0, r.dbsize
+
+    # Test sync
+    r.set("foo", "s1")
+    r.set("bar", "s2")
+
+    assert_equal 2, r.dbsize
+
+    r.flushdb(:async => false)
+
+    assert_equal 0, r.dbsize
+
+    # Test async
+    target_version "3.9.101" do
+      r.set("foo", "s1")
+      r.set("bar", "s2")
+
+      assert_equal 2, r.dbsize
+
+      r.flushdb(:async => true)
+
+      assert_equal 0, r.dbsize
+
+      redis_mock(:flushdb => lambda { |args| "+FLUSHDB #{args.upcase}" }) do |redis|
+        assert_equal "FLUSHDB ASYNC", redis.flushdb(:async => true)
+      end
+    end
   end
 
   def test_flushall
+    # Test defaults
     redis_mock(:flushall => lambda { "+FLUSHALL" }) do |redis|
       assert_equal "FLUSHALL", redis.flushall
     end
+
+    # Test sync
+    redis_mock(:flushall => lambda { "+FLUSHALL" }) do |redis|
+      assert_equal "FLUSHALL", redis.flushall(:async => false)
+    end
+
+    # Test async
+    target_version "3.9.101" do
+      redis_mock(:flushall => lambda { |args| "+FLUSHALL #{args.upcase}" }) do |redis|
+        assert_equal "FLUSHALL ASYNC", redis.flushall(:async => true)
+      end
+    end
   end
 
   def test_migrate
@@ -111,8 +185,8 @@ class TestCommandsOnValueTypes < Test::Unit::TestCase
       end
       assert ex.message =~ /port not specified/
 
-      default_db = redis.client.db.to_i
-      default_timeout = redis.client.timeout.to_i
+      default_db = redis._client.db.to_i
+      default_timeout = redis._client.timeout.to_i
 
       # Test defaults
       actual = redis.migrate("foo", options)

data/test/connection_handling_test.rb

@@ -1,6 +1,4 @@
-# encoding: UTF-8
-
-require File.expand_path("helper", File.dirname(__FILE__))
+require_relative "helper"
 
 class TestConnectionHandling < Test::Unit::TestCase
 
@@ -40,7 +38,7 @@ class TestConnectionHandling < Test::Unit::TestCase
     r.select 14
     assert_equal nil, r.get("foo")
 
-    r.client.disconnect
+    r._client.disconnect
 
     assert_equal nil, r.get("foo")
   end
@@ -48,7 +46,7 @@ class TestConnectionHandling < Test::Unit::TestCase
   def test_quit
     r.quit
 
-    assert !r.client.connected?
+    assert !r._client.connected?
   end
 
   def test_close
@@ -148,7 +146,7 @@ class TestConnectionHandling < Test::Unit::TestCase
       end
 
       assert_equal nil, result
-      assert !redis.client.connected?
+      assert !redis._client.connected?
     end
   end
 
@@ -188,7 +186,7 @@ class TestConnectionHandling < Test::Unit::TestCase
       end
 
       assert_equal nil, result
-      assert !redis.client.connected?
+      assert !redis._client.connected?
     end
   end