Revert "Include indexed search_data on demand"

This reverts commit b7e366a9dcd4ea72c3b53e46666465a4cd64c351.

Revert "Include indexed search_data on demand"
This reverts commit b7e366a9dcd4ea72c3b53e46666465a4cd64c351.
Rustam Sharshenov
1 parent b7e366a9
Showing 3 changed files with 12 additions and 19 deletions Show diff stats
lib/searchkick/model.rb
lib/searchkick/query.rb
lib/searchkick/results.rb
@@ -7,8 +7,6 @@ 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 and not options[:include_search_data]
+        if load
           payload[:fields] = []
         elsif options[:select]
           payload[:fields] = options[:select]
@@ -408,7 +408,6 @@ 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,12 +41,19 @@ module Searchkick
           # sort
           hits.map do |hit|
-            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
+            results[hit["_type"]].find{|r| r.id.to_s == hit["_id"].to_s }
           end.compact
         else
-          hits.map { |hit| build_hashie_result hit }
+          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
         end
       end
     end
@@ -136,16 +143,5 @@ 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,8 +7,6 @@ module Searchkick		@@ -7,8 +7,6 @@ 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	-
12	callbacks = options.has_key?(:callbacks) ? options[:callbacks] : true	10	callbacks = options.has_key?(:callbacks) ? options[:callbacks] : true
13		11
14	class_variable_set :@@searchkick_options, options.dup	12	class_variable_set :@@searchkick_options, options.dup