Include indexed search_data on demand

Rustam Sharshenov
1 parent 9c8170e2
Showing 3 changed files with 19 additions and 12 deletions Show diff stats
lib/searchkick/model.rb
lib/searchkick/query.rb
lib/searchkick/results.rb
@@ -7,6 +7,8 @@ module Searchkick
       class_eval do
         cattr_reader :searchkick_options, :searchkick_env, :searchkick_klass
+        attr_accessor :response_search_data
+
         callbacks = options.has_key?(:callbacks) ? options[:callbacks] : true
         class_variable_set :@@searchkick_options, options.dup
@@ -328,7 +328,7 @@ module Searchkick
         # An empty array will cause only the _id and _type for each hit to be returned
         # http://www.elasticsearch.org/guide/reference/api/search/fields/
-        if load
+        if load and not options[:include_search_data]
           payload[:fields] = []
         elsif options[:select]
           payload[:fields] = options[:select]
@@ -408,6 +408,7 @@ module Searchkick
         per_page: @per_page,
         padding: @padding,
         load: @load,
+        include_search_data: options[:include_search_data] || false,
         includes: options[:include] || options[:includes],
         json: !options[:json].nil?
       }
@@ -41,19 +41,12 @@ module Searchkick
           # sort
           hits.map do |hit|
-            results[hit["_type"]].find{|r| r.id.to_s == hit["_id"].to_s }
+            result = results[hit["_type"]].find{|r| r.id.to_s == hit["_id"].to_s }
+            result.response_search_data = build_hashie_result hit if options[:include_search_data] and result
+            result
           end.compact
         else
-          hits.map do |hit|
-            result =
-              if hit["_source"]
-                hit.except("_source").merge(hit["_source"])
-              else
-                hit.except("fields").merge(hit["fields"])
-              end
-            result["id"] ||= result["_id"] # needed for legacy reasons
-            Hashie::Mash.new(result)
-          end
+          hits.map { |hit| build_hashie_result hit }
         end
       end
     end
@@ -143,5 +136,16 @@ module Searchkick
       @response["hits"]["hits"]
     end
+    def build_hashie_result hit
+      result =
+        if hit["_source"]
+          hit.except("_source").merge(hit["_source"])
+        else
+          hit.except("fields").merge(hit["fields"])
+        end
+      result["id"] ||= result["_id"] # needed for legacy reasons
+      Hashie::Mash.new(result)
+    end
+
   end
 end
	@@ -7,6 +7,8 @@ module Searchkick		@@ -7,6 +7,8 @@ module Searchkick
7	class_eval do	7	class_eval do
8	cattr_reader :searchkick_options, :searchkick_env, :searchkick_klass	8	cattr_reader :searchkick_options, :searchkick_env, :searchkick_klass
9		9
		10	+ attr_accessor :response_search_data
		11	+
10	callbacks = options.has_key?(:callbacks) ? options[:callbacks] : true	12	callbacks = options.has_key?(:callbacks) ? options[:callbacks] : true
11		13
12	class_variable_set :@@searchkick_options, options.dup	14	class_variable_set :@@searchkick_options, options.dup