github / searchkick

Download as
Browse Code ยป

Commit db0816c0a8c477efcc72658435a38db8b7f17b00

Authored by Andrew
1 parent 783671d7
Exists in master and in 18 other branches allow_missing, conversions_period, conversions_v2, eager_load, find_in_batches, 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

Fixed highlighting for ES5

Showing 2 changed files with 6 additions and 2 deletions   Show diff stats
lib/searchkick/query.rb
  Diff comments   View file @db0816c
... ... @@ -659,7 +659,7 @@ module Searchkick
659 659 def set_highlights(payload, fields)
660 660 payload[:highlight] = {
661 661 fields: Hash[fields.map { |f| [f, {}] }],
662   - fragment_size: 0
  662 + fragment_size: below60? ? 30000 : 0
663 663 }
664 664  
665 665 if options[:highlight].is_a?(Hash)
... ... @@ -960,6 +960,10 @@ module Searchkick
960 960 end
961 961 end
962 962  
  963 + def below60?
  964 + Searchkick.server_below?("6.0.0-alpha1")
  965 + end
  966 +
963 967 def below61?
964 968 Searchkick.server_below?("6.1.0-alpha1")
965 969 end
... ...
test/highlight_test.rb
  Diff comments   View file @db0816c
... ... @@ -17,7 +17,7 @@ class HighlightTest < Minitest::Test
17 17 end
18 18  
19 19 def test_very_long
20   - store_names ["Two Door Cinema Club " * 100]
  20 + store_names [("Two Door Cinema Club " * 100).strip]
21 21 assert_equal ("Two Door <em>Cinema</em> Club " * 100).strip, Product.search("cinema", highlight: true).highlights.first[:name]
22 22 end
23 23  
... ...