From 1bc72e34098d80a8dc616b4f35bca38ed9dd5973 Mon Sep 17 00:00:00 2001 From: Jonathan Phillips Date: Wed, 20 Sep 2017 23:56:33 -0700 Subject: [PATCH] Allow operator to be a symbol or string (#996) --- lib/searchkick/query.rb | 2 +- test/match_test.rb | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/searchkick/query.rb b/lib/searchkick/query.rb index 9cdd080..ac47f0f 100644 --- a/lib/searchkick/query.rb +++ b/lib/searchkick/query.rb @@ -307,7 +307,7 @@ module Searchkick exclude_field = field if field == "_all" || field.end_with?(".analyzed") - shared_options[:cutoff_frequency] = 0.001 unless operator == "and" || misspellings == false + shared_options[:cutoff_frequency] = 0.001 unless operator.to_s == "and" || misspellings == false qs.concat [ shared_options.merge(analyzer: "searchkick_search"), shared_options.merge(analyzer: "searchkick_search2") diff --git a/test/match_test.rb b/test/match_test.rb index 92d5c92..082705c 100644 --- a/test/match_test.rb +++ b/test/match_test.rb @@ -18,6 +18,13 @@ class MatchTest < Minitest::Test assert_search "pepperjack cheese skewers", ["Pepper Jack Cheese Skewers"] end + def test_operator + store_names ["fresh", "honey"] + assert_search "fresh honey", ["fresh", "honey"], {operator: "or"} + assert_search "fresh honey", [], {operator: "and"} + assert_search "fresh honey", ["fresh", "honey"], {operator: :or} + end + # def test_cheese_space_in_query # store_names ["Pepperjack Cheese Skewers"] # assert_search "pepper jack cheese skewers", ["Pepperjack Cheese Skewers"] -- libgit2 0.21.0