From b7135f4182d805989e62f57e0d9cb2509b099230 Mon Sep 17 00:00:00 2001
From: Andrew Kane <acekane1@gmail.com>
Date: Mon, 15 Jul 2013 01:47:02 -0700
Subject: [PATCH] Re-added standard filters

---
 lib/searchkick.rb       | 12 ++++++------
 test/searchkick_test.rb |  8 +++++---
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/lib/searchkick.rb b/lib/searchkick.rb
index 19b9079..bc895e2 100644
--- a/lib/searchkick.rb
+++ b/lib/searchkick.rb
@@ -19,20 +19,20 @@ module Searchkick
           },
           searchkick: {
             type: "custom",
-            tokenizer: "whitespace",
+            tokenizer: "standard",
             # synonym should come last, after stemming and shingle
             # shingle must come before snowball
-            filter: ["lowercase", "asciifolding", "stop", "snowball", "searchkick_index_shingle"]
+            filter: ["standard", "lowercase", "asciifolding", "stop", "snowball", "searchkick_index_shingle"]
           },
           searchkick_search: {
             type: "custom",
-            tokenizer: "whitespace",
-            filter: ["lowercase", "asciifolding", "stop", "snowball", "searchkick_search_shingle"]
+            tokenizer: "standard",
+            filter: ["standard", "lowercase", "asciifolding", "stop", "snowball", "searchkick_search_shingle"]
           },
           searchkick_search2: {
             type: "custom",
-            tokenizer: "whitespace",
-            filter: ["lowercase", "asciifolding", "stop", "snowball"] #, "searchkick_search_shingle"]
+            tokenizer: "standard",
+            filter: ["standard", "lowercase", "asciifolding", "stop", "snowball"] #, "searchkick_search_shingle"]
           }
         },
         filter: {
diff --git a/test/searchkick_test.rb b/test/searchkick_test.rb
index e54e181..4296aaf 100644
--- a/test/searchkick_test.rb
+++ b/test/searchkick_test.rb
@@ -10,7 +10,8 @@ class TestSearchkick < Minitest::Unit::TestCase
       "saranwrap => plastic wrap",
       "scallion => green onion",
       "qtip => cotton swab",
-      "burger => hamburger"
+      "burger => hamburger",
+      "bandaid => bandag"
     ]
     index_options = {
       settings: Searchkick.settings(synonyms: synonyms).merge(number_of_shards: 1),
@@ -63,7 +64,7 @@ class TestSearchkick < Minitest::Unit::TestCase
   end
 
   def test_percent
-    store_names ["1% Milk", "2% Milk", "1 Gallon Whole Milk"]
+    store_names ["1% Milk", "2% Milk", "Whole Milk"]
     assert_search "1%", ["1% Milk"]
   end
 
@@ -147,10 +148,11 @@ class TestSearchkick < Minitest::Unit::TestCase
   # keywords
 
   def test_keywords
-    store_names ["Clorox Bleach", "Kroger Bleach", "Saran Wrap", "Kroger Plastic Wrap", "Hamburger Buns"]
+    store_names ["Clorox Bleach", "Kroger Bleach", "Saran Wrap", "Kroger Plastic Wrap", "Hamburger Buns", "Band-Aid", "Kroger 12-Pack Bandages"]
     assert_search "clorox", ["Clorox Bleach", "Kroger Bleach"]
     assert_search "saran wrap", ["Saran Wrap", "Kroger Plastic Wrap"]
     assert_search "burger buns", ["Hamburger Buns"]
+    assert_search "bandaids", ["Band-Aid", "Kroger 12-Pack Bandages"]
   end
 
   def test_keywords_qtips
--
libgit2 0.21.0