searchkick 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 08d3471564b063d98692fa8db6e27635b826d9eb
-  data.tar.gz: 23ff81861bf090b967eacce86c31b99f18370738
+  metadata.gz: 1da092cc431fe04831d998435718459f8bebf261
+  data.tar.gz: 21a86486b94f81e6b9b9061fb6cf051ac7672650
 SHA512:
-  metadata.gz: 0e3fb6959b85a1d63908e7fe7c6086eb817ee597132f701205fa0942f7982e43a6eecdb6b1924e2c7e7d4f1650071df95a2281b1b548e8099a3e2eeffbd1c475
-  data.tar.gz: 1c774316a7f8833239e27c4e15578c537729ce37c6c9cb54b7202f71b4ee44978d2dda2bad4d330b7e34acfbc643a002fdc92a436af79cfb41e0147d6bda9322
+  metadata.gz: 2b8bbdb5158b5c39994277ab80e46a14b222b5dd24a22204dcc3acb8d3b853b50b692e77a1b634774e5611ca930b1e495428200e9ddcd726254af7db3820a251
+  data.tar.gz: 3661b1fbb97fd864e524745b2f7435486aeb4cec005381e01a7c37ed6683b38e55b5a5921d60635d46d1700012d18b7662abb99545ee655c635882b9b5b322d4

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.3.1
+
+- Added index_prefix option
+- Fixed ES issue with incorrect facet counts
+- Added option to turn off special characters
+
 ## 0.3.0
 
 - Fixed reversed coordinates

data/README.md

@@ -444,6 +444,14 @@ class Product < ActiveRecord::Base
 end
 ```
 
+Prefix the index name
+
+```ruby
+class Product < ActiveRecord::Base
+  searchkick index_prefix: "datakick"
+end
+```
+
 Turn off callbacks
 
 ```ruby
@@ -464,6 +472,15 @@ Do not load models
 Product.search "milk", load: false
 ```
 
+Turn off special characters
+
+```ruby
+class Product < ActiveRecord::Base
+  # A will not match Ä
+  searchkick special_characters: false
+end
+```
+
 Reindex all models (Rails only)
 
 ```sh

data/lib/searchkick/model.rb

@@ -13,7 +13,7 @@ module Searchkick
         include Tire::Model::Search
         include Tire::Model::Callbacks unless options[:callbacks] == false
         tire do
-          index_name options[:index_name] || [klass.model_name.plural, searchkick_env].join("_")
+          index_name options[:index_name] || [options[:index_prefix], klass.model_name.plural, searchkick_env].compact.join("_")
         end
 
         def reindex

data/lib/searchkick/reindex.rb

@@ -174,6 +174,12 @@ module Searchkick
         settings[:analysis][:analyzer][:default_index][:filter] << "searchkick_synonym"
       end
 
+      if options[:special_characters] == false
+        settings[:analysis][:analyzer].each do |analyzer, analyzer_settings|
+          analyzer_settings[:filter].reject!{|f| f == "asciifolding" }
+        end
+      end
+
       mapping = {}
 
       # conversions

data/lib/searchkick/search.rb

@@ -234,6 +234,7 @@ module Searchkick
       end
 
       # facets
+      facet_limits = {}
       if options[:facets]
         facets = options[:facets] || {}
         if facets.is_a?(Array) # convert to more advanced syntax
@@ -242,12 +243,15 @@ module Searchkick
 
         payload[:facets] = {}
         facets.each do |field, facet_options|
+          # ask for extra facets due to
+          # https://github.com/elasticsearch/elasticsearch/issues/1305
           payload[:facets][field] = {
             terms: {
               field: field,
-              size: facet_options[:limit] || 100000
+              size: facet_options[:limit] ? facet_options[:limit] + 150 : 100000
             }
           }
+          facet_limits[field] = facet_options[:limit] if facet_options[:limit]
 
           # offset is not possible
           # http://elasticsearch-users.115913.n3.nabble.com/Is-pagination-possible-in-termsStatsFacet-td3422943.html
@@ -285,7 +289,18 @@ module Searchkick
       payload[:fields] = [] if load
 
       search = Tire::Search::Search.new(index_name, load: load, payload: payload, size: per_page, from: offset)
-      Searchkick::Results.new(search.json, search.options.merge(term: term))
+      response = search.json
+
+      # apply facet limit in client due to
+      # https://github.com/elasticsearch/elasticsearch/issues/1305
+      facet_limits.each do |field, limit|
+        field = field.to_s
+        facet = response["facets"][field]
+        response["facets"][field]["terms"] = facet["terms"].first(limit)
+        response["facets"][field]["other"] = facet["total"] - facet["terms"].sum{|term| term["count"] }
+      end
+
+      Searchkick::Results.new(response, search.options.merge(term: term))
     end
 
   end

data/lib/searchkick/version.rb

@@ -1,3 +1,3 @@
 module Searchkick
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/test/facets_test.rb

@@ -20,7 +20,10 @@ class TestFacets < Minitest::Unit::TestCase
   end
 
   def test_limit
-    assert_equal 1, Product.search("Product", facets: {store_id: {limit: 1}}).facets["store_id"]["terms"].size
+    facet = Product.search("Product", facets: {store_id: {limit: 1}}).facets["store_id"]
+    assert_equal 1, facet["terms"].size
+    assert_equal 3, facet["total"]
+    assert_equal 1, facet["other"]
   end
 
 end

data/test/match_test.rb

@@ -48,6 +48,11 @@ class TestMatch < Minitest::Unit::TestCase
     assert_search "jalapeno", ["Jalapeño"]
   end
 
+  def test_swedish
+    store_names ["ÅÄÖ"]
+    assert_search "aao", ["ÅÄÖ"]
+  end
+
   # stemming
 
   def test_stemming

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: searchkick
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Andrew Kane