Commit 2e6c82a16a542d250922dfb345631b3ba428cd77
1 parent
9ca1a262
Exists in
master
and in
21 other branches
Allow conversions field to be symbol
Showing
3 changed files
with
5 additions
and
5 deletions
Show diff stats
lib/searchkick/index.rb
| @@ -642,7 +642,7 @@ module Searchkick | @@ -642,7 +642,7 @@ module Searchkick | ||
| 642 | source = source.each_with_object({}) { |(k, v), memo| memo[k.to_s] = v; memo }.except("_id") | 642 | source = source.each_with_object({}) { |(k, v), memo| memo[k.to_s] = v; memo }.except("_id") |
| 643 | 643 | ||
| 644 | # conversions | 644 | # conversions |
| 645 | - Array(options[:conversions]).each do |conversions_field| | 645 | + Array(options[:conversions]).map(&:to_s).each do |conversions_field| |
| 646 | if source[conversions_field] | 646 | if source[conversions_field] |
| 647 | source[conversions_field] = source[conversions_field].map { |k, v| {query: k, count: v} } | 647 | source[conversions_field] = source[conversions_field].map { |k, v| {query: k, count: v} } |
| 648 | end | 648 | end |
lib/searchkick/query.rb
| @@ -168,7 +168,7 @@ module Searchkick | @@ -168,7 +168,7 @@ module Searchkick | ||
| 168 | # model and eager loading | 168 | # model and eager loading |
| 169 | load = options[:load].nil? ? true : options[:load] | 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 | personalize_field = searchkick_options[:personalize] | 172 | personalize_field = searchkick_options[:personalize] |
| 173 | 173 | ||
| 174 | all = term == "*" | 174 | all = term == "*" |
test/test_helper.rb
| @@ -277,9 +277,9 @@ class Product | @@ -277,9 +277,9 @@ class Product | ||
| 277 | ], | 277 | ], |
| 278 | autocomplete: [:name], | 278 | autocomplete: [:name], |
| 279 | suggest: [:name, :color], | 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 | text_start: [:name], | 283 | text_start: [:name], |
| 284 | text_middle: [:name], | 284 | text_middle: [:name], |
| 285 | text_end: [:name], | 285 | text_end: [:name], |