Merge branch 'tommi-lew-master'

Andrew Kane
2 parents b31cc20f 4b7f60e6
Showing 4 changed files with 22 additions and 10 deletions Show diff stats
CHANGELOG.md
README.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
  
@@ -136,6 +136,7 @@ Boost matching documents
 ```ruby
 boost_where: {user_id: 1}
 boost_where: {user_id: {value: 1, factor: 100}} # default factor is 1000
+boost_where: {user_id: [{value: 1, factor: 100}, {value: 2, factor: 200}]}
 ```
  
 [Conversions](#keep-getting-better) are also a great way to boost.
@@ -198,17 +198,18 @@ module Searchkick
           boost_where.merge!(options[:personalize])
         end
         boost_where.each do |field, value|
-          if value.is_a?(Hash)
+          if value.is_a?(Array)
+            value.each do |value_factor|
+              value, factor = value_factor[:value], value_factor[:factor]
+              custom_filters << custom_filter(field, value, factor)
+            end
+          elsif value.is_a?(Hash)
             value, factor = value[:value], value[:factor]
+            custom_filters << custom_filter(field, value, factor)
           else
             factor = 1000
+            custom_filters << custom_filter(field, value, factor)
           end
-          custom_filters << {
-            filter: {
-              term: {field => value}
-            },
-            boost_factor: factor
-          }
         end
  
         boost_by_distance = options[:boost_by_distance]
@@ -535,5 +536,14 @@ module Searchkick
       end
     end
  
+    def custom_filter(field, value, factor)
+      {
+        filter: {
+          term: {field => value}
+        },
+        boost_factor: factor
+      }
+    end
+
   end
 end
@@ -96,12 +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"},
-      {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_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
...	...
...	...	@@ -136,6 +136,7 @@ Boost matching documents
136	136	```ruby
137	137	boost_where: {user_id: 1}
138	138	boost_where: {user_id: {value: 1, factor: 100}} # default factor is 1000
	139	+boost_where: {user_id: [{value: 1, factor: 100}, {value: 2, factor: 200}]}
139	140	```
140	141
141	142	[Conversions](#keep-getting-better) are also a great way to boost.
...	...
...	...	@@ -198,17 +198,18 @@ module Searchkick
198	198	boost_where.merge!(options[:personalize])
199	199	end
200	200	boost_where.each do \|field, value\|
201		- if value.is_a?(Hash)
	201	+ if value.is_a?(Array)
	202	+ value.each do \|value_factor\|
	203	+ value, factor = value_factor[:value], value_factor[:factor]
	204	+ custom_filters << custom_filter(field, value, factor)
	205	+ end
	206	+ elsif value.is_a?(Hash)
202	207	value, factor = value[:value], value[:factor]
	208	+ custom_filters << custom_filter(field, value, factor)
203	209	else
204	210	factor = 1000
	211	+ custom_filters << custom_filter(field, value, factor)
205	212	end
206		- custom_filters << {
207		- filter: {
208		- term: {field => value}
209		- },
210		- boost_factor: factor
211		- }
212	213	end
213	214
214	215	boost_by_distance = options[:boost_by_distance]
...	...	@@ -535,5 +536,14 @@ module Searchkick
535	536	end
536	537	end
537	538
	539	+ def custom_filter(field, value, factor)
	540	+ {
	541	+ filter: {
	542	+ term: {field => value}
	543	+ },
	544	+ boost_factor: factor
	545	+ }
	546	+ end
	547	+
538	548	end
539	549	end
...	...
...	...	@@ -96,12 +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"},
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}}
	104	+ assert_order "tomato", ["Tomato C", "Tomato B", "Tomato A"], boost_where: {user_ids: [{value: 1, factor: 10}, {value: 3, factor: 20}]}
105	105	end
106	106
107	107	def test_boost_by_distance
...	...