searchkick 0.8.7 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5df7a84637481daab3ecd7dc97ff013ff1845e9c
-  data.tar.gz: ab0dd0e7603936240bcd3c9a24bd7b3b031f8516
+  metadata.gz: 086a7f84d9047b486d127d05cc3d20b7b6d66b04
+  data.tar.gz: f0896d8115143f72cf088f69f82c923c6e4f67cf
 SHA512:
-  metadata.gz: cf49fbcdae22e3c416191fc04efaf2cb9ce48723d7be55a9e1862e3e6b1241c446057d64e0230a08c5a622fb85b8e2fe6454a707d9dca5ef4606b700e4597334
-  data.tar.gz: 410648692e8aeffa3559f1f5244860d7be1305c1497e19e4b9584feca17b3f9747a463bc236207d743a6a200a975ba701d4f4dfbb7a89a1e3d3b0fc3e646d81d
+  metadata.gz: f084aa390d924d64c610ea86845433bb521b8ad319e50350936f56d57f3db770e01e87c34c55d38f88b58599b03d6176a8af6e4fee8793fc5f1b8fb01cfeea6e
+  data.tar.gz: e26a6809754329de5cf67a473f3df2d5b8b19b1981bdb22c041421b4916a1efcf5d4f78501cd9656ba297ccdcb0e3fe1742d0d57ffee1e0bf8475104045367fb

data/CHANGELOG.md

@@ -1,6 +1,13 @@
+## 0.9.0
+
+- Much better performance for where queries if no facets
+- Added basic support for regex
+- Added support for routing
+- Made `Searchkick.disable_callbacks` thread-safe
+
 ## 0.8.7
 
-- Fixed MongoDB import
+- Fixed Mongoid import
 
 ## 0.8.6
 

data/Gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in searchkick.gemspec
 gemspec

data/README.md

