github / searchkick

Download as
Browse Code ยป

Commit c8e6b60b07226b496a979d5c74e3e538ab9d8727

Authored by Andrew Kane
1 parent c41e6c2f
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

Added exact matches

Showing 6 changed files with 24 additions and 3 deletions   Show diff stats
1 ## 0.7.9 [unreleased] 1 ## 0.7.9 [unreleased]
2 2
3 - Added `tokens` method 3 - Added `tokens` method
  4 +- Added exact matches
4 5
5 ## 0.7.8 6 ## 0.7.8
6 7
@@ -204,6 +204,7 @@ Available options are: @@ -204,6 +204,7 @@ Available options are:
204 :text_start 204 :text_start
205 :text_middle 205 :text_middle
206 :text_end 206 :text_end
  207 +:exact # [master]
207 ``` 208 ```
208 209
209 To boost fields, use: 210 To boost fields, use:
lib/searchkick/query.rb
  Diff comments   View file @c8e6b60
@@ -100,7 +100,15 @@ module Searchkick @@ -100,7 +100,15 @@ module Searchkick
100 ] 100 ]
101 end 101 end
102 else 102 else
103 - analyzer = field.match(/\.word_(start|middle|end)\z/) ? "searchkick_word_search" : "searchkick_autocomplete_search" 103 + analyzer =
  104 + case field
  105 + when /\.word_(start|middle|end)\z/
  106 + "searchkick_word_search"
  107 + when /\.text_(start|middle|end)\z/
  108 + "searchkick_autocomplete_search"
  109 + else
  110 + "keyword"
  111 + end
104 queries << {multi_match: shared_options.merge(analyzer: analyzer)} 112 queries << {multi_match: shared_options.merge(analyzer: analyzer)}
105 end 113 end
106 end 114 end
lib/searchkick/reindex.rb
  Diff comments   View file @c8e6b60
@@ -156,6 +156,9 @@ module Searchkick @@ -156,6 +156,9 @@ module Searchkick
156 type: "custom", 156 type: "custom",
157 tokenizer: "standard", 157 tokenizer: "standard",
158 filter: ["lowercase", "asciifolding", "reverse", "searchkick_edge_ngram", "reverse"] 158 filter: ["lowercase", "asciifolding", "reverse", "searchkick_edge_ngram", "reverse"]
  159 + },
  160 + searchkick_exact_index: {
  161 + type: "keyword"
159 } 162 }
160 }, 163 },
161 filter: { 164 filter: {
@@ -245,7 +248,7 @@ module Searchkick @@ -245,7 +248,7 @@ module Searchkick
245 end 248 end
246 249
247 mapping_options = Hash[ 250 mapping_options = Hash[
248 - [:autocomplete, :suggest, :text_start, :text_middle, :text_end, :word_start, :word_middle, :word_end] 251 + [:autocomplete, :suggest, :text_start, :text_middle, :text_end, :word_start, :word_middle, :word_end, :exact]
249 .map{|type| [type, (options[type] || []).map(&:to_s)] } 252 .map{|type| [type, (options[type] || []).map(&:to_s)] }
250 ] 253 ]
251 254
test/autocomplete_test.rb
  Diff comments   View file @c8e6b60
@@ -57,4 +57,11 @@ class TestAutocomplete &lt; Minitest::Unit::TestCase @@ -57,4 +57,11 @@ class TestAutocomplete &lt; Minitest::Unit::TestCase
57 assert_search "dark grey", ["Dark Grey"], fields: [{name: :word_start}] 57 assert_search "dark grey", ["Dark Grey"], fields: [{name: :word_start}]
58 end 58 end
59 59
  60 + # TODO find a better place
  61 +
  62 + def test_exact
  63 + store_names ["hi@example.org"]
  64 + assert_search "hi@example.org", ["hi@example.org"], fields: [{name: :exact}]
  65 + end
  66 +
60 end 67 end
test/test_helper.rb
  Diff comments   View file @c8e6b60
@@ -119,7 +119,8 @@ class Product @@ -119,7 +119,8 @@ class Product
119 text_end: [:name], 119 text_end: [:name],
120 word_start: [:name], 120 word_start: [:name],
121 word_middle: [:name], 121 word_middle: [:name],
122 - word_end: [:name] 122 + word_end: [:name],
  123 + exact: [:name]
123 124
124 attr_accessor :conversions, :user_ids 125 attr_accessor :conversions, :user_ids
125 126