Allow conversions field to be symbol

Andrew Kane
1 parent 9ca1a262
Showing 3 changed files with 5 additions and 5 deletions Show diff stats
lib/searchkick/index.rb
lib/searchkick/query.rb
test/test_helper.rb
@@ -642,7 +642,7 @@ module Searchkick
       source = source.each_with_object({}) { |(k, v), memo| memo[k.to_s] = v; memo }.except("_id")
  
       # conversions
-      Array(options[:conversions]).each do |conversions_field|
+      Array(options[:conversions]).map(&:to_s).each do |conversions_field|
         if source[conversions_field]
           source[conversions_field] = source[conversions_field].map { |k, v| {query: k, count: v} }
         end
@@ -168,7 +168,7 @@ module Searchkick
       # model and eager loading
       load = options[:load].nil? ? true : options[:load]
  
-      conversions_fields = Array(options[:conversions] || searchkick_options[:conversions])
+      conversions_fields = Array(options[:conversions] || searchkick_options[:conversions]).map(&:to_s)
       personalize_field  = searchkick_options[:personalize]
  
       all = term == "*"
@@ -277,9 +277,9 @@ class Product
     ],
     autocomplete: [:name],
     suggest: [:name, :color],
-    conversions: "conversions",
-    personalize: "user_ids",
-    locations: ["location", "multiple_locations"],
+    conversions: [:conversions],
+    personalize: :user_ids,
+    locations: [:location, :multiple_locations],
     text_start: [:name],
     text_middle: [:name],
     text_end: [:name],
...	...	@@ -642,7 +642,7 @@ module Searchkick
642	642	source = source.each_with_object({}) { \|(k, v), memo\| memo[k.to_s] = v; memo }.except("_id")
643	643
644	644	# conversions
645		- Array(options[:conversions]).each do \|conversions_field\|
	645	+ Array(options[:conversions]).map(&:to_s).each do \|conversions_field\|
646	646	if source[conversions_field]
647	647	source[conversions_field] = source[conversions_field].map { \|k, v\| {query: k, count: v} }
648	648	end
...	...
...	...	@@ -168,7 +168,7 @@ module Searchkick
168	168	# model and eager loading
169	169	load = options[:load].nil? ? true : options[:load]
170	170
171		- conversions_fields = Array(options[:conversions] \|\| searchkick_options[:conversions])
	171	+ conversions_fields = Array(options[:conversions] \|\| searchkick_options[:conversions]).map(&:to_s)
172	172	personalize_field = searchkick_options[:personalize]
173	173
174	174	all = term == "*"
...	...
...	...	@@ -277,9 +277,9 @@ class Product
277	277	],
278	278	autocomplete: [:name],
279	279	suggest: [:name, :color],
280		- conversions: "conversions",
281		- personalize: "user_ids",
282		- locations: ["location", "multiple_locations"],
	280	+ conversions: [:conversions],
	281	+ personalize: :user_ids,
	282	+ locations: [:location, :multiple_locations],
283	283	text_start: [:name],
284	284	text_middle: [:name],
285	285	text_end: [:name],
...	...