Fixed error with suggestions and match all - fixes #1042

Andrew
1 parent a3f52dbd
Showing 3 changed files with 8 additions and 1 deletions Show diff stats
lib/searchkick/query.rb
lib/searchkick/results.rb
test/suggest_test.rb
@@ -112,7 +112,8 @@ module Searchkick
         json: !@json.nil?,
         match_suffix: @match_suffix,
         highlighted_fields: @highlighted_fields || [],
-        misspellings: @misspellings
+        misspellings: @misspellings,
+        term: term
       }
  
       if options[:debug]
@@ -77,6 +77,8 @@ module Searchkick
     def suggestions
       if response["suggest"]
         response["suggest"].values.flat_map { |v| v.first["options"] }.sort_by { |o| -o["score"] }.map { |o| o["text"] }.uniq
+      elsif options[:term] == "*"
+        []
       else
         raise "Pass `suggest: true` to the search method for suggestions"
       end
@@ -77,6 +77,10 @@ class SuggestTest &lt; Minitest::Test
     assert_raises(ArgumentError) { Searchkick.search("How Big is a Tigre Shar", suggest: true) }
   end
  
+  def test_star
+    assert_equal [], Product.search("*", suggest: true).suggestions
+  end
+
   protected
  
   def assert_suggest(term, expected, options = {})
...	...	@@ -112,7 +112,8 @@ module Searchkick
112	112	json: !@json.nil?,
113	113	match_suffix: @match_suffix,
114	114	highlighted_fields: @highlighted_fields \|\| [],
115		- misspellings: @misspellings
	115	+ misspellings: @misspellings,
	116	+ term: term
116	117	}
117	118
118	119	if options[:debug]
...	...
...	...	@@ -77,6 +77,8 @@ module Searchkick
77	77	def suggestions
78	78	if response["suggest"]
79	79	response["suggest"].values.flat_map { \|v\| v.first["options"] }.sort_by { \|o\| -o["score"] }.map { \|o\| o["text"] }.uniq
	80	+ elsif options[:term] == "*"
	81	+ []
80	82	else
81	83	raise "Pass `suggest: true` to the search method for suggestions"
82	84	end
...	...
...	...	@@ -77,6 +77,10 @@ class SuggestTest < Minitest::Test
77	77	assert_raises(ArgumentError) { Searchkick.search("How Big is a Tigre Shar", suggest: true) }
78	78	end
79	79
	80	+ def test_star
	81	+ assert_equal [], Product.search("*", suggest: true).suggestions
	82	+ end
	83	+
80	84	protected
81	85
82	86	def assert_suggest(term, expected, options = {})
...	...