github / searchkick

Download as
Browse Code ยป

Commit b7410431dc9ad062e13df184c2643320eb8e8c9e

Authored by Andrew Kane
1 parent 0339d7cf
Exists in master and in 19 other branches allow_missing, conversions_period, conversions_v2, eager_load, find_in_batches, highlighted, index_name, lazy_index_name, less_deps, nested, reindex_refactor, relation, relation_search, routing_queue, scope_attributes, search_as_you_type, synonyms_ci, test_language, wildcard

Improved syntax for boost_by_distance

Showing 3 changed files with 36 additions and 9 deletions   Show diff stats
CHANGELOG.md
  Diff comments   View file @b741043
... ... @@ -3,6 +3,7 @@
3 3 - Added `retain` option to `reindex`
4 4 - Added support for attributes in highlight tags
5 5 - Fixed potentially silent errors in reindex job
  6 +- Improved format for `boost_by_distance`
6 7  
7 8 ## 2.0.1
8 9  
... ...
lib/searchkick/query.rb
  Diff comments   View file @b741043
... ... @@ -459,17 +459,25 @@ module Searchkick
459 459  
460 460 def set_boost_by_distance(custom_filters)
461 461 boost_by_distance = options[:boost_by_distance] || {}
462   - boost_by_distance = {function: :gauss, scale: "5mi"}.merge(boost_by_distance)
463   - if !boost_by_distance[:field] || !boost_by_distance[:origin]
464   - raise ArgumentError, "boost_by_distance requires :field and :origin"
  462 +
  463 + # legacy format
  464 + if boost_by_distance[:field]
  465 + boost_by_distance = {boost_by_distance[:field] => boost_by_distance.except(:field)}
465 466 end
466   - function_params = boost_by_distance.select { |k, _| [:origin, :scale, :offset, :decay].include?(k) }
467   - function_params[:origin] = location_value(function_params[:origin])
468   - custom_filters << {
469   - boost_by_distance[:function] => {
470   - boost_by_distance[:field] => function_params
  467 +
  468 + boost_by_distance.each do |field, attributes|
  469 + attributes = {function: :gauss, scale: "5mi"}.merge(attributes)
  470 + unless attributes[:origin]
  471 + raise ArgumentError, "boost_by_distance requires :origin"
  472 + end
  473 + function_params = attributes.select { |k, _| [:origin, :scale, :offset, :decay].include?(k) }
  474 + function_params[:origin] = location_value(function_params[:origin])
  475 + custom_filters << {
  476 + attributes[:function] => {
  477 + field => function_params
  478 + }
471 479 }
472   - }
  480 + end
473 481 end
474 482  
475 483 def set_boost_by(multiply_filters, custom_filters)
... ...
test/boost_test.rb
  Diff comments   View file @b741043
... ... @@ -138,6 +138,24 @@ class BoostTest &lt; Minitest::Test
138 138 assert_order "san", ["San Francisco", "San Antonio", "San Marino"], boost_by_distance: {field: :location, origin: {lat: 37, lon: -122}, scale: "1000mi"}
139 139 end
140 140  
  141 + def test_boost_by_distance_v2
  142 + store [
  143 + {name: "San Francisco", latitude: 37.7833, longitude: -122.4167},
  144 + {name: "San Antonio", latitude: 29.4167, longitude: -98.5000},
  145 + {name: "San Marino", latitude: 43.9333, longitude: 12.4667}
  146 + ]
  147 + assert_order "san", ["San Francisco", "San Antonio", "San Marino"], boost_by_distance: {location: {origin: [37, -122], scale: "1000mi"}}
  148 + end
  149 +
  150 + def test_boost_by_distance_v2_hash
  151 + store [
  152 + {name: "San Francisco", latitude: 37.7833, longitude: -122.4167},
  153 + {name: "San Antonio", latitude: 29.4167, longitude: -98.5000},
  154 + {name: "San Marino", latitude: 43.9333, longitude: 12.4667}
  155 + ]
  156 + assert_order "san", ["San Francisco", "San Antonio", "San Marino"], boost_by_distance: {location: {origin: {lat: 37, lon: -122}, scale: "1000mi"}}
  157 + end
  158 +
141 159 def test_boost_by_indices
142 160 store_names ["Rex"], Animal
143 161 store_names ["Rexx"], Product
... ...