Cleaned pull request

Andrew Kane
1 parent a0b29051
Showing 3 changed files with 8 additions and 8 deletions Show diff stats
CHANGELOG.md
lib/searchkick/query.rb
test/boost_test.rb
@@ -3,6 +3,7 @@
 - Added support for NoBrainer
 - Added `stem_conversions: false` option
 - Fixed suggestions with partial match boost
+- Added support for multiple `boost_where` values on the same field
  
 ## 0.8.5
  
@@ -538,10 +538,10 @@ module Searchkick
  
     def custom_filter(field, value, factor)
       {
-          filter: {
-              term: {field => value}
-          },
-          boost_factor: factor
+        filter: {
+          term: {field => value}
+        },
+        boost_factor: factor
       }
     end
  
@@ -96,13 +96,12 @@ class TestBoost &lt; Minitest::Test
   def test_boost_where
     store [
       {name: "Tomato A"},
-      {name: "Tomato B", user_ids: [1, 2, 3]},
-      {name: "Tomato C" ,user_ids: [4, 5]},
-      {name: "Tomato D"}
+      {name: "Tomato B", user_ids: [1, 2]},
+      {name: "Tomato C", user_ids: [3]}
     ]
     assert_first "tomato", "Tomato B", boost_where: {user_ids: 2}
     assert_first "tomato", "Tomato B", boost_where: {user_ids: {value: 2, factor: 10}}
-    assert_first "tomato", "Tomato C", boost_where: {user_ids: [{value: 2, factor: 10}, {value: 4, factor: 20}]}
+    assert_order "tomato", ["Tomato C", "Tomato B", "Tomato A"], boost_where: {user_ids: [{value: 1, factor: 10}, {value: 3, factor: 20}]}
   end
  
   def test_boost_by_distance
...	...	@@ -3,6 +3,7 @@
3	3	- Added support for NoBrainer
4	4	- Added `stem_conversions: false` option
5	5	- Fixed suggestions with partial match boost
	6	+- Added support for multiple `boost_where` values on the same field
6	7
7	8	## 0.8.5
8	9
...	...
...	...	@@ -538,10 +538,10 @@ module Searchkick
538	538
539	539	def custom_filter(field, value, factor)
540	540	{
541		- filter: {
542		- term: {field => value}
543		- },
544		- boost_factor: factor
	541	+ filter: {
	542	+ term: {field => value}
	543	+ },
	544	+ boost_factor: factor
545	545	}
546	546	end
547	547
...	...
...	...	@@ -96,13 +96,12 @@ class TestBoost < Minitest::Test
96	96	def test_boost_where
97	97	store [
98	98	{name: "Tomato A"},
99		- {name: "Tomato B", user_ids: [1, 2, 3]},
100		- {name: "Tomato C" ,user_ids: [4, 5]},
101		- {name: "Tomato D"}
	99	+ {name: "Tomato B", user_ids: [1, 2]},
	100	+ {name: "Tomato C", user_ids: [3]}
102	101	]
103	102	assert_first "tomato", "Tomato B", boost_where: {user_ids: 2}
104	103	assert_first "tomato", "Tomato B", boost_where: {user_ids: {value: 2, factor: 10}}
105		- assert_first "tomato", "Tomato C", boost_where: {user_ids: [{value: 2, factor: 10}, {value: 4, factor: 20}]}
	104	+ assert_order "tomato", ["Tomato C", "Tomato B", "Tomato A"], boost_where: {user_ids: [{value: 1, factor: 10}, {value: 3, factor: 20}]}
106	105	end
107	106
108	107	def test_boost_by_distance
...	...