From a072133b92764d75cb78461de6602505467aa0a4 Mon Sep 17 00:00:00 2001
From: Andrew <acekane1@gmail.com>
Date: Wed, 28 Feb 2018 19:03:00 -0800
Subject: [PATCH] Removed retry_misspellings option [skip ci]

---
 lib/searchkick.rb              |  4 ++--
 lib/searchkick/logging.rb      |  2 +-
 lib/searchkick/multi_search.rb | 13 ++++++-------
 test/multi_search_test.rb      |  7 -------
 4 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/lib/searchkick.rb b/lib/searchkick.rb
index 4d5553a..afee50b 100644
--- a/lib/searchkick.rb
+++ b/lib/searchkick.rb
@@ -100,8 +100,8 @@ module Searchkick
     end
   end
 
-  def self.multi_search(queries, retry_misspellings: false)
-    Searchkick::MultiSearch.new(queries, retry_misspellings: retry_misspellings).perform
+  def self.multi_search(queries)
+    Searchkick::MultiSearch.new(queries).perform
   end
 
   # callbacks
diff --git a/lib/searchkick/logging.rb b/lib/searchkick/logging.rb
index a095195..84f528e 100644
--- a/lib/searchkick/logging.rb
+++ b/lib/searchkick/logging.rb
@@ -129,7 +129,7 @@ module Searchkick
   end
 
   module SearchkickWithInstrumentation
-    def multi_search(searches, **options)
+    def multi_search(searches)
       event = {
         name: "Multi Search",
         body: searches.flat_map { |q| [q.params.except(:body).to_json, q.body.to_json] }.map { |v| "#{v}\n" }.join
diff --git a/lib/searchkick/multi_search.rb b/lib/searchkick/multi_search.rb
index dcd0301..1790a6f 100644
--- a/lib/searchkick/multi_search.rb
+++ b/lib/searchkick/multi_search.rb
@@ -2,25 +2,24 @@ module Searchkick
   class MultiSearch
     attr_reader :queries
 
-    def initialize(queries, retry_misspellings: false)
+    def initialize(queries)
       @queries = queries
-      @retry_misspellings = retry_misspellings
     end
 
     def perform
       if queries.any?
-        perform_search(queries, retry_misspellings: @retry_misspellings)
+        perform_search(queries)
       end
     end
 
     private
 
-    def perform_search(queries, retry_misspellings: true)
+    def perform_search(queries)
       responses = client.msearch(body: queries.flat_map { |q| [q.params.except(:body), q.body] })["responses"]
 
       retry_queries = []
       queries.each_with_index do |query, i|
-        if retry_misspellings && query.retry_misspellings?(responses[i])
+        if 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,8 +27,8 @@ module Searchkick
         end
       end
 
-      if retry_misspellings && retry_queries.any?
-        perform_search(retry_queries, retry_misspellings: false)
+      if retry_queries.any?
+        perform_search(retry_queries)
       end
 
       queries
diff --git a/test/multi_search_test.rb b/test/multi_search_test.rb
index 0f0332e..a0c9585 100644
--- a/test/multi_search_test.rb
+++ b/test/multi_search_test.rb
@@ -24,13 +24,6 @@ class MultiSearchTest < Minitest::Test
     store_names ["abc", "abd", "aee"]
     products = Product.search("abc", misspellings: {below: 2}, execute: false)
     Searchkick.multi_search([products])
-    assert_equal ["abc"], products.map(&:name)
-  end
-
-  def test_misspellings_below_unmet_retry
-    store_names ["abc", "abd", "aee"]
-    products = Product.search("abc", misspellings: {below: 2}, execute: false)
-    Searchkick.multi_search([products], retry_misspellings: true)
     assert_equal ["abc", "abd"], products.map(&:name)
   end
 
--
libgit2 0.21.0