Ensure options aren't modified, speed up tests, and small style updates

Andrew Kane
1 parent 94081b28
Showing 4 changed files with 10 additions and 13 deletions Show diff stats
lib/searchkick/index_options.rb
lib/searchkick/query.rb
test/geo_shape_test.rb
test/test_helper.rb
@@ -281,7 +281,7 @@ module Searchkick
           }
         end
-        options[:geo_shapes] = options[:geo_shapes].product([{}]).to_h if options[:geo_shapes].is_a? Array
+        options[:geo_shapes] = options[:geo_shapes].product([{}]).to_h if options[:geo_shapes].is_a?(Array)
         (options[:geo_shapes] || {}).each do |field, shape_options|
           mapping[field] = shape_options.merge(type: "geo_shape")
         end
@@ -829,13 +829,13 @@ module Searchkick
                   }
                 }
               when :geo_shape
-                op_value[:coordinates] = coordinate_array(op_value[:coordinates]) if op_value[:coordinates]
-                relation = op_value.delete(:relation) || 'intersects'
+                shape = op_value.except(:relation)
+                shape[:coordinates] = coordinate_array(shape[:coordinates]) if shape[:coordinates]
                 filters << {
                   geo_shape: {
                     field => {
-                      relation: relation,
-                      shape: op_value
+                      relation: op_value[:relation] || "intersects",
+                      shape: shape
                     }
                   }
                 }
@@ -2,14 +2,14 @@ require_relative &quot;test_helper&quot;
 class GeoShapeTest < Minitest::Test
   def setup
-    super
+    Region.destroy_all
     store [
       {
         name: "Region A",
         text: "The witch had a cat",
         territory: {
           type: "polygon",
-          coordinates: [[[30,40],[35,45],[40,40],[40,30],[30,30],[30,40]]]
+          coordinates: [[[30, 40], [35, 45], [40, 40], [40, 30], [30, 30], [30, 40]]]
         }
       },
       {
@@ -17,7 +17,7 @@ class GeoShapeTest &lt; Minitest::Test
         text: "and a very tall hat",
         territory: {
           type: "polygon",
-          coordinates: [[[50,60],[55,65],[60,60],[60,50],[50,50],[50,60]]]
+          coordinates: [[[50, 60], [55, 65], [60, 60], [60, 50], [50, 50], [50, 60]]]
         }
       },
       {
@@ -25,7 +25,7 @@ class GeoShapeTest &lt; Minitest::Test
         text: "and long ginger hair which she wore in a plait",
         territory: {
           type: "polygon",
-          coordinates: [[[10,20],[15,25],[20,20],[20,10],[10,10],[10,20]]]
+          coordinates: [[[10, 20], [15, 25], [20, 20], [20, 10], [10, 10], [10, 20]]]
         }
       }
     ], Region
@@ -149,7 +149,7 @@ class GeoShapeTest &lt; Minitest::Test
           geo_shape: {
             type: "envelope",
             relation: "contains",
-            coordinates: [[12, 13], [13,12]]
+            coordinates: [[12, 13], [13, 12]]
           }
         }
       }
@@ -414,8 +414,6 @@ Product.create!(name: &quot;Set mapping&quot;)
 Store.reindex
 Animal.reindex
 Speaker.reindex
-
-Region.searchkick_index.delete if Region.searchkick_index.exists?
 Region.reindex
 class Minitest::Test
@@ -424,7 +422,6 @@ class Minitest::Test
     Store.destroy_all
     Animal.destroy_all
     Speaker.destroy_all
-    Region.destroy_all
   end
   protected
	@@ -281,7 +281,7 @@ module Searchkick		@@ -281,7 +281,7 @@ module Searchkick
281	}	281	}
282	end	282	end
283		283
284	- options[:geo_shapes] = options[:geo_shapes].product([{}]).to_h if options[:geo_shapes].is_a? Array	284	+ options[:geo_shapes] = options[:geo_shapes].product([{}]).to_h if options[:geo_shapes].is_a?(Array)
285	(options[:geo_shapes] \|\| {}).each do \|field, shape_options\|	285	(options[:geo_shapes] \|\| {}).each do \|field, shape_options\|
286	mapping[field] = shape_options.merge(type: "geo_shape")	286	mapping[field] = shape_options.merge(type: "geo_shape")
287	end	287	end
	@@ -2,14 +2,14 @@ require_relative "test_helper"		@@ -2,14 +2,14 @@ require_relative "test_helper"
2		2
3	class GeoShapeTest < Minitest::Test	3	class GeoShapeTest < Minitest::Test
4	def setup	4	def setup
5	- super	5	+ Region.destroy_all
6	store [	6	store [
7	{	7	{
8	name: "Region A",	8	name: "Region A",
9	text: "The witch had a cat",	9	text: "The witch had a cat",
10	territory: {	10	territory: {
11	type: "polygon",	11	type: "polygon",
12	- coordinates: [[[30,40],[35,45],[40,40],[40,30],[30,30],[30,40]]]	12	+ coordinates: [[[30, 40], [35, 45], [40, 40], [40, 30], [30, 30], [30, 40]]]
13	}	13	}
14	},	14	},
15	{	15	{
	@@ -17,7 +17,7 @@ class GeoShapeTest < Minitest::Test		@@ -17,7 +17,7 @@ class GeoShapeTest < Minitest::Test
17	text: "and a very tall hat",	17	text: "and a very tall hat",
18	territory: {	18	territory: {
19	type: "polygon",	19	type: "polygon",
20	- coordinates: [[[50,60],[55,65],[60,60],[60,50],[50,50],[50,60]]]	20	+ coordinates: [[[50, 60], [55, 65], [60, 60], [60, 50], [50, 50], [50, 60]]]
21	}	21	}
22	},	22	},
23	{	23	{
	@@ -25,7 +25,7 @@ class GeoShapeTest < Minitest::Test		@@ -25,7 +25,7 @@ class GeoShapeTest < Minitest::Test
25	text: "and long ginger hair which she wore in a plait",	25	text: "and long ginger hair which she wore in a plait",
26	territory: {	26	territory: {
27	type: "polygon",	27	type: "polygon",
28	- coordinates: [[[10,20],[15,25],[20,20],[20,10],[10,10],[10,20]]]	28	+ coordinates: [[[10, 20], [15, 25], [20, 20], [20, 10], [10, 10], [10, 20]]]
29	}	29	}
30	}	30	}
31	], Region	31	], Region
	@@ -149,7 +149,7 @@ class GeoShapeTest < Minitest::Test		@@ -149,7 +149,7 @@ class GeoShapeTest < Minitest::Test
149	geo_shape: {	149	geo_shape: {
150	type: "envelope",	150	type: "envelope",
151	relation: "contains",	151	relation: "contains",
152	- coordinates: [[12, 13], [13,12]]	152	+ coordinates: [[12, 13], [13, 12]]
153	}	153	}
154	}	154	}
155	}	155	}