@@ -23,9 +23,9 @@ Plus:
 
 :speech_balloon: Get [handcrafted updates](http://chartkick.us7.list-manage.com/subscribe?u=952c861f99eb43084e0a49f98&id=6ea6541e8e&group[0][4]=true) for new features
 
-:tangerine: Battle-tested at [Instacart](https://www.instacart.com)
+:tangerine: Battle-tested at [Instacart](https://www.instacart.com/opensource)
 
-[![Build Status](https://travis-ci.org/ankane/searchkick.png?branch=master)](https://travis-ci.org/ankane/searchkick)
+[![Build Status](https://travis-ci.org/ankane/searchkick.svg?branch=master)](https://travis-ci.org/ankane/searchkick)
 
 We highly recommend tracking queries and conversions
 
@@ -606,7 +606,7 @@ Find similar items.
 
 ```ruby
 product = Product.first
-product.similar(fields: ["name"])
+product.similar(fields: ["name"], where: {size: "12 oz"})
 ```
 
 ### Geospatial Searches
@@ -647,6 +647,22 @@ Also supports [additional options](http://www.elasticsearch.org/guide/en/elastic
 City.search "san", boost_by_distance: {field: :location, origin: [37, -122], function: :linear, scale: "30mi", decay: 0.5}
 ```
 
+### Routing
+
+Searchkick supports [Elasticsearch’s routing feature](https://www.elastic.co/blog/customizing-your-document-routing).
+
+```ruby
+class Contact < ActiveRecord::Base
+  searchkick routing: :user_id
+end
+```
+
+Reindex and search with:
+
+```ruby
+Contact.search "John", routing: current_user.id
+```
+
 ## Inheritance
 
 Searchkick supports single table inheritance.
@@ -849,6 +865,25 @@ product.reindex
 product.reindex_async
 ```
 
+Reindex more than one record without recreating the index
+
+```ruby
+# do this ...
+some_company.products.each { |p| p.reindex }
+# or this ...
+Product.searchkick_index.import(some_company.products)
+# don't do the following as it will recreate the index with some_company's products only
+some_company.products.reindex
+```
+
+Reindex large set of records in batches
+
+```ruby
+Product.where("id > 100000").find_in_batches do |batch|
+  Product.searchkick_index.import(batch)
+end
+```
+
 Remove old indices
 
 ```ruby
@@ -955,6 +990,34 @@ Reindex all models - Rails only
 rake searchkick:reindex:all
 ```
 
+## Large Data Sets
+
+For large data sets, check out [Keeping Elasticsearch in Sync](https://www.found.no/foundation/keeping-elasticsearch-in-sync/).  Searchkick will make this easy in the future.
+
+## Testing
+
+This section could use some love.
+
+### RSpec
+
+```ruby
+describe Product do
+  it "searches" do
+    Product.reindex
+    Product.searchkick_index.refresh # don't forget this
+    # test goes here...
+  end
+end
+```
+
+### Factory Girl
+
+```ruby
+product = FactoryGirl.create(:product)
+product.reindex # don't forget this
+Product.searchkick_index.refresh # or this
+```
+
 ## Migrating from Tire
 
 1. Change `search` methods to `tire.search` and add index name in existing search calls
@@ -1019,11 +1082,12 @@ Thanks to Karel Minarik for [Elasticsearch Ruby](https://github.com/elasticsearc
 
 ## Roadmap
 
+- More features for large data sets
+- Improve section on testing
 - Semantic search features
 - Search multiple fields for different terms
 - Search across models
 - Search nested objects
-- Add section on testing
 - Much finer customization
 
 ## Contributing

data/Rakefile

@@ -1,7 +1,7 @@
 require "bundler/gem_tasks"
 require "rake/testtask"
 
-task :default => :test
+task default: :test
 Rake::TestTask.new do |t|
   t.libs << "test"
   t.pattern = "test/**/*_test.rb"

data/gemfiles/nobrainer.gemfile

@@ -3,4 +3,4 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in searchkick.gemspec
 gemspec path: "../"
 
-gem "nobrainer", ">= 0.19.0"
+gem "nobrainer", "0.22.0"

data/lib/searchkick/index.rb

@@ -34,7 +34,7 @@ module Searchkick
         rescue Elasticsearch::Transport::Transport::Errors::NotFound
           []
         end
-      actions = old_indices.map{|old_name| {remove: {index: old_name, alias: name}} } + [{add: {index: new_name, alias: name}}]
+      actions = old_indices.map { |old_name| {remove: {index: old_name, alias: name}} } + [{add: {index: new_name, alias: name}}]
       client.indices.update_aliases body: {actions: actions}
     end
 
@@ -50,19 +50,22 @@ module Searchkick
     end
 
     def remove(record)
-      client.delete(
-        index: name,
-        type: document_type(record),
-        id: search_id(record)
-      )
+      id = search_id(record)
+      unless id.blank?
+        client.delete(
+          index: name,
+          type: document_type(record),
+          id: id
+        )
+      end
     end
 
     def import(records)
-      records.group_by{|r| document_type(r) }.each do |type, batch|
+      records.group_by { |r| document_type(r) }.each do |type, batch|
         client.bulk(
           index: name,
           type: type,
-          body: batch.map{|r| {index: {_id: search_id(r), data: search_data(r)}} }
+          body: batch.map { |r| {index: {_id: search_id(r), data: search_data(r)}} }
         )
       end
     end
@@ -71,12 +74,12 @@ module Searchkick
       client.get(
         index: name,
         type: document_type(record),
-        id: record.id
+        id: search_id(record)
       )["_source"]
     end
 
     def reindex_record(record)
-      if record.destroyed? or !record.should_index?
+      if record.destroyed? || !record.should_index?
         begin
           remove(record)
         rescue Elasticsearch::Transport::Transport::Errors::NotFound
@@ -89,7 +92,7 @@ module Searchkick
 
     def reindex_record_async(record)
       if defined?(Searchkick::ReindexV2Job)
-          Searchkick::ReindexV2Job.perform_later(record.class.name, record.id.to_s)
+        Searchkick::ReindexV2Job.perform_later(record.class.name, record.id.to_s)
       else
         Delayed::Job.enqueue Searchkick::ReindexJob.new(record.class.name, record.id.to_s)
       end
@@ -97,7 +100,7 @@ module Searchkick
 
     def similar_record(record, options = {})
       like_text = retrieve(record).to_hash
-        .keep_if{|k,v| !options[:fields] || options[:fields].map(&:to_s).include?(k) }
+        .keep_if { |k, v| !options[:fields] || options[:fields].map(&:to_s).include?(k) }
         .values.compact.join(" ")
 
       # TODO deep merge method
@@ -136,7 +139,7 @@ module Searchkick
     # remove old indices that start w/ index_name
     def clean_indices
       all_indices = client.indices.get_aliases
-      indices = all_indices.select{|k, v| (v.empty? || v["aliases"].empty?) && k =~ /\A#{Regexp.escape(name)}_\d{14,17}\z/ }.keys
+      indices = all_indices.select { |k, v| (v.empty? || v["aliases"].empty?) && k =~ /\A#{Regexp.escape(name)}_\d{14,17}\z/ }.keys
       indices.each do |index|
         Searchkick::Index.new(index).delete
       end
@@ -180,7 +183,7 @@ module Searchkick
       scope = scope.search_import if scope.respond_to?(:search_import)
       if scope.respond_to?(:find_in_batches)
         scope.find_in_batches batch_size: batch_size do |batch|
-          import batch.select{|item| item.should_index? }
+          import batch.select(&:should_index?)
         end
       else
         # https://github.com/karmi/tire/blob/master/lib/tire/model/import.rb
@@ -200,7 +203,7 @@ module Searchkick
     def index_options
       options = @options
 
-      if options[:mappings] and !options[:merge_mappings]
+      if options[:mappings] && !options[:merge_mappings]
         settings = options[:settings] || {}
         mappings = options[:mappings]
       else
@@ -333,7 +336,7 @@ module Searchkick
         if synonyms.any?
           settings[:analysis][:filter][:searchkick_synonym] = {
             type: "synonym",
-            synonyms: synonyms.select{|s| s.size > 1 }.map{|s| s.join(",") }
+            synonyms: synonyms.select { |s| s.size > 1 }.map { |s| s.join(",") }
           }
           # choosing a place for the synonym filter when stemming is not easy
           # https://groups.google.com/forum/#!topic/elasticsearch/p7qcQlgHdB8
@@ -361,7 +364,7 @@ module Searchkick
 
         if options[:special_characters] == false
           settings[:analysis][:analyzer].each do |analyzer, analyzer_settings|
-            analyzer_settings[:filter].reject!{|f| f == "asciifolding" }
+            analyzer_settings[:filter].reject! { |f| f == "asciifolding" }
           end
         end
 
@@ -380,7 +383,7 @@ module Searchkick
 
         mapping_options = Hash[
           [:autocomplete, :suggest, :text_start, :text_middle, :text_end, :word_start, :word_middle, :word_end, :highlight]
-            .map{|type| [type, (options[type] || []).map(&:to_s)] }
+            .map { |type| [type, (options[type] || []).map(&:to_s)] }
         ]
 
         mapping_options.values.flatten.uniq.each do |field|
@@ -420,9 +423,15 @@ module Searchkick
           }
         end
 
+        routing = {}
+        if options[:routing]
+          routing = {required: true, path: options[:routing].to_s}
+        end
+
         mappings = {
           _default_: {
             properties: mapping,
+            _routing: routing,
             # https://gist.github.com/kimchy/2898285
             dynamic_templates: [
               {
@@ -457,7 +466,7 @@ module Searchkick
     # other
 
     def tokens(text, options = {})
-      client.indices.analyze({text: text, index: name}.merge(options))["tokens"].map{|t| t["token"] }
+      client.indices.analyze({text: text, index: name}.merge(options))["tokens"].map { |t| t["token"] }
     end
 
     def klass_document_type(klass)
@@ -488,24 +497,24 @@ module Searchkick
 
       # stringify fields
       # remove _id since search_id is used instead
-      source = source.inject({}){|memo,(k,v)| memo[k.to_s] = v; memo}.except("_id")
+      source = source.inject({}) { |memo, (k, v)| memo[k.to_s] = v; memo }.except("_id")
 
       # conversions
       conversions_field = options[:conversions]
-      if conversions_field and source[conversions_field]
-        source[conversions_field] = source[conversions_field].map{|k, v| {query: k, count: v} }
+      if conversions_field && source[conversions_field]
+        source[conversions_field] = source[conversions_field].map { |k, v| {query: k, count: v} }
       end
 
       # hack to prevent generator field doesn't exist error
       (options[:suggest] || []).map(&:to_s).each do |field|
-        source[field] = nil if !source[field]
+        source[field] = nil unless source[field]
       end
 
       # locations
       (options[:locations] || []).map(&:to_s).each do |field|
         if source[field]
           if source[field].first.is_a?(Array) # array of arrays
-            source[field] = source[field].map{|a| a.map(&:to_f).reverse }
+            source[field] = source[field].map { |a| a.map(&:to_f).reverse }
           else
             source[field] = source[field].map(&:to_f).reverse
           end

data/lib/searchkick/logging.rb

@@ -77,7 +77,7 @@ module Searchkick
 
       # no easy way to tell which host the client will use
       host = Searchkick.client.transport.hosts.first
-      debug "  #{color(name, YELLOW, true)}  curl #{host[:protocol]}://#{host[:host]}:#{host[:port]}/#{CGI.escape(index)}#{type ? "/#{type.map{|t| CGI.escape(t) }.join(",")}" : ""}/_search?pretty -d '#{payload[:query][:body].to_json}'"
+      debug "  #{color(name, YELLOW, true)}  curl #{host[:protocol]}://#{host[:host]}:#{host[:port]}/#{CGI.escape(index)}#{type ? "/#{type.map { |t| CGI.escape(t) }.join(',')}" : ''}/_search?pretty -d '#{payload[:query][:body].to_json}'"
     end
 
     def request(event)

data/lib/searchkick/model.rb

@@ -11,14 +11,14 @@ module Searchkick
       class_eval do
         cattr_reader :searchkick_options, :searchkick_klass
 
-        callbacks = options.has_key?(:callbacks) ? options[:callbacks] : true
+        callbacks = options.key?(:callbacks) ? options[:callbacks] : true
 
         class_variable_set :@@searchkick_options, options.dup
         class_variable_set :@@searchkick_klass, self
         class_variable_set :@@searchkick_callbacks, callbacks
         class_variable_set :@@searchkick_index, options[:index_name] || [options[:index_prefix], model_name.plural, Searchkick.env].compact.join("_")
 
-        define_singleton_method(Searchkick.search_method_name) do |term = nil, options={}, &block|
+        define_singleton_method(Searchkick.search_method_name) do |term = nil, options = {}, &block|
           searchkick_index.search_model(self, term, options, &block)
         end
         extend Searchkick::Reindex # legacy for Searchjoy
@@ -68,10 +68,10 @@ module Searchkick
         if callbacks
           callback_name = callbacks == :async ? :reindex_async : :reindex
           if respond_to?(:after_commit)
-            after_commit callback_name, if: proc{ self.class.search_callbacks? }
+            after_commit callback_name, if: proc { self.class.search_callbacks? }
           else
-            after_save callback_name, if: proc{ self.class.search_callbacks? }
-            after_destroy callback_name, if: proc{ self.class.search_callbacks? }
+            after_save callback_name, if: proc { self.class.search_callbacks? }
+            after_destroy callback_name, if: proc { self.class.search_callbacks? }
           end
         end
 

data/lib/searchkick/query.rb

@@ -15,26 +15,26 @@ module Searchkick
       @term = term
       @options = options
 
-      below12 = Gem::Version.new(Searchkick.server_version) < Gem::Version.new("1.2")
-      below14 = Gem::Version.new(Searchkick.server_version) < Gem::Version.new("1.4")
+      below12 = Gem::Version.new(Searchkick.server_version) < Gem::Version.new("1.2.0")
+      below14 = Gem::Version.new(Searchkick.server_version) < Gem::Version.new("1.4.0")
 
       boost_fields = {}
       fields =
         if options[:fields]
           if options[:autocomplete]
-            options[:fields].map{|f| "#{f}.autocomplete" }
+            options[:fields].map { |f| "#{f}.autocomplete" }
           else
             options[:fields].map do |value|
               k, v = value.is_a?(Hash) ? value.to_a.first : [value, :word]
               k2, boost = k.to_s.split("^", 2)
-              field = "#{k2}.#{v == :word ? "analyzed" : v}"
+              field = "#{k2}.#{v == :word ? 'analyzed' : v}"
               boost_fields[field] = boost.to_f if boost
               field
             end
           end
         else
           if options[:autocomplete]
-            (searchkick_options[:autocomplete] || []).map{|f| "#{f}.autocomplete" }
+            (searchkick_options[:autocomplete] || []).map { |f| "#{f}.autocomplete" }
           else
             ["_all"]
           end
@@ -44,7 +44,7 @@ module Searchkick
 
       # pagination
       page = [options[:page].to_i, 1].max
-      per_page = (options[:limit] || options[:per_page] || 100000).to_i
+      per_page = (options[:limit] || options[:per_page] || 100_000).to_i
       padding = [options[:padding].to_i, 0].max
       offset = options[:offset] || (page - 1) * per_page + padding
 
@@ -98,13 +98,13 @@ module Searchkick
                 boost: factor
               }
 
-              if field == "_all" or field.end_with?(".analyzed")
+              if field == "_all" || field.end_with?(".analyzed")
                 shared_options[:cutoff_frequency] = 0.001 unless operator == "and"
                 qs.concat [
                   shared_options.merge(boost: 10 * factor, analyzer: "searchkick_search"),
                   shared_options.merge(boost: 10 * factor, analyzer: "searchkick_search2")
                 ]
-                misspellings = options.has_key?(:misspellings) ? options[:misspellings] : options[:mispellings] # why not?
+                misspellings = options.key?(:misspellings) ? options[:misspellings] : options[:mispellings] # why not?
                 if misspellings != false
                   edit_distance = (misspellings.is_a?(Hash) && (misspellings[:edit_distance] || misspellings[:distance])) || 1
                   qs.concat [
@@ -120,7 +120,7 @@ module Searchkick
                 qs << shared_options.merge(analyzer: analyzer)
               end
 
-              queries.concat(qs.map{|q| {match: {field => q}} })
+              queries.concat(qs.map { |q| {match: {field => q}} })
             end
 
             payload = {
@@ -130,7 +130,7 @@ module Searchkick
             }
           end
 
-          if conversions_field and options[:conversions] != false
+          if conversions_field && options[:conversions] != false
             # wrap payload in a bool query
             script_score =
               if below12
@@ -167,7 +167,7 @@ module Searchkick
 
         boost_by = options[:boost_by] || {}
         if boost_by.is_a?(Array)
-          boost_by = Hash[ boost_by.map{|f| [f, {factor: 1}] } ]
+          boost_by = Hash[boost_by.map { |f| [f, {factor: 1}] }]
         end
         if options[:boost]
           boost_by[options[:boost]] = {factor: 1}
@@ -191,14 +191,14 @@ module Searchkick
         end
 
         boost_where = options[:boost_where] || {}
-        if options[:user_id] and personalize_field
+        if options[:user_id] && personalize_field
           boost_where[personalize_field] = options[:user_id]
         end
         if options[:personalize]
           boost_where = boost_where.merge(options[:personalize])
         end
         boost_where.each do |field, value|
-          if value.is_a?(Array) and value.first.is_a?(Hash)
+          if value.is_a?(Array) && value.first.is_a?(Hash)
             value.each do |value_factor|
               value, factor = value_factor[:value], value_factor[:factor]
               custom_filters << custom_filter(field, value, factor)
@@ -215,10 +215,10 @@ module Searchkick
         boost_by_distance = options[:boost_by_distance]
         if boost_by_distance
           boost_by_distance = {function: :gauss, scale: "5mi"}.merge(boost_by_distance)
-          if !boost_by_distance[:field] or !boost_by_distance[:origin]
+          if !boost_by_distance[:field] || !boost_by_distance[:origin]
             raise ArgumentError, "boost_by_distance requires :field and :origin"
           end
-          function_params = boost_by_distance.select{|k,v| [:origin, :scale, :offset, :decay].include?(k) }
+          function_params = boost_by_distance.select { |k, v| [:origin, :scale, :offset, :decay].include?(k) }
           function_params[:origin] = function_params[:origin].reverse
           custom_filters << {
             boost_by_distance[:function] => {
@@ -248,29 +248,41 @@ module Searchkick
         if options[:order]
           order = options[:order].is_a?(Enumerable) ? options[:order] : {options[:order] => :asc}
           # TODO id transformation for arrays
-          payload[:sort] = order.is_a?(Array) ? order : Hash[ order.map{|k, v| [k.to_s == "id" ? :_id : k, v] } ]
+          payload[:sort] = order.is_a?(Array) ? order : Hash[order.map { |k, v| [k.to_s == "id" ? :_id : k, v] }]
         end
 
         # filters
         filters = where_filters(options[:where])
         if filters.any?
-          payload[:filter] = {
-            and: filters
-          }
+          if options[:facets]
+            payload[:filter] = {
+              and: filters
+            }
+          else
+            # more efficient query if no facets
+            payload[:query] = {
+              filtered: {
+                query: payload[:query],
+                filter: {
+                  and: filters
+                }
+              }
+            }
+          end
         end
 
         # facets
         if options[:facets]
           facets = options[:facets] || {}
           if facets.is_a?(Array) # convert to more advanced syntax
-            facets = Hash[ facets.map{|f| [f, {}] } ]
+            facets = Hash[facets.map { |f| [f, {}] }]
           end
 
           payload[:facets] = {}
           facets.each do |field, facet_options|
             # ask for extra facets due to
             # https://github.com/elasticsearch/elasticsearch/issues/1305
-            size = facet_options[:limit] ? facet_options[:limit] + 150 : 100000
+            size = facet_options[:limit] ? facet_options[:limit] + 150 : 100_000
 
             if facet_options[:ranges]
               payload[:facets][field] = {
@@ -289,7 +301,7 @@ module Searchkick
             else
               payload[:facets][field] = {
                 terms: {
-                  field: field,
+                  field: facet_options[:field] || field,
                   size: size
                 }
               }
@@ -300,7 +312,7 @@ module Searchkick
             # offset is not possible
             # http://elasticsearch-users.115913.n3.nabble.com/Is-pagination-possible-in-termsStatsFacet-td3422943.html
 
-            facet_options.deep_merge!(where: options[:where].reject{|k| k == field}) if options[:smart_facets] == true
+            facet_options.deep_merge!(where: options[:where].reject { |k| k == field }) if options[:smart_facets] == true
             facet_filters = where_filters(facet_options[:where])
             if facet_filters.any?
               payload[:facets][field][:facet_filter] = {
@@ -318,7 +330,7 @@ module Searchkick
 
           # intersection
           if options[:fields]
-            suggest_fields = suggest_fields & options[:fields].map{|v| (v.is_a?(Hash) ? v.keys.first : v).to_s.split("^", 2).first }
+            suggest_fields &= options[:fields].map { |v| (v.is_a?(Hash) ? v.keys.first : v).to_s.split("^", 2).first }
           end
 
           if suggest_fields.any?
@@ -336,11 +348,11 @@ module Searchkick
         # highlight
         if options[:highlight]
           payload[:highlight] = {
-            fields: Hash[ fields.map{|f| [f, {}] } ]
+            fields: Hash[fields.map { |f| [f, {}] }]
           }
 
           if options[:highlight].is_a?(Hash)
-            if tag = options[:highlight][:tag]
+            if (tag = options[:highlight][:tag])
               payload[:highlight][:pre_tags] = [tag]
               payload[:highlight][:post_tags] = [tag.to_s.gsub(/\A</, "</")]
             end
@@ -364,8 +376,13 @@ module Searchkick
           payload[:fields] = []
         end
 
-        if options[:type] or klass != searchkick_klass
-          @type = [options[:type] || klass].flatten.map{|v| searchkick_index.klass_document_type(v) }
+        if options[:type] || klass != searchkick_klass
+          @type = [options[:type] || klass].flatten.map { |v| searchkick_index.klass_document_type(v) }
+        end
+
+        # routing
+        if options[:routing]
+          @routing = options[:routing]
         end
       end
 
@@ -395,6 +412,7 @@ module Searchkick
         body: body
       }
       params.merge!(type: @type) if @type
+      params.merge!(routing: @routing) if @routing
       params
     end
 
@@ -405,10 +423,10 @@ module Searchkick
         status_code = e.message[1..3].to_i
         if status_code == 404
           raise MissingIndexError, "Index missing - run #{searchkick_klass.name}.reindex"
-        elsif status_code == 500 and (
-            e.message.include?("IllegalArgumentException[minimumSimilarity >= 1]") or
-            e.message.include?("No query registered for [multi_match]") or
-            e.message.include?("[match] query does not support [cutoff_frequency]]") or
+        elsif status_code == 500 && (
+            e.message.include?("IllegalArgumentException[minimumSimilarity >= 1]") ||
+            e.message.include?("No query registered for [multi_match]") ||
+            e.message.include?("[match] query does not support [cutoff_frequency]]") ||
             e.message.include?("No query registered for [function_score]]")
           )
 
@@ -430,7 +448,7 @@ module Searchkick
         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"] }
+        response["facets"][field]["other"] = facet["total"] - facet["terms"].sum { |term| term["count"] }
       end
 
       opts = {
@@ -453,7 +471,7 @@ module Searchkick
 
         if field == :or
           value.each do |or_clause|
-            filters << {or: or_clause.map{|or_statement| {and: where_filters(or_statement)} }}
+            filters << {or: or_clause.map { |or_statement| {and: where_filters(or_statement)} }}
           end
         else
           # expand ranges
@@ -507,7 +525,7 @@ module Searchkick
                     raise "Unknown where operator"
                   end
                 # issue 132
-                if existing = filters.find{ |f| f[:range] && f[:range][field] }
+                if (existing = filters.find { |f| f[:range] && f[:range][field] })
                   existing[:range][field].merge!(range_query)
                 else
                   filters << {range: {field => range_query}}
@@ -524,13 +542,15 @@ module Searchkick
 
     def term_filters(field, value)
       if value.is_a?(Array) # in query
-        if value.any?
-          {or: value.map{|v| term_filters(field, v) }}
+        if value.any?(&:nil?)
+          {or: [term_filters(field, nil), term_filters(field, value.compact)]}
         else
-          {terms: {field => value}} # match nothing
+          {in: {field => value}}
         end
       elsif value.nil?
         {missing: {"field" => field, existence: true, null_value: true}}
+      elsif value.is_a?(Regexp)
+        {regexp: {field => {value: value.source}}}
       else
         {term: {field => value}}
       end

data/lib/searchkick/reindex_job.rb

@@ -10,7 +10,7 @@ module Searchkick
       model = @klass.constantize
       record = model.find(@id) rescue nil # TODO fix lazy coding
       index = model.searchkick_index
-      if !record or !record.should_index?
+      if !record || !record.should_index?
         # hacky
         record ||= model.new
         record.id = @id

data/lib/searchkick/reindex_v2_job.rb

@@ -6,7 +6,7 @@ module Searchkick
       model = klass.constantize
       record = model.find(id) rescue nil # TODO fix lazy coding
       index = model.searchkick_index
-      if !record or !record.should_index?
+      if !record || !record.should_index?
         # hacky
         record ||= model.new
         record.id = id

data/lib/searchkick/results.rb

@@ -21,10 +21,10 @@ module Searchkick
           # results can have different types
           results = {}
 
-          hits.group_by{|hit, i| hit["_type"] }.each do |type, grouped_hits|
+          hits.group_by { |hit, i| hit["_type"] }.each do |type, grouped_hits|
             records = type.camelize.constantize
             if options[:includes]
-              if defined?(NoBrainer::Document) and records < NoBrainer::Document
+              if defined?(NoBrainer::Document) && records < NoBrainer::Document
                 records = records.preload(options[:includes])
               else
                 records = records.includes(options[:includes])
@@ -35,7 +35,7 @@ module Searchkick
 
           # sort
           hits.map do |hit|
-            results[hit["_type"]].find{|r| r.id.to_s == hit["_id"].to_s }
+            results[hit["_type"]].find { |r| r.id.to_s == hit["_id"].to_s }
           end.compact
         else
           hits.map do |hit|
@@ -54,7 +54,7 @@ module Searchkick
 
     def suggestions
       if response["suggest"]
-        response["suggest"].values.flat_map{|v| v.first["options"] }.sort_by{|o| -o["score"] }.map{|o| o["text"] }.uniq
+        response["suggest"].values.flat_map { |v| v.first["options"] }.sort_by { |o| -o["score"] }.map { |o| o["text"] }.uniq
       else
         raise "Pass `suggest: true` to the search method for suggestions"
       end
@@ -68,7 +68,7 @@ module Searchkick
       each_with_hit.map do |model, hit|
         details = {}
         if hit["highlight"]
-          details[:highlight] = Hash[ hit["highlight"].map{|k, v| [(options[:json] ? k : k.sub(/\.analyzed\z/, "")).to_sym, v.first] } ]
+          details[:highlight] = Hash[hit["highlight"].map { |k, v| [(options[:json] ? k : k.sub(/\.analyzed\z/, "")).to_sym, v.first] }]
         end
         [model, details]
       end
@@ -138,18 +138,18 @@ module Searchkick
     private
 
     def results_query(records, grouped_hits)
-      if records.respond_to?(:primary_key) and records.primary_key
+      if records.respond_to?(:primary_key) && records.primary_key
         # ActiveRecord
-        records.where(records.primary_key => grouped_hits.map{|hit| hit["_id"] }).to_a
-      elsif records.respond_to?(:all) and records.all.respond_to?(:for_ids)
+        records.where(records.primary_key => grouped_hits.map { |hit| hit["_id"] }).to_a
+      elsif records.respond_to?(:all) && records.all.respond_to?(:for_ids)
         # Mongoid 2
-        records.all.for_ids(grouped_hits.map{|hit| hit["_id"] }).to_a
+        records.all.for_ids(grouped_hits.map { |hit| hit["_id"] }).to_a
       elsif records.respond_to?(:queryable)
         # Mongoid 3+
-        records.queryable.for_ids(grouped_hits.map{|hit| hit["_id"] }).to_a
-      elsif records.respond_to?(:unscoped) and records.all.respond_to?(:preload)
+        records.queryable.for_ids(grouped_hits.map { |hit| hit["_id"] }).to_a
+      elsif records.respond_to?(:unscoped) && records.all.respond_to?(:preload)
         # Nobrainer
-        records.unscoped.where(:id.in => grouped_hits.map{|hit| hit["_id"] }).to_a
+        records.unscoped.where(:id.in => grouped_hits.map { |hit| hit["_id"] }).to_a
       else
         raise "Not sure how to load records"
       end

data/lib/searchkick/tasks.rb

@@ -3,13 +3,13 @@ require "rake"
 namespace :searchkick do
 
   desc "reindex model"
-  task :reindex => :environment do
+  task reindex: :environment do
     if ENV["CLASS"]
       klass = ENV["CLASS"].constantize rescue nil
       if klass
         klass.reindex
       else
-        abort "Could not find class: #{ENV["CLASS"]}"
+        abort "Could not find class: #{ENV['CLASS']}"
       end
     else
       abort "USAGE: rake searchkick:reindex CLASS=Product"
@@ -20,7 +20,7 @@ namespace :searchkick do
 
     namespace :reindex do
       desc "reindex all models"
-      task :all => :environment do
+      task all: :environment do
         Rails.application.eager_load!
         Searchkick.models.each do |model|
           puts "Reindexing #{model.name}..."

data/lib/searchkick/version.rb

@@ -1,3 +1,3 @@
 module Searchkick
-  VERSION = "0.8.7"
+  VERSION = "0.9.0"
 end

data/lib/searchkick.rb

@@ -24,13 +24,11 @@ module Searchkick
   class InvalidQueryError < Elasticsearch::Transport::Transport::Errors::BadRequest; end
 
   class << self
-    attr_accessor :callbacks
     attr_accessor :search_method_name
     attr_accessor :wordnet_path
     attr_accessor :timeout
     attr_accessor :models
   end
-  self.callbacks = true
   self.search_method_name = :search
   self.wordnet_path = "/var/lib/wn_s.pl"
   self.timeout = 10
@@ -44,8 +42,8 @@ module Searchkick
       )
   end
 
-  def self.client=(client)
-    @client = client
+  class << self
+    attr_writer :client
   end
 
   def self.server_version
@@ -53,15 +51,15 @@ module Searchkick
   end
 
   def self.enable_callbacks
-    self.callbacks = true
+    Thread.current[:searchkick_callbacks_enabled] = true
   end
 
   def self.disable_callbacks
-    self.callbacks = false
+    Thread.current[:searchkick_callbacks_enabled] = false
   end
 
   def self.callbacks?
-    callbacks
+    Thread.current[:searchkick_callbacks_enabled].nil? || Thread.current[:searchkick_callbacks_enabled]
   end
 
   def self.env

data/searchkick.gemspec

@@ -1,19 +1,19 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'searchkick/version'
+require "searchkick/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "searchkick"
   spec.version       = Searchkick::VERSION
   spec.authors       = ["Andrew Kane"]
   spec.email         = ["andrew@chartkick.com"]
-  spec.description   = %q{Intelligent search made easy}
-  spec.summary       = %q{Searchkick learns what your users are looking for. As more people search, it gets smarter and the results get better. It’s friendly for developers - and magical for your users.}
+  spec.description   = "Intelligent search made easy"
+  spec.summary       = "Searchkick learns what your users are looking for. As more people search, it gets smarter and the results get better. It’s friendly for developers - and magical for your users."
   spec.homepage      = "https://github.com/ankane/searchkick"
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files`.split($/)
+  spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]

data/test/facets_test.rb

@@ -21,6 +21,12 @@ class TestFacets < Minitest::Test
     assert_equal ({1 => 1}), store_facet(facets: {store_id: {where: {in_stock: true}}})
   end
 
+  def test_field
+    assert_equal ({1 => 1, 2 => 2}), store_facet(facets: {store_id: {}})
+    assert_equal ({1 => 1, 2 => 2}), store_facet(facets: {store_id: {field: "store_id"}})
+    assert_equal ({1 => 1, 2 => 2}), store_facet({facets: {store_id_new: {field: "store_id"}}}, "store_id_new")
+  end
+
   def test_limit
     facet = Product.search("Product", facets: {store_id: {limit: 1}}).facets["store_id"]
     assert_equal 1, facet["terms"].size
@@ -78,8 +84,8 @@ class TestFacets < Minitest::Test
 
   protected
 
-  def store_facet(options)
-    Hash[ Product.search("Product", options).facets["store_id"]["terms"].map{|v| [v["term"], v["count"]] } ]
+  def store_facet(options, facet_key="store_id")
+    Hash[Product.search("Product", options).facets[facet_key]["terms"].map { |v| [v["term"], v["count"]] }]
   end
 
 end

data/test/index_test.rb

@@ -75,24 +75,32 @@ class TestIndex < Minitest::Test
   def test_bad_mapping
     Product.searchkick_index.delete
     store_names ["Product A"]
-    assert_raises(Searchkick::InvalidQueryError){ Product.search "test" }
+    assert_raises(Searchkick::InvalidQueryError) { Product.search "test" }
+  ensure
+    Product.reindex
+  end
+
+  def test_remove_blank_id
+    store_names ["Product A"]
+    Product.searchkick_index.remove(OpenStruct.new)
+    assert_search "product", ["Product A"]
   ensure
     Product.reindex
   end
 
   def test_missing_index
-    assert_raises(Searchkick::MissingIndexError){ Product.search "test", index_name: "not_found" }
+    assert_raises(Searchkick::MissingIndexError) { Product.search "test", index_name: "not_found" }
   end
 
   def test_unsupported_version
-    raises_exception = lambda { |s| raise Elasticsearch::Transport::Transport::Error.new("[500] No query registered for [multi_match]") }
+    raises_exception = ->(s) { raise Elasticsearch::Transport::Transport::Error.new("[500] No query registered for [multi_match]") }
     Searchkick.client.stub :search, raises_exception do
-      assert_raises(Searchkick::UnsupportedVersionError){ Product.search("test") }
+      assert_raises(Searchkick::UnsupportedVersionError) { Product.search("test") }
     end
   end
 
   def test_invalid_query
-    assert_raises(Searchkick::InvalidQueryError){ Product.search(query: {}) }
+    assert_raises(Searchkick::InvalidQueryError) { Product.search(query: {}) }
   end
 
   if defined?(ActiveRecord)

data/test/model_test.rb

@@ -18,6 +18,9 @@ class TestModel < Minitest::Test
   end
 
   def test_disable_callbacks_global
+    # make sure callbacks default to on
+    assert Searchkick.callbacks?
+    
     store_names ["product a"]
 
     Searchkick.disable_callbacks

data/test/reindex_v2_job_test.rb

@@ -3,7 +3,7 @@ require_relative "test_helper"
 class TestReindexV2Job < Minitest::Test
 
   def setup
-    skip if !defined?(ActiveJob)
+    skip unless defined?(ActiveJob)
     super
     Searchkick.disable_callbacks
   end

data/test/routing_test.rb

@@ -0,0 +1,14 @@
+require_relative "test_helper"
+
+class TestRouting < Minitest::Test
+
+  def test_routing_query
+    query = Store.search("Dollar Tree", routing: "Dollar Tree", execute: false)
+    assert_equal query.params[:routing], "Dollar Tree"
+  end
+
+  def test_routing_mappings
+    index_options = Store.searchkick_index.index_options
+    assert_equal index_options[:mappings][:_default_][:_routing], {required: true, path: "name"}
+  end
+end

data/test/sql_test.rb

@@ -8,7 +8,7 @@ class TestSql < Minitest::Test
   end
 
   def test_no_limit
-    names = 20.times.map{|i| "Product #{i}" }
+    names = 20.times.map { |i| "Product #{i}" }
     store_names names
     assert_search "product", names
   end
@@ -57,7 +57,7 @@ class TestSql < Minitest::Test
       {name: "Product A", store_id: 1, in_stock: true, backordered: true, created_at: now, orders_count: 4, user_ids: [1, 2, 3]},
       {name: "Product B", store_id: 2, in_stock: true, backordered: false, created_at: now - 1, orders_count: 3, user_ids: [1]},
       {name: "Product C", store_id: 3, in_stock: false, backordered: true, created_at: now - 2, orders_count: 2, user_ids: [1, 3]},
-      {name: "Product D", store_id: 4, in_stock: false, backordered: false, created_at: now - 3, orders_count: 1},
+      {name: "Product D", store_id: 4, in_stock: false, backordered: false, created_at: now - 3, orders_count: 1}
     ]
     assert_search "product", ["Product A", "Product B"], where: {in_stock: true}
     # date
@@ -85,7 +85,7 @@ class TestSql < Minitest::Test
     assert_search "product", ["Product A", "Product C"], where: {user_ids: {all: [1, 3]}}
     assert_search "product", [], where: {user_ids: {all: [1, 2, 3, 4]}}
     # any / nested terms
-    assert_search "product", ["Product B", "Product C"], where: {user_ids: {not: [2], in: [1,3]}}
+    assert_search "product", ["Product B", "Product C"], where: {user_ids: {not: [2], in: [1, 3]}}
     # not / exists
     assert_search "product", ["Product D"], where: {user_ids: nil}
     assert_search "product", ["Product A", "Product B", "Product C"], where: {user_ids: {not: nil}}
@@ -93,6 +93,11 @@ class TestSql < Minitest::Test
     assert_search "product", ["Product B"], where: {user_ids: {not: [3, nil]}}
   end
 
+  def test_regexp
+    store_names ["Product A"]
+    assert_search "*", ["Product A"], where: {name: /Pro.+/}
+  end
+
   def test_where_string
     store [
       {name: "Product A", color: "RED"}
@@ -288,7 +293,7 @@ class TestSql < Minitest::Test
   def test_select
     store [{name: "Product A", store_id: 1}]
     result = Product.search("product", load: false, select: [:name, :store_id]).first
-    assert_equal %w[id name store_id], result.keys.reject{|k| k.start_with?("_") }.sort
+    assert_equal %w[id name store_id], result.keys.reject { |k| k.start_with?("_") }.sort
     assert_equal ["Product A"], result.name # this is not great
   end
 
@@ -312,7 +317,7 @@ class TestSql < Minitest::Test
   end
 
   # TODO see if Mongoid is loaded
-  unless defined?(Mongoid) or defined?(NoBrainer)
+  unless defined?(Mongoid) || defined?(NoBrainer)
     def test_include
       store_names ["Product A"]
       assert Product.search("product", include: [:store]).first.association(:store).loaded?

data/test/suggest_test.rb

@@ -19,13 +19,13 @@ class TestSuggest < Minitest::Test
 
   def test_without_option
     store_names ["hi"] # needed to prevent ElasticsearchException - seed 668
-    assert_raises(RuntimeError){ Product.search("hi").suggestions }
+    assert_raises(RuntimeError) { Product.search("hi").suggestions }
   end
 
   def test_multiple_fields
     store [
       {name: "Shark", color: "Sharp"},
-      {name: "Shark", color: "Sharp"},
+      {name: "Shark", color: "Sharp"}
     ]
     assert_suggest_all "shar", ["shark", "sharp"]
   end

data/test/test_helper.rb

@@ -8,9 +8,11 @@ ENV["RACK_ENV"] = "test"
 
 Minitest::Test = Minitest::Unit::TestCase unless defined?(Minitest::Test)
 
-File.delete("elasticsearch.log") if File.exists?("elasticsearch.log")
+File.delete("elasticsearch.log") if File.exist?("elasticsearch.log")
 Searchkick.client.transport.logger = Logger.new("elasticsearch.log")
 
+puts "Running against Elasticsearch #{Searchkick.server_version}"
+
 I18n.config.enforce_available_locales = true
 
 ActiveJob::Base.logger = nil if defined?(ActiveJob)
@@ -26,7 +28,7 @@ if defined?(Mongoid)
     module BSON
       class ObjectId
         def <=>(other)
-          self.data <=> other.data
+          data <=> other.data
         end
       end
     end
@@ -210,12 +212,15 @@ class Product
 end
 
 class Store
-  searchkick mappings: {
-    store: {
-      properties: {
-        name: {type: "string", analyzer: "keyword"}
+  searchkick \
+    routing: :name,
+    merge_mappings: true,
+    mappings: {
+      store: {
+        properties: {
+          name: {type: "string", analyzer: "keyword"},
+        }
       }
-    }
   }
 end
 
@@ -223,7 +228,7 @@ class Animal
   searchkick \
     autocomplete: [:name],
     suggest: [:name],
-    index_name: -> { "#{self.name.tableize}-#{Date.today.year}" }
+    index_name: -> { "#{name.tableize}-#{Date.today.year}" }
     # wordnet: true
 end
 
@@ -252,7 +257,7 @@ class Minitest::Test
   end
 
   def store_names(names, klass = Product)
-    store names.map{|name| {name: name} }, klass
+    store names.map { |name| {name: name} }, klass
   end
 
   # no order

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: searchkick
 version: !ruby/object:Gem::Version
-  version: 0.8.7
+  version: 0.9.0
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-14 00:00:00.000000000 Z
+date: 2015-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -139,6 +139,7 @@ files:
 - test/query_test.rb
 - test/reindex_job_test.rb
 - test/reindex_v2_job_test.rb
+- test/routing_test.rb
 - test/should_index_test.rb
 - test/similar_test.rb
 - test/sql_test.rb
@@ -183,9 +184,11 @@ test_files:
 - test/query_test.rb
 - test/reindex_job_test.rb
 - test/reindex_v2_job_test.rb
+- test/routing_test.rb
 - test/should_index_test.rb
 - test/similar_test.rb
 - test/sql_test.rb
 - test/suggest_test.rb
 - test/synonyms_test.rb
 - test/test_helper.rb
+has_rdoc: