Treat _id and id differently - closes #203

Andrew Kane
1 parent 96733e00
Showing 4 changed files with 5 additions and 6 deletions Show diff stats
CHANGELOG.md
lib/searchkick/index.rb
lib/searchkick/query.rb
lib/searchkick/results.rb
 ## 0.7.6 [unreleased]
  
+- Treat `id` and `_id` differently
 - Added `padding` option
  
 ## 0.7.5
@@ -83,7 +83,8 @@ module Searchkick
       source = record.search_data
  
       # stringify fields
-      source = source.inject({}){|memo,(k,v)| memo[k.to_s] = v; memo}.except("id", "_id")
+      source = source.inject({}){|memo,(k,v)| memo[k.to_s] = v; memo}.except("_id")
+      source["id"] ||= search_id(record)
  
       options = record.class.searchkick_options
  
@@ -195,8 +195,7 @@ module Searchkick
  
       # order
       if options[:order]
-        order = options[:order].is_a?(Enumerable) ? options[:order] : {options[:order] => :asc}
-        payload[:sort] = Hash[ order.map{|k, v| [k.to_s == "id" ? :_id : k, v] } ]
+        payload[:sort] = options[:order].is_a?(Enumerable) ? options[:order] : {options[:order] => :asc}
       end
  
       # filters
@@ -383,8 +382,6 @@ module Searchkick
     def where_filters(where)
       filters = []
       (where || {}).each do |field, value|
-        field = :_id if field.to_s == "id"
-
         if field == :or
           value.each do |or_clause|
             filters << {or: or_clause.map{|or_statement| {and: where_filters(or_statement)} }}
@@ -39,7 +39,7 @@ module Searchkick
         else
           hits.map do |hit|
             result = hit.except("_source").merge(hit["_source"])
-            result["id"] = result["_id"]
+            result["id"] ||= result["_id"] # needed for legacy reasons
             Hashie::Mash.new(result)
           end
         end
1	1	## 0.7.6 [unreleased]
2	2
	3	+- Treat `id` and `_id` differently
3	4	- Added `padding` option
4	5
5	6	## 0.7.5
...	...
...	...	@@ -83,7 +83,8 @@ module Searchkick
83	83	source = record.search_data
84	84
85	85	# stringify fields
86		- source = source.inject({}){\|memo,(k,v)\| memo[k.to_s] = v; memo}.except("id", "_id")
	86	+ source = source.inject({}){\|memo,(k,v)\| memo[k.to_s] = v; memo}.except("_id")
	87	+ source["id"] \|\|= search_id(record)
87	88
88	89	options = record.class.searchkick_options
89	90
...	...
...	...	@@ -195,8 +195,7 @@ module Searchkick
195	195
196	196	# order
197	197	if options[:order]
198		- order = options[:order].is_a?(Enumerable) ? options[:order] : {options[:order] => :asc}
199		- payload[:sort] = Hash[ order.map{\|k, v\| [k.to_s == "id" ? :_id : k, v] } ]
	198	+ payload[:sort] = options[:order].is_a?(Enumerable) ? options[:order] : {options[:order] => :asc}
200	199	end
201	200
202	201	# filters
...	...	@@ -383,8 +382,6 @@ module Searchkick
383	382	def where_filters(where)
384	383	filters = []
385	384	(where \|\| {}).each do \|field, value\|
386		- field = :_id if field.to_s == "id"
387		-
388	385	if field == :or
389	386	value.each do \|or_clause\|
390	387	filters << {or: or_clause.map{\|or_statement\| {and: where_filters(or_statement)} }}
...	...
...	...	@@ -39,7 +39,7 @@ module Searchkick
39	39	else
40	40	hits.map do \|hit\|
41	41	result = hit.except("_source").merge(hit["_source"])
42		- result["id"] = result["_id"]
	42	+ result["id"] \|\|= result["_id"] # needed for legacy reasons
43	43	Hashie::Mash.new(result)
44	44	end
45	45	end
...	...