github / searchkick

Download as
Browse Code ยป

Commit 5d1141a6901a088d233d306520f451128ec67385

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

Code style fixes

Showing 4 changed files with 7 additions and 8 deletions   Show diff stats
lib/searchkick/logging.rb
  Diff comments   View file @5d1141a
... ... @@ -24,7 +24,6 @@ module Searchkick
24 24 end
25 25 end
26 26  
27   -
28 27 def remove(record)
29 28 event = {
30 29 name: "#{record.searchkick_klass.name} Remove",
... ...
lib/searchkick/query.rb
  Diff comments   View file @5d1141a
... ... @@ -71,11 +71,11 @@ module Searchkick
71 71 if status_code == 404
72 72 raise MissingIndexError, "Index missing - run #{reindex_command}"
73 73 elsif status_code == 500 && (
74   - e.message.include?("IllegalArgumentException[minimumSimilarity >= 1]") ||
75   - e.message.include?("No query registered for [multi_match]") ||
76   - e.message.include?("[match] query does not support [cutoff_frequency]]") ||
77   - e.message.include?("No query registered for [function_score]]")
78   - )
  74 + e.message.include?("IllegalArgumentException[minimumSimilarity >= 1]") ||
  75 + e.message.include?("No query registered for [multi_match]") ||
  76 + e.message.include?("[match] query does not support [cutoff_frequency]]") ||
  77 + e.message.include?("No query registered for [function_score]]")
  78 + )
79 79  
80 80 raise UnsupportedVersionError, "This version of Searchkick requires Elasticsearch 1.0 or greater"
81 81 elsif status_code == 400
... ...
lib/searchkick/results.rb
  Diff comments   View file @5d1141a
... ... @@ -47,7 +47,7 @@ module Searchkick
47 47  
48 48 if hit["highlight"]
49 49 highlight = Hash[hit["highlight"].map { |k, v| [base_field(k), v.first] }]
50   - options[:highlighted_fields].map{ |k| base_field(k) }.each do |k|
  50 + options[:highlighted_fields].map { |k| base_field(k) }.each do |k|
51 51 result["highlighted_#{k}"] ||= (highlight[k] || result[k])
52 52 end
53 53 end
... ...
test/aggs_test.rb
  Diff comments   View file @5d1141a
... ... @@ -21,7 +21,7 @@ class AggsTest < Minitest::Test
21 21  
22 22 def test_order
23 23 agg = Product.search("Product", aggs: {color: {order: {"_term" => "desc"}}}).aggs["color"]
24   - assert_equal %w[red green blue], agg["buckets"].map { |b| b["key"] }
  24 + assert_equal %w(red green blue), agg["buckets"].map { |b| b["key"] }
25 25 end
26 26  
27 27 def test_field
... ...