Commit b7135f4182d805989e62f57e0d9cb2509b099230

Authored by Andrew Kane
1 parent cddcbcb7

Re-added standard filters

Showing 2 changed files with 11 additions and 9 deletions   Show diff stats
lib/searchkick.rb
... ... @@ -19,20 +19,20 @@ module Searchkick
19 19 },
20 20 searchkick: {
21 21 type: "custom",
22   - tokenizer: "whitespace",
  22 + tokenizer: "standard",
23 23 # synonym should come last, after stemming and shingle
24 24 # shingle must come before snowball
25   - filter: ["lowercase", "asciifolding", "stop", "snowball", "searchkick_index_shingle"]
  25 + filter: ["standard", "lowercase", "asciifolding", "stop", "snowball", "searchkick_index_shingle"]
26 26 },
27 27 searchkick_search: {
28 28 type: "custom",
29   - tokenizer: "whitespace",
30   - filter: ["lowercase", "asciifolding", "stop", "snowball", "searchkick_search_shingle"]
  29 + tokenizer: "standard",
  30 + filter: ["standard", "lowercase", "asciifolding", "stop", "snowball", "searchkick_search_shingle"]
31 31 },
32 32 searchkick_search2: {
33 33 type: "custom",
34   - tokenizer: "whitespace",
35   - filter: ["lowercase", "asciifolding", "stop", "snowball"] #, "searchkick_search_shingle"]
  34 + tokenizer: "standard",
  35 + filter: ["standard", "lowercase", "asciifolding", "stop", "snowball"] #, "searchkick_search_shingle"]
36 36 }
37 37 },
38 38 filter: {
... ...
test/searchkick_test.rb
... ... @@ -10,7 +10,8 @@ class TestSearchkick < Minitest::Unit::TestCase
10 10 "saranwrap => plastic wrap",
11 11 "scallion => green onion",
12 12 "qtip => cotton swab",
13   - "burger => hamburger"
  13 + "burger => hamburger",
  14 + "bandaid => bandag"
14 15 ]
15 16 index_options = {
16 17 settings: Searchkick.settings(synonyms: synonyms).merge(number_of_shards: 1),
... ... @@ -63,7 +64,7 @@ class TestSearchkick < Minitest::Unit::TestCase
63 64 end
64 65  
65 66 def test_percent
66   - store_names ["1% Milk", "2% Milk", "1 Gallon Whole Milk"]
  67 + store_names ["1% Milk", "2% Milk", "Whole Milk"]
67 68 assert_search "1%", ["1% Milk"]
68 69 end
69 70  
... ... @@ -147,10 +148,11 @@ class TestSearchkick < Minitest::Unit::TestCase
147 148 # keywords
148 149  
149 150 def test_keywords
150   - store_names ["Clorox Bleach", "Kroger Bleach", "Saran Wrap", "Kroger Plastic Wrap", "Hamburger Buns"]
  151 + store_names ["Clorox Bleach", "Kroger Bleach", "Saran Wrap", "Kroger Plastic Wrap", "Hamburger Buns", "Band-Aid", "Kroger 12-Pack Bandages"]
151 152 assert_search "clorox", ["Clorox Bleach", "Kroger Bleach"]
152 153 assert_search "saran wrap", ["Saran Wrap", "Kroger Plastic Wrap"]
153 154 assert_search "burger buns", ["Hamburger Buns"]
  155 + assert_search "bandaids", ["Band-Aid", "Kroger 12-Pack Bandages"]
154 156 end
155 157  
156 158 def test_keywords_qtips
... ...