Symbolize keys for better merging - fixes #1144

Andrew
1 parent 211624e3
Showing 2 changed files with 6 additions and 6 deletions Show diff stats
lib/searchkick/index_options.rb
test/routing_test.rb
@@ -225,7 +225,7 @@ module Searchkick
           }
         end
  
-        settings.deep_merge!(options[:settings] || {})
+        settings = settings.symbolize_keys.deep_merge((options[:settings] || {}).symbolize_keys)
  
         # synonyms
         synonyms = options[:synonyms] || []
@@ -311,10 +311,10 @@ module Searchkick
  
           if !options[:searchable] || mapping_options[:searchable].include?(field)
             if word
-              fields["analyzed"] = analyzed_field_options
+              fields[:analyzed] = analyzed_field_options
  
               if mapping_options[:highlight].include?(field)
-                fields["analyzed"][:term_vector] = "with_positions_offsets"
+                fields[:analyzed][:term_vector] = "with_positions_offsets"
               end
             end
  
@@ -373,7 +373,7 @@ module Searchkick
           end
  
           if word
-            dynamic_fields["analyzed"] = analyzed_field_options
+            dynamic_fields[:analyzed] = analyzed_field_options
           end
         end
  
@@ -402,7 +402,7 @@ module Searchkick
           mappings[index_type][:_all] = all_enabled ? analyzed_field_options : {enabled: false}
         end
  
-        mappings = mappings.deep_merge(options[:mappings] || {})
+        mappings = mappings.symbolize_keys.deep_merge((options[:mappings] || {}).symbolize_keys)
       end
  
       {
@@ -8,7 +8,7 @@ class RoutingTest &lt; Minitest::Test
  
   def test_routing_mappings
     index_options = Store.searchkick_index.index_options
-    assert_equal index_options[:mappings]["store"][:_routing], required: true
+    assert_equal index_options[:mappings][:store][:_routing], required: true
   end
  
   def test_routing_correct_node
...	...	@@ -225,7 +225,7 @@ module Searchkick
225	225	}
226	226	end
227	227
228		- settings.deep_merge!(options[:settings] \|\| {})
	228	+ settings = settings.symbolize_keys.deep_merge((options[:settings] \|\| {}).symbolize_keys)
229	229
230	230	# synonyms
231	231	synonyms = options[:synonyms] \|\| []
...	...	@@ -311,10 +311,10 @@ module Searchkick
311	311
312	312	if !options[:searchable] \|\| mapping_options[:searchable].include?(field)
313	313	if word
314		- fields["analyzed"] = analyzed_field_options
	314	+ fields[:analyzed] = analyzed_field_options
315	315
316	316	if mapping_options[:highlight].include?(field)
317		- fields["analyzed"][:term_vector] = "with_positions_offsets"
	317	+ fields[:analyzed][:term_vector] = "with_positions_offsets"
318	318	end
319	319	end
320	320
...	...	@@ -373,7 +373,7 @@ module Searchkick
373	373	end
374	374
375	375	if word
376		- dynamic_fields["analyzed"] = analyzed_field_options
	376	+ dynamic_fields[:analyzed] = analyzed_field_options
377	377	end
378	378	end
379	379
...	...	@@ -402,7 +402,7 @@ module Searchkick
402	402	mappings[index_type][:_all] = all_enabled ? analyzed_field_options : {enabled: false}
403	403	end
404	404
405		- mappings = mappings.deep_merge(options[:mappings] \|\| {})
	405	+ mappings = mappings.symbolize_keys.deep_merge((options[:mappings] \|\| {}).symbolize_keys)
406	406	end
407	407
408	408	{
...	...
...	...	@@ -8,7 +8,7 @@ class RoutingTest < Minitest::Test
8	8
9	9	def test_routing_mappings
10	10	index_options = Store.searchkick_index.index_options
11		- assert_equal index_options[:mappings]["store"][:_routing], required: true
	11	+ assert_equal index_options[:mappings][:store][:_routing], required: true
12	12	end
13	13
14	14	def test_routing_correct_node
...	...