Added exact matches

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