Fix some arguments name of geo_in_rectangle.

ranguba · Apr 27, 2017 · ab7cee7 · ab7cee7
1 parent 36407ea
commit ab7cee7
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 9 deletions.
diff --git a/lib/groonga/client/request/select.rb b/lib/groonga/client/request/select.rb
@@ -95,8 +95,8 @@ def query(value)
         #
         #   @example: Use geo_in_rectangle function
         #      request.
-        #        filter.geo_in_rectangle("50x50", "0x100", "100x0")
-        #          # -> --filter 'geo_in_rectangle("50x50", "0x100", "100x0")'
+        #        filter.geo_in_rectangle(:location, "0x100", "100x0")
+        #          # -> --filter 'geo_in_rectangle(location, "0x100", "100x0")'
         #
         #   @example Use geo_in_circle function
         #      request.
@@ -231,27 +231,29 @@ def initialize(request)
           #
           # @example: Basic usage
           #    request.
-          #      filter.geo_in_rectangle("50x50", "0x100", "100x0").
-          #        # -> --filter 'in_values(50x50, 0x100, 100x0)'
+          #      filter.geo_in_rectangle(:location, "0x100", "100x0").
+          #        # -> --filter 'in_values(location, 0x100, 100x0)'
           #
-          # @param point [String] The point to be checked.
-          #    `"#{LONGITUDE}x#{LATITUDE}"` is the point format.
+          # @param column_name [Symbol] The column name to be checked.
           #
           # @param top_left [String] The top left of the condition rectangle.
+          #    `"#{LONGITUDE}x#{LATITUDE}"` is the point format.
           #
           # @param bottom_right [String] The bottom right of the condition rectangle.
+          #    `"#{LONGITUDE}x#{LATITUDE}"` is the point format.
           #
           # @return [Groonga::Client::Request::Select]
           #   The new request with the given condition.
           #
           # @since 0.5.0
-          def geo_in_rectangle(point, top_left, bottom_right)
-            expression = "geo_in_rectangle(%{point}"
+          def geo_in_rectangle(column_name_or_point,
+                               top_left, bottom_right)
+            expression = "geo_in_rectangle(%{column_name_or_point}"
             expression << ", %{top_left}"
             expression << ", %{bottom_right}"
             expression << ")"
             @request.filter(expression,
-                            point: point,
+                            column_name_or_point: column_name_or_point,
                             top_left: top_left,
                             bottom_right: bottom_right)
           end

diff --git a/test/request/select/test-filter.rb b/test/request/select/test-filter.rb
@@ -207,6 +207,14 @@ def geo_in_rectangle(*args)
         @request.filter.geo_in_rectangle(*args).to_parameters
       end
 
+      test("column") do
+        assert_equal({
+                       :table => "posts",
+                       :filter => "geo_in_rectangle(location, \"0x100\", \"100x0\")",
+                     },
+                     geo_in_rectangle(:location, "0x100", "100x0"))
+      end
+
       test("point") do
         assert_equal({
                        :table => "posts",