Fixed with_hit and with_highlights when records in search index do not exist in database

Andrew
1 parent dd1d3724
Showing 2 changed files with 12 additions and 9 deletions Show diff stats
CHANGELOG.md
lib/searchkick/results.rb
@@ -3,6 +3,7 @@
 - Added `:inline` as alias for `true` for `callbacks` and `mode` options
 - Friendlier error message for bad mapping with partial matches
 - Warn when records in search index do not exist in database
+- Fixed `with_hit` and `with_highlights` when records in search index do not exist in database
 - Fixed error with highlights and match all
 ## 3.0.3
@@ -16,7 +16,11 @@ module Searchkick
     end
     def results
-      @results ||= begin
+      @results ||= with_hit.map(&:first)
+    end
+
+    def with_hit
+      @with_hit ||= begin
         if options[:load]
           # results can have different types
           results = {}
@@ -38,8 +42,8 @@ module Searchkick
                   end
                 end
               end
-              result
-            end.compact
+              [result, hit]
+            end.select { |v| v[0] }
           if results.size != hits.size
             warn "[searchkick] WARNING: Records in search index do not exist in database"
@@ -65,7 +69,7 @@ module Searchkick
             end
             result["id"] ||= result["_id"] # needed for legacy reasons
-            HashWrapper.new(result)
+            [HashWrapper.new(result), hit]
           end
         end
       end
@@ -179,10 +183,6 @@ module Searchkick
       end
     end
-    def with_hit
-      results.zip(hits)
-    end
-
     def highlights(multiple: false)
       hits.map do |hit|
         hit_highlights(hit, multiple: multiple)
@@ -190,7 +190,9 @@ module Searchkick
     end
     def with_highlights(multiple: false)
-      results.zip(highlights(multiple: multiple))
+      with_hit do |result, hit|
+        [result, hit_highlights(hit, multiple: multiple)]
+      end
     end
     def misspellings?
	@@ -3,6 +3,7 @@		@@ -3,6 +3,7 @@
3	- Added `:inline` as alias for `true` for `callbacks` and `mode` options	3	- Added `:inline` as alias for `true` for `callbacks` and `mode` options
4	- Friendlier error message for bad mapping with partial matches	4	- Friendlier error message for bad mapping with partial matches
5	- Warn when records in search index do not exist in database	5	- Warn when records in search index do not exist in database
		6	+- Fixed `with_hit` and `with_highlights` when records in search index do not exist in database
6	- Fixed error with highlights and match all	7	- Fixed error with highlights and match all
7		8
8	## 3.0.3	9	## 3.0.3