[MODEL] Added, that each_with_hit and map_with_hit in Elasticsearch::Model::Response::Records call to_a

karmi · karmi · commit d3e5c8b72112 · 2014-05-07T11:37:42.000+02:00
The `zip` method in `records.rb` didn't call `to_a` on the collection, thus the records were not returned in the same order as Elasticsearch's results. Related #99 Related #102
diff --git a/elasticsearch-model/lib/elasticsearch/model/response/records.rb b/elasticsearch-model/lib/elasticsearch/model/response/records.rb
@@ -43,13 +43,13 @@ def results
         # Yields [record, hit] pairs to the block
         #
         def each_with_hit(&block)
-          records.zip(results).each(&block)
+          records.to_a.zip(results).each(&block)
         end
 
         # Yields [record, hit] pairs and returns the result
         #
         def map_with_hit(&block)
-          records.zip(results).map(&block)
+          records.to_a.zip(results).map(&block)
         end
 
         # Delegate methods to `@records`

Original file line number	Diff line number	Diff line change
`@@ -43,13 +43,13 @@ def results`
`43`	`43`	`# Yields [record, hit] pairs to the block`
`44`	`44`	`#`
`45`	`45`	`def each_with_hit(&block)`
`46`		`- records.zip(results).each(&block)`
	`46`	`+ records.to_a.zip(results).each(&block)`
`47`	`47`	`end`
`48`	`48`
`49`	`49`	`# Yields [record, hit] pairs and returns the result`
`50`	`50`	`#`
`51`	`51`	`def map_with_hit(&block)`
`52`		`- records.zip(results).map(&block)`
	`52`	`+ records.to_a.zip(results).map(&block)`
`53`	`53`	`end`
`54`	`54`
`55`	`55`	# Delegate methods to `@records`