Add georadius and georadiusbymember

Author: TheSmartnik

lib/redis.rb

@@ -2710,6 +2710,40 @@ def pfmerge(dest_key, *source_key)
     end
   end
 
+  # Query a sorted set representing a geospatial index to fetch members matching a
+  # given maximum distance from a point
+  #
+  # @param [Array] args key, longitude, latitude, radius, unit(m|km|ft|mi)
+  # @param ['asc', 'desc'] sort sort returned items from the nearest to the farthest or the farthest to the nearest relative to the center
+  # @param [Integer] count limit the results to the first N matching items
+  # @param ['WITHDIST', 'WITHCOORD', 'WITHHASH'] options to return additional information
+  # @return [Array<String>] may be changed with `options`
+
+  def georadius(*args, **geoptions)
+    geoarguments = _geoarguments(*args, **geoptions)
+
+    synchronize do |client|
+      client.call([:georadius, *geoarguments])
+    end
+  end
+
+  # Query a sorted set representing a geospatial index to fetch members matching a
+  # given maximum distance from an already existing member
+  #
+  # @param [Array] args key, member, radius, unit(m|km|ft|mi)
+  # @param ['asc', 'desc'] sort sort returned items from the nearest to the farthest or the farthest to the nearest relative to the center
+  # @param [Integer] count limit the results to the first N matching items
+  # @param ['WITHDIST', 'WITHCOORD', 'WITHHASH'] options to return additional information
+  # @return [Array<String>] may be changed with `options`
+
+  def georadiusbymember(*args, **geoptions)
+    geoarguments = _geoarguments(*args, **geoptions)
+
+    synchronize do |client|
+      client.call([:georadiusbymember, *geoarguments])
+    end
+  end
+
   # Interact with the sentinel command (masters, master, slaves, failover)
   #
   # @param [String] subcommand e.g. `masters`, `master`, `slaves`
@@ -2813,6 +2847,14 @@ def method_missing(command, *args)
       end
     }
 
+  def _geoarguments(*args, options: nil, sort: nil, count: nil)
+    args.push sort if sort
+    args.push 'count', count if count
+    args.push options if options
+
+    args.uniq
+  end
+
   def _subscription(method, timeout, channels, block)
     return @client.call([method] + channels) if subscribed?
 

test/commands_on_geo_test.rb

@@ -0,0 +1,46 @@
+require_relative "helper"
+
+class TestCommandsGeo < Test::Unit::TestCase
+  include Helper::Client
+
+  def setup
+    super
+    r.geoadd("Sicily", 13.361389, 38.115556, "Palermo", 15.087269, 37.502669, "Catania")
+  end
+
+  def test_georadius_with_sort
+    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
+
+  def test_georadius_with_count
+    city = r.georadius("Sicily", 15, 37, 200, 'km', count: 1)
+    assert_equal %w(Catania), city
+  end
+
+  def test_georadius_with_options_count_sort
+    city = r.georadius("Sicily", 15, 37, 200, 'km', sort: :desc, options: :WITHDIST, count: 1)
+    assert_equal [["Palermo", "190.4424"]], city
+  end
+
+  def test_georadiusbymember_with_sort
+    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
+
+  def test_georadiusbymember_with_count
+    city = r.georadiusbymember("Sicily", "Catania", 200, 'km', count: 1)
+    assert_equal %w(Catania), city
+  end
+
+  def test_georadiusbymember_with_options_count_sort
+    city = r.georadiusbymember("Sicily", "Catania", 200, 'km', sort: :desc, options: :WITHDIST, count: 1)
+    assert_equal [["Palermo", "166.2742"]], city
+  end
+end