searchkick 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49a9ad19b612e5079b3c97ec4ff756e62b8e2333
-  data.tar.gz: 2e9133f49f0287cabf5bc88fe2fd28e6594ffa27
+  metadata.gz: 750ced99cb1b0929710eba206bde31907f0d9544
+  data.tar.gz: 454d078f8900948def90b1a88b40bde8aec561b5
 SHA512:
-  metadata.gz: 4e15ce0859a66945f0675226bb5492d67db7612f23e480d5cec930903db151c2622380d30192e1eace1feb146b455f56b5cb3f55c07129580ac8117da224f42e
-  data.tar.gz: 87c387df771fcf4dcec72b46f779169515acef02bd29ff12565c1c52374fc99a13d54a7d5a38ff0ef57cb7beb58412b0c354abf2beb0860342f2ff545605130a
+  metadata.gz: 5139a9a1f326fa97f58f09fc52d5988ff14661e8e4ec9a3240c6e4c10160c577d5b6231caab980101951a37cbdbbf5631e4df70c5060f5a21bd5beb9ae58dfec
+  data.tar.gz: 841981f0feaafcbeb39295282b018d4672bc41c115f31ce3d1b63964345197942082aac4eeff5b43190669ef81ad5a0fd3b0ac8afb5f271154058f0045fb3760

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 1.2.1
+
+- Added `multi_search` method
+- Added support for routing for Elasticsearch 2
+- Added support for `search_document_id` and `search_document_type` in models
+- Fixed error with instrumentation for searching multiple models
+- Fixed instrumentation for bulk updates
+
 ## 1.2.0
 
 - Fixed deprecation warnings with `alias_method_chain`

data/README.md

@@ -338,12 +338,13 @@ Control what data is indexed with the `search_data` method. Call `Product.reinde
 
 ```ruby
 class Product < ActiveRecord::Base
+  belongs_to :department
+
   def search_data
-    as_json only: [:name, :active]
-    # or equivalently
     {
       name: name,
-      active: active
+      department_name: department.name,
+      on_sale: sale_price.present?
     }
   end
 end
@@ -353,7 +354,7 @@ Searchkick uses `find_in_batches` to import documents.  To eager load associatio
 
 ```ruby
 class Product < ActiveRecord::Base
-  scope :search_import, -> { includes(:searches) }
+  scope :search_import, -> { includes(:department) }
 end
 ```
 
@@ -833,18 +834,20 @@ City.search "san", boost_by_distance: {field: :location, origin: {lat: 37, lon:
 
 Searchkick supports [Elasticsearch’s routing feature](https://www.elastic.co/blog/customizing-your-document-routing).
 
-**Note:** Routing is not yet supported for Elasticsearch 2.0.
-
 ```ruby
-class Contact < ActiveRecord::Base
-  searchkick routing: :user_id
+class Business < ActiveRecord::Base
+  searchkick routing: true
+
+  def searchkick_routing
+    city_id
+  end
 end
 ```
 
 Reindex and search with:
 
 ```ruby
-Contact.search "John", routing: current_user.id
+Business.search "ice cream", routing: params[:city_id]
 ```
 
 ## Inheritance
@@ -961,6 +964,7 @@ gem 'faraday_middleware-aws-signers-v4'
 and add to your initializer:
 
 ```ruby
+require "faraday_middleware/aws_signers_v4"
 Searchkick.client =
   Elasticsearch::Client.new(
     url: ENV["ELASTICSEARCH_URL"],
@@ -1088,6 +1092,20 @@ products =
   end
 ```
 
+### Multi Search
+
+To batch search requests for performance, use:
+
+```ruby
+fresh_products = Product.search("fresh", execute: false)
+frozen_products = Product.search("frozen", execute: false)
+Searchkick.multi_search([fresh_products, frozen_products])
+```
+
+Then use `fresh_products` and `frozen_products` as typical results.
+
+**Note:** Errors are not raised as with single requests. Use the `error` method on each query to check for errors. Also, the `below` option for misspellings is ignored.
+
 ## Reference
 
 Reindex one record
@@ -1234,7 +1252,7 @@ end
 
 Reindex conditionally
 
-**Note:** With ActiveRecord, use this feature with caution - [transaction rollbacks can cause data inconstencies](https://github.com/elasticsearch/elasticsearch-rails/blob/master/elasticsearch-model/README.md#custom-callbacks)
+**Note:** With ActiveRecord, use this feature with caution - [transaction rollbacks can cause data inconsistencies](https://github.com/elasticsearch/elasticsearch-rails/blob/master/elasticsearch-model/README.md#custom-callbacks)
 
 ```ruby
 class Product < ActiveRecord::Base
@@ -1246,7 +1264,7 @@ class Product < ActiveRecord::Base
 end
 ```
 
-Search multiple models [master]
+Search multiple models
 
 ```ruby
 Searchkick.search "milk", index_name: [Product, Category]

data/lib/searchkick.rb

@@ -9,7 +9,7 @@ require "searchkick/reindex_job"
 require "searchkick/model"
 require "searchkick/tasks"
 require "searchkick/middleware"
-require "searchkick/logging" if defined?(Rails)
+require "searchkick/logging" if defined?(ActiveSupport::Notifications)
 
 # background jobs
 begin
@@ -138,6 +138,16 @@ module Searchkick
       query.execute
     end
   end
+
+  def self.multi_search(queries)
+    if queries.any?
+      responses = client.msearch(body: queries.flat_map { |q| [q.params.except(:body), q.body] })["responses"]
+      queries.each_with_index do |query, i|
+        query.handle_response(responses[i])
+      end
+    end
+    nil
+  end
 end
 
 # TODO find better ActiveModel hook

data/lib/searchkick/index.rb

@@ -53,14 +53,24 @@ module Searchkick
     end
 
     def bulk_delete(records)
-      Searchkick.queue_items(records.reject { |r| r.id.blank? }.map { |r| {delete: {_index: name, _type: document_type(r), _id: search_id(r)}} })
+      Searchkick.queue_items(records.reject { |r| r.id.blank? }.map { |r| {delete: record_data(r)} })
     end
 
     def bulk_index(records)
-      Searchkick.queue_items(records.map { |r| {index: {_index: name, _type: document_type(r), _id: search_id(r), data: search_data(r)}} })
+      Searchkick.queue_items(records.map { |r| {index: record_data(r).merge(data: search_data(r))} })
     end
     alias_method :import, :bulk_index
 
+    def record_data(r)
+      data = {
+        _index: name,
+        _id: search_id(r),
+        _type: document_type(r)
+      }
+      data[:_routing] = r.search_routing if r.respond_to?(:search_routing)
+      data
+    end
+
     def retrieve(record)
       client.get(
         index: name,
@@ -463,7 +473,10 @@ module Searchkick
 
         routing = {}
         if options[:routing]
-          routing = {required: true, path: options[:routing].to_s}
+          routing = {required: true}
+          unless options[:routing] == true
+            routing[:path] = options[:routing].to_s
+          end
         end
 
         dynamic_fields = {
@@ -533,11 +546,16 @@ module Searchkick
     end
 
     def document_type(record)
-      klass_document_type(record.class)
+      if record.respond_to?(:search_document_type)
+        record.search_document_type
+      else
+        klass_document_type(record.class)
+      end
     end
 
     def search_id(record)
-      record.id.is_a?(Numeric) ? record.id : record.id.to_s
+      id = record.respond_to?(:search_document_id) ? record.search_document_id : record.id
+      id.is_a?(Numeric) ? id : id.to_s
     end
 
     def search_data(record)

data/lib/searchkick/logging.rb

@@ -1,10 +1,12 @@
 # based on https://gist.github.com/mnutt/566725
+require "active_support/core_ext/module/attr_internal"
 
 module Searchkick
   module QueryWithInstrumentation
     def execute_search
+      name = searchkick_klass ? "#{searchkick_klass.name} Search" : "Search"
       event = {
-        name: "#{searchkick_klass.name} Search",
+        name: name,
         query: params
       }
       ActiveSupport::Notifications.instrument("search.searchkick", event) do
@@ -19,19 +21,27 @@ module Searchkick
         name: "#{record.searchkick_klass.name} Store",
         id: search_id(record)
       }
-      ActiveSupport::Notifications.instrument("request.searchkick", event) do
-        super(record)
+      if Searchkick.callbacks_value == :bulk
+        super
+      else
+        ActiveSupport::Notifications.instrument("request.searchkick", event) do
+          super
+        end
       end
     end
 
-
     def remove(record)
+      name = record && record.searchkick_klass ? "#{record.searchkick_klass.name} Remove" : "Remove"
       event = {
-        name: "#{record.searchkick_klass.name} Remove",
+        name: name,
         id: search_id(record)
       }
-      ActiveSupport::Notifications.instrument("request.searchkick", event) do
-        super(record)
+      if Searchkick.callbacks_value == :bulk
+        super
+      else
+        ActiveSupport::Notifications.instrument("request.searchkick", event) do
+          super
+        end
       end
     end
 
@@ -48,6 +58,32 @@ module Searchkick
     end
   end
 
+  module SearchkickWithInstrumentation
+    def multi_search(searches)
+      event = {
+        name: "Multi Search",
+        body: searches.flat_map { |q| [q.params.except(:body).to_json, q.body.to_json] }.map { |v| "#{v}\n" }.join
+      }
+      ActiveSupport::Notifications.instrument("multi_search.searchkick", event) do
+        super
+      end
+    end
+
+    def perform_items(items)
+      if callbacks_value == :bulk
+        event = {
+          name: "Bulk",
+          count: items.size
+        }
+        ActiveSupport::Notifications.instrument("request.searchkick", event) do
+          super
+        end
+      else
+        super
+      end
+    end
+  end
+
   # https://github.com/rails/rails/blob/master/activerecord/lib/active_record/log_subscriber.rb
   class LogSubscriber < ActiveSupport::LogSubscriber
     def self.runtime=(value)
@@ -87,6 +123,18 @@ module Searchkick
 
       debug "  #{color(name, YELLOW, true)}  #{payload.except(:name).to_json}"
     end
+
+    def multi_search(event)
+      self.class.runtime += event.duration
+      return unless logger.debug?
+
+      payload = event.payload
+      name = "#{payload[:name]} (#{event.duration.round(1)}ms)"
+
+      # 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]}/_msearch?pretty -d '#{payload[:body]}'"
+    end
   end
 
   # https://github.com/rails/rails/blob/master/activerecord/lib/active_record/railties/controller_runtime.rb
@@ -130,6 +178,7 @@ module Searchkick
 end
 Searchkick::Query.send(:prepend, Searchkick::QueryWithInstrumentation)
 Searchkick::Index.send(:prepend, Searchkick::IndexWithInstrumentation)
+Searchkick.singleton_class.send(:prepend, Searchkick::SearchkickWithInstrumentation)
 Searchkick::LogSubscriber.attach_to :searchkick
 ActiveSupport.on_load(:action_controller) do
   include Searchkick::ControllerRuntime

data/lib/searchkick/model.rb

@@ -21,7 +21,7 @@ module Searchkick
           def searchkick_search(term = nil, options = {}, &block)
             searchkick_index.search_model(self, term, options, &block)
           end
-          alias_method Searchkick.search_method_name, :searchkick_search
+          alias_method Searchkick.search_method_name, :searchkick_search if Searchkick.search_method_name
 
           def searchkick_index
             index = class_variable_get :@@searchkick_index
@@ -73,7 +73,7 @@ module Searchkick
         callback_name = callbacks == :async ? :reindex_async : :reindex
         if respond_to?(:after_commit)
           after_commit callback_name, if: proc { self.class.search_callbacks? }
-        else
+        elsif respond_to?(:after_save)
           after_save callback_name, if: proc { self.class.search_callbacks? }
           after_destroy callback_name, if: proc { self.class.search_callbacks? }
         end

data/lib/searchkick/query.rb

@@ -5,7 +5,13 @@ module Searchkick
     attr_reader :klass, :term, :options
     attr_accessor :body
 
-    def_delegators :execute, :map, :each, :any?, :empty?, :size, :length, :slice, :[], :to_ary
+    def_delegators :execute, :map, :each, :any?, :empty?, :size, :length, :slice, :[], :to_ary,
+      :records, :results, :suggestions, :each_with_hit, :with_details, :facets, :aggregations, :aggs,
+      :took, :error, :model_name, :entry_name, :total_count, :total_entries,
+      :current_page, :per_page, :limit_value, :padding, :total_pages, :num_pages,
+      :offset_value, :offset, :previous_page, :prev_page, :next_page, :first_page?, :last_page?,
+      :out_of_range?, :hits
+
 
     def initialize(klass, term, options = {})
       if term.is_a?(Hash)
@@ -67,48 +73,9 @@ module Searchkick
             response = execute_search
           end
         rescue => e # TODO rescue type
-          status_code = e.message[1..3].to_i
-          if status_code == 404
-            raise MissingIndexError, "Index missing - run #{reindex_command}"
-          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]]")
-            )
-
-            raise UnsupportedVersionError, "This version of Searchkick requires Elasticsearch 1.0 or greater"
-          elsif status_code == 400
-            if e.message.include?("[multi_match] analyzer [searchkick_search] not found")
-              raise InvalidQueryError, "Bad mapping - run #{reindex_command}"
-            else
-              raise InvalidQueryError, e.message
-            end
-          else
-            raise e
-          end
-        end
-
-        # 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"] }
+          handle_error(e)
         end
-
-        opts = {
-          page: @page,
-          per_page: @per_page,
-          padding: @padding,
-          load: @load,
-          includes: options[:include] || options[:includes],
-          json: !options[:json].nil?,
-          match_suffix: @match_suffix,
-          highlighted_fields: @highlighted_fields || []
-        }
-        Searchkick::Results.new(searchkick_klass, response, opts)
+        handle_response(response)
       end
     end
 
@@ -123,8 +90,56 @@ module Searchkick
       "curl #{host[:protocol]}://#{credentials}#{host[:host]}:#{host[:port]}/#{CGI.escape(index)}#{type ? "/#{type.map { |t| CGI.escape(t) }.join(',')}" : ''}/_search?pretty -d '#{query[:body].to_json}'"
     end
 
+    def handle_response(response)
+      # 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
+
+      opts = {
+        page: @page,
+        per_page: @per_page,
+        padding: @padding,
+        load: @load,
+        includes: options[:include] || options[:includes],
+        json: !options[:json].nil?,
+        match_suffix: @match_suffix,
+        highlighted_fields: @highlighted_fields || []
+      }
+
+      # set execute for multi search
+      @execute = Searchkick::Results.new(searchkick_klass, response, opts)
+    end
+
     private
 
+    def handle_error(e)
+      status_code = e.message[1..3].to_i
+      if status_code == 404
+        raise MissingIndexError, "Index missing - run #{reindex_command}"
+      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]]")
+      )
+
+        raise UnsupportedVersionError, "This version of Searchkick requires Elasticsearch 1.0 or greater"
+      elsif status_code == 400
+        if e.message.include?("[multi_match] analyzer [searchkick_search] not found")
+          raise InvalidQueryError, "Bad mapping - run #{reindex_command}"
+        else
+          raise InvalidQueryError, e.message
+        end
+      else
+        raise e
+      end
+    end
+
     def reindex_command
       searchkick_klass ? "#{searchkick_klass.name}.reindex" : "reindex"
     end
@@ -567,10 +582,18 @@ module Searchkick
         end
 
         # An empty array will cause only the _id and _type for each hit to be returned
-        # http://www.elasticsearch.org/guide/reference/api/search/fields/
+        # doc for :select - http://www.elasticsearch.org/guide/reference/api/search/fields/
+        # doc for :select_v2 - https://www.elastic.co/guide/en/elasticsearch/reference/current/search-request-source-filtering.html
         if options[:select]
           payload[:fields] = options[:select] if options[:select] != true
+        elsif options[:select_v2]
+          if options[:select_v2] == []
+            payload[:fields] = [] # intuitively [] makes sense to return no fields, but ES by default returns all fields
+          else
+            payload[:_source] = options[:select_v2]
+          end
         elsif load
+          # don't need any fields since we're going to load them from the DB anyways
           payload[:fields] = []
         end
 
@@ -650,7 +673,7 @@ module Searchkick
                   when :lte
                     {to: op_value, include_upper: true}
                   else
-                    raise "Unknown where operator"
+                    raise "Unknown where operator: #{op.inspect}"
                   end
                 # issue 132
                 if (existing = filters.find { |f| f[:range] && f[:range][field] })

data/lib/searchkick/results.rb

@@ -39,13 +39,15 @@ module Searchkick
             result =
               if hit["_source"]
                 hit.except("_source").merge(hit["_source"])
-              else
+              elsif hit["fields"]
                 hit.except("fields").merge(hit["fields"])
+              else
+                hit
               end
 
             if hit["highlight"]
               highlight = Hash[hit["highlight"].map { |k, v| [base_field(k), v.first] }]
-              options[:highlighted_fields].map{ |k| base_field(k) }.each do |k|
+              options[:highlighted_fields].map { |k| base_field(k) }.each do |k|
                 result["highlighted_#{k}"] ||= (highlight[k] || result[k])
               end
             end
@@ -106,6 +108,10 @@ module Searchkick
       response["took"]
     end
 
+    def error
+      response["error"]
+    end
+
     def model_name
       klass.model_name
     end

data/lib/searchkick/version.rb

@@ -1,3 +1,3 @@
 module Searchkick
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end

data/test/aggs_test.rb

@@ -21,7 +21,7 @@ class AggsTest < Minitest::Test
 
   def test_order
     agg = Product.search("Product", aggs: {color: {order: {"_term" => "desc"}}}).aggs["color"]
-    assert_equal %w[red green blue], agg["buckets"].map { |b| b["key"] }
+    assert_equal %w(red green blue), agg["buckets"].map { |b| b["key"] }
   end
 
   def test_field

data/test/multi_search_test.rb

@@ -0,0 +1,22 @@
+require_relative "test_helper"
+
+class MultiSearchTest < Minitest::Test
+  def test_basic
+    store_names ["Product A"]
+    store_names ["Store A"], Store
+    products = Product.search("*", execute: false)
+    stores = Store.search("*", execute: false)
+    Searchkick.multi_search([products, stores])
+    assert_equal ["Product A"], products.map(&:name)
+    assert_equal ["Store A"], stores.map(&:name)
+  end
+
+  def test_error
+    store_names ["Product A"]
+    products = Product.search("*", execute: false)
+    stores = Store.search("*", order: [:bad_field], execute: false)
+    Searchkick.multi_search([products, stores])
+    assert !products.error
+    assert stores.error
+  end
+end

data/test/routing_test.rb

@@ -2,14 +2,12 @@ require_relative "test_helper"
 
 class RoutingTest < Minitest::Test
   def test_routing_query
-    skip if elasticsearch2?
     query = Store.search("Dollar Tree", routing: "Dollar Tree", execute: false)
     assert_equal query.params[:routing], "Dollar Tree"
   end
 
   def test_routing_mappings
-    skip if elasticsearch2?
     index_options = Store.searchkick_index.index_options
-    assert_equal index_options[:mappings][:_default_][:_routing], required: true, path: "name"
+    assert_equal index_options[:mappings][:_default_][:_routing], required: true
   end
 end

data/test/sql_test.rb

@@ -81,6 +81,7 @@ class SqlTest < Minitest::Test
     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 ["Product A"], result.name # this is not great
+    assert_equal [1], result.store_id
   end
 
   def test_select_array
@@ -89,6 +90,14 @@ class SqlTest < Minitest::Test
     assert_equal [1, 2], result.user_ids
   end
 
+  def test_select_single_field
+    store [{name: "Product A", store_id: 1}]
+    result = Product.search("product", load: false, select: :name).first
+    assert_equal %w(id name), result.keys.reject { |k| k.start_with?("_") }.sort
+    assert_equal ["Product A"], result.name
+    assert_nil result.store_id
+  end
+
   def test_select_all
     store [{name: "Product A", user_ids: [1, 2]}]
     hit = Product.search("product", select: true).hits.first
@@ -96,6 +105,78 @@ class SqlTest < Minitest::Test
     assert_equal hit["_source"]["user_ids"], [1, 2]
   end
 
+  def test_select_none
+    store [{name: "Product A", user_ids: [1, 2]}]
+    hit = Product.search("product", select: []).hits.first
+    assert_nil hit["_source"]
+  end
+
+  # select_v2
+
+  def test_select_v2
+    store [{name: "Product A", store_id: 1}]
+    result = Product.search("product", load: false, select_v2: [:name, :store_id]).first
+    assert_equal %w(id name store_id), result.keys.reject { |k| k.start_with?("_") }.sort
+    assert_equal "Product A", result.name
+    assert_equal 1, result.store_id
+  end
+
+  def test_select_v2_array
+    store [{name: "Product A", user_ids: [1, 2]}]
+    result = Product.search("product", load: false, select_v2: [:user_ids]).first
+    assert_equal [1, 2], result.user_ids
+  end
+
+  def test_select_v2_single_field
+    store [{name: "Product A", store_id: 1}]
+    result = Product.search("product", load: false, select_v2: :name).first
+    assert_equal %w(id name), result.keys.reject { |k| k.start_with?("_") }.sort
+    assert_equal "Product A", result.name
+    assert_nil result.store_id
+  end
+
+  def test_select_v2_all
+    store [{name: "Product A", user_ids: [1, 2]}]
+    hit = Product.search("product", select_v2: true).hits.first
+    assert_equal hit["_source"]["name"], "Product A"
+    assert_equal hit["_source"]["user_ids"], [1, 2]
+  end
+
+  def test_select_v2_none
+    store [{name: "Product A", user_ids: [1, 2]}]
+    hit = Product.search("product", select_v2: []).hits.first
+    assert_nil hit["_source"]
+    hit = Product.search("product", select_v2: false).hits.first
+    assert_nil hit["_source"]
+  end
+
+  def test_select_v2_include
+    store [{name: "Product A", user_ids: [1, 2]}]
+    result = Product.search("product", load: false, select_v2: {include: [:name]}).first
+    assert_equal %w(id name), result.keys.reject { |k| k.start_with?("_") }.sort
+    assert_equal "Product A", result.name
+    assert_nil result.store_id
+  end
+
+  def test_select_v2_exclude
+    store [{name: "Product A", user_ids: [1, 2], store_id: 1}]
+    result = Product.search("product", load: false, select_v2: {exclude: [:name]}).first
+    assert_nil result.name
+    assert_equal [1, 2], result.user_ids
+    assert_equal 1, result.store_id
+  end
+
+  def test_select_v2_include_and_exclude
+    # let's take this to the next level
+    store [{name: "Product A", user_ids: [1, 2], store_id: 1}]
+    result = Product.search("product", load: false, select_v2: {include: [:store_id], exclude: [:name]}).first
+    assert_equal 1, result.store_id
+    assert_nil result.name
+    assert_nil result.user_ids
+  end
+
+  # other tests
+
   def test_nested_object
     aisle = {"id" => 1, "name" => "Frozen"}
     store [{name: "Product A", aisle: aisle}]

data/test/test_helper.rb

@@ -4,6 +4,7 @@ require "minitest/autorun"
 require "minitest/pride"
 require "logger"
 require "active_support/core_ext" if defined?(NoBrainer)
+require "active_support/notifications"
 
 ENV["RACK_ENV"] = "test"
 
@@ -18,6 +19,7 @@ puts "Running against Elasticsearch #{Searchkick.server_version}"
 I18n.config.enforce_available_locales = true
 
 ActiveJob::Base.logger = nil if defined?(ActiveJob)
+ActiveSupport::LogSubscriber.logger = Logger.new(STDOUT) if ENV["NOTIFICATIONS"]
 
 def elasticsearch2?
   Searchkick.server_version.starts_with?("2.")
@@ -244,7 +246,7 @@ end
 
 class Store
   searchkick \
-    routing: elasticsearch2? ? false : "name",
+    routing: true,
     merge_mappings: true,
     mappings: {
       store: {
@@ -253,6 +255,14 @@ class Store
         }
       }
     }
+
+  def search_document_id
+    id
+  end
+
+  def search_routing
+    name
+  end
 end
 
 class Animal

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: searchkick
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-04 00:00:00.000000000 Z
+date: 2016-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -142,6 +142,7 @@ files:
 - test/match_test.rb
 - test/misspellings_test.rb
 - test/model_test.rb
+- test/multi_search_test.rb
 - test/order_test.rb
 - test/pagination_test.rb
 - test/query_test.rb
@@ -205,6 +206,7 @@ test_files:
 - test/match_test.rb
 - test/misspellings_test.rb
 - test/model_test.rb
+- test/multi_search_test.rb
 - test/order_test.rb
 - test/pagination_test.rb
 - test/query_test.rb