Merge branch 'master' of https://github.com/ankane/searchkick

Andrew
2 parents 9d7a513e 4bf97232
Showing 2 changed files with 7 additions and 7 deletions Show diff stats
lib/searchkick/multi_search.rb
test/multi_search_test.rb
@@ -14,12 +14,12 @@ module Searchkick
  
     private
  
-    def perform_search(queries)
-      responses = client.msearch(body: queries.flat_map { |q| [q.params.except(:body), q.body] })["responses"]
+    def perform_search(search_queries, perform_retry: true)
+      responses = client.msearch(body: search_queries.flat_map { |q| [q.params.except(:body), q.body] })["responses"]
  
       retry_queries = []
-      queries.each_with_index do |query, i|
-        if query.retry_misspellings?(responses[i])
+      search_queries.each_with_index do |query, i|
+        if perform_retry && query.retry_misspellings?(responses[i])
           query.send(:prepare) # okay, since we don't want to expose this method outside Searchkick
           retry_queries << query
         else
@@ -28,10 +28,10 @@ module Searchkick
       end
  
       if retry_queries.any?
-        perform_search(retry_queries)
+        perform_search(retry_queries, perform_retry: false)
       end
  
-      queries
+      search_queries
     end
  
     def client
@@ -22,7 +22,7 @@ class MultiSearchTest &lt; Minitest::Test
  
   def test_misspellings_below_unmet
     store_names ["abc", "abd", "aee"]
-    products = Product.search("abc", misspellings: {below: 2}, execute: false)
+    products = Product.search("abc", misspellings: {below: 5}, execute: false)
     Searchkick.multi_search([products])
     assert_equal ["abc", "abd"], products.map(&:name)
   end
...	...	@@ -14,12 +14,12 @@ module Searchkick
14	14
15	15	private
16	16
17		- def perform_search(queries)
18		- responses = client.msearch(body: queries.flat_map { \|q\| [q.params.except(:body), q.body] })["responses"]
	17	+ def perform_search(search_queries, perform_retry: true)
	18	+ responses = client.msearch(body: search_queries.flat_map { \|q\| [q.params.except(:body), q.body] })["responses"]
19	19
20	20	retry_queries = []
21		- queries.each_with_index do \|query, i\|
22		- if query.retry_misspellings?(responses[i])
	21	+ search_queries.each_with_index do \|query, i\|
	22	+ if perform_retry && query.retry_misspellings?(responses[i])
23	23	query.send(:prepare) # okay, since we don't want to expose this method outside Searchkick
24	24	retry_queries << query
25	25	else
...	...	@@ -28,10 +28,10 @@ module Searchkick
28	28	end
29	29
30	30	if retry_queries.any?
31		- perform_search(retry_queries)
	31	+ perform_search(retry_queries, perform_retry: false)
32	32	end
33	33
34		- queries
	34	+ search_queries
35	35	end
36	36
37	37	def client
...	...
...	...	@@ -22,7 +22,7 @@ class MultiSearchTest < Minitest::Test
22	22
23	23	def test_misspellings_below_unmet
24	24	store_names ["abc", "abd", "aee"]
25		- products = Product.search("abc", misspellings: {below: 2}, execute: false)
	25	+ products = Product.search("abc", misspellings: {below: 5}, execute: false)
26	26	Searchkick.multi_search([products])
27	27	assert_equal ["abc", "abd"], products.map(&:name)
28	28	end
...	...