searchkick 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b15fd3f6aa1493ee75fee109a3420fb8e79bed7
-  data.tar.gz: c8cf011a7e5fb72bb25fe131eaa655be2713def7
+  metadata.gz: c7af3f444676ffd5380a5fec201895f7f1ddbcbe
+  data.tar.gz: 07b653656f8914410a6bda9c1f0f3d1485d54465
 SHA512:
-  metadata.gz: b7c45c3c3627c02a45c7cc4380d59404d334fb2a0e1e4a327b472cb14dcac12df59843f5bf146185c76998409fcadb850393b0c92e89e0f6a20972445fbe1735
-  data.tar.gz: 616ca8f2a7776ca7f830cb2679bdbd7769460061107ed833f607896cfa2d637927011a40c958e026f0717de9471dd64f2bad157fbb55b79d93019132a7f8a605
+  metadata.gz: acde708f7c77cddf74af3b647e37f97014a16ab958b7e03b11e9774abfa02ab57c518c6f0d2647d39434f4f8ed3c3203e9a536a4ac2b2d0c961f80201cb8121c
+  data.tar.gz: 95ee8bd70933e4d04b0f04e96be972ed2075a065961b86da6f4164fe84ba013c2724c0801911299914b4554a405a5dc2f5751ba2843f0e80fed45b30055203c6

data/README.md

@@ -167,14 +167,11 @@ Control what data is indexed with the `search_data` method. Call `Product.reinde
 ```ruby
 class Product < ActiveRecord::Base
   def search_data
-    as_json only: [:name, :active], include: {brand: {only: [:city]}}
+    as_json only: [:name, :active]
     # or equivalently
     {
       name: name,
-      active: active,
-      brand: {
-        city: brand.city
-      }
+      active: active
     }
   end
 end
@@ -201,9 +198,9 @@ class Search < ActiveRecord::Base
 end
 ```
 
-Add conversions to the index.
+You do **not** need to clean up the search queries.  Searchkick automatically treats `apple` and `APPLES` the same.
 
-**Note**: You must specify the conversions field as of version `0.2.0`.
+Next, add conversions to the index.  You must specify the conversions field as of version `0.2.0`.
 
 ```ruby
 class Product < ActiveRecord::Base
@@ -329,6 +326,8 @@ heroku run rake searchkick:reindex CLASS=Product
 
 ## Reference
 
+Searchkick requires Elasticsearch `0.90.0` or higher.
+
 Reindex one record
 
 ```ruby
@@ -336,6 +335,12 @@ product = Product.find 10
 product.reindex
 ```
 
+Remove old indices
+
+```ruby
+Product.clean_indices
+```
+
 Use a different index name
 
 ```ruby

data/lib/searchkick/reindex.rb

@@ -17,28 +17,32 @@ module Searchkick
       end
 
       if a = Tire::Alias.find(alias_name)
-        old_indices = a.indices.dup
-        old_indices.each do |index|
+        a.indices.each do |index|
           a.indices.delete index
         end
 
         a.indices.add new_index
         response = a.save
 
-        if response.success?
-          old_indices.each do |index|
-            i = Tire::Index.new(index)
-            i.delete
-          end
-        end
+        clean_indices if response.success?
       else
-        tire.index.delete
+        tire.index.delete if tire.index.exists?
         response = Tire::Alias.create(name: alias_name, indices: [new_index])
       end
 
       response.success? || (raise response.to_s)
     end
 
+    # remove old indices that start w/ index_name
+    def clean_indices
+      all_indices = JSON.parse(Tire::Configuration.client.get("#{Tire::Configuration.url}/_aliases").body)
+      indices = all_indices.select{|k, v| v["aliases"].empty? && k =~ /\A#{Regexp.escape(index_name)}_\d{14}\z/ }.keys
+      indices.each do |index|
+        Tire::Index.new(index).delete
+      end
+      indices
+    end
+
     private
 
     def searchkick_index_options

data/lib/searchkick/search.rb

@@ -52,10 +52,10 @@ module Searchkick
                           match fields, term, use_dis_max: false, boost: 10, operator: operator, analyzer: "searchkick_search2"
                         end
                         query do
-                          match fields, term, use_dis_max: false, fuzziness: 1, max_expansions: 1, operator: operator, analyzer: "searchkick_search"
+                          match fields, term, use_dis_max: false, fuzziness: 1, max_expansions: 3, operator: operator, analyzer: "searchkick_search"
                         end
                         query do
-                          match fields, term, use_dis_max: false, fuzziness: 1, max_expansions: 1, operator: operator, analyzer: "searchkick_search2"
+                          match fields, term, use_dis_max: false, fuzziness: 1, max_expansions: 3, operator: operator, analyzer: "searchkick_search2"
                         end
                       end
                     end

data/lib/searchkick/version.rb

@@ -1,3 +1,3 @@
 module Searchkick
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/test/index_test.rb

@@ -0,0 +1,20 @@
+require_relative "test_helper"
+
+class TestIndex < Minitest::Unit::TestCase
+
+  def test_clean_indices
+    old_index = Tire::Index.new("products_development_20130801000000")
+    different_index = Tire::Index.new("items_development_20130801000000")
+
+    # create indexes
+    old_index.create
+    different_index.create
+
+    Product.clean_indices
+
+    assert Product.index.exists?
+    assert different_index.exists?
+    assert !old_index.exists?
+  end
+
+end

data/test/match_test.rb

@@ -60,6 +60,11 @@ class TestMatch < Minitest::Unit::TestCase
     assert_search "siracha", ["Sriracha"]
   end
 
+  def test_misspelling_multiple
+    store_names ["Greek Yogurt", "Green Onions"]
+    assert_search "greed", ["Greek Yogurt", "Green Onions"]
+  end
+
   def test_short_word
     store_names ["Finn"]
     assert_search "fin", ["Finn"]

data/test/test_helper.rb

@@ -63,7 +63,10 @@ end
 class Store < ActiveRecord::Base
 end
 
+Product.index.delete if Product.index.exists?
 Product.reindex
+sleep 1
+Product.reindex # run twice for both index paths
 
 class MiniTest::Unit::TestCase
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: searchkick
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-11 00:00:00.000000000 Z
+date: 2013-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tire
@@ -131,6 +131,7 @@ files:
 - searchkick.gemspec
 - test/boost_test.rb
 - test/facets_test.rb
+- test/index_test.rb
 - test/match_test.rb
 - test/sql_test.rb
 - test/suggest_test.rb
@@ -163,6 +164,7 @@ summary: Search made easy
 test_files:
 - test/boost_test.rb
 - test/facets_test.rb
+- test/index_test.rb
 - test/match_test.rb
 - test/sql_test.rb
 - test/suggest_test.rb