searchkick 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 915b713c1d61ef9709e1c95f7c588b49013b4cdd
-  data.tar.gz: cdbefb8ecb273fc877de64cc25356bcd13bf02a8
+  metadata.gz: 3fa47681f8cf22fcc751a944326bfbd16f437a55
+  data.tar.gz: 270f29030b412fb937c33c04e00069982c48e3c9
 SHA512:
-  metadata.gz: 961fed20bdf8f9227f735b58fa5fd0f29566ca57396f45eaf7c9779749a2f637510b65187064e0b607d64847572a447729d9c56df08df2317a1e1814d787c3f8
-  data.tar.gz: d1b7c56bc92cc95e8308dd35bdd365d457217bf0e272f2cedd3d6cf625b8f1c715e0687859be8e005c1f828f3df00f6a150dc7d5f37a271cf508741f19e473cd
+  metadata.gz: a721f818961659f9d3337573c52da0414db81040d223830f5ca05d8fda59035f4580de17bab411331ea7939bf98795fe60a8d25bd2fa8375b25370f74cee4551
+  data.tar.gz: 5ba8046de966775866b9015f3506aa4d9d6a6c2e8a83536adc847a31b94754a395fec203530367b95bed518f481bff689e6c52d80f0c34758ca72908d888eee8

data/.travis.yml

@@ -1,6 +1,6 @@
 sudo: false
 language: ruby
-rvm: 2.2.5
+rvm: 2.3.1
 services:
   - mongodb
 before_install:
@@ -23,6 +23,7 @@ gemfile:
   - test/gemfiles/mongoid3.gemfile
   - test/gemfiles/mongoid4.gemfile
   - test/gemfiles/mongoid5.gemfile
+  - test/gemfiles/mongoid6.gemfile
 env:
   - ELASTICSEARCH_VERSION=5.1.1
 jdk: oraclejdk8

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.5.1
+
+- Added `client_options`
+- Added `refresh` option to `reindex` method
+- Improved syntax for partial reindex
+
 ## 1.5.0
 
 - Added support for geo shape indexing and queries

data/README.md

@@ -343,7 +343,7 @@ You can change this with:
 Product.search "zucini", misspellings: {edit_distance: 2} # zucchini
 ```
 
-To improve performance for correctly spelled queries (which should be a majority for most applications), Searchkick can first perform a search without misspellings, and if there are too few results, perform another with them.
+To prevent poor precision and improve performance for correctly spelled queries (which should be a majority for most applications), Searchkick can first perform a search without misspellings, and if there are too few results, perform another with them.
 
 ```ruby
 Product.search "zuchini", misspellings: {below: 5}
@@ -575,7 +575,7 @@ end
 Reindex and search with:
 
 ```ruby
-Book.search "tipping poi"
+Book.search "tipping poi", match: :word_start
 ```
 
 Typically, you want to use a JavaScript library like [typeahead.js](http://twitter.github.io/typeahead.js/) or [jQuery UI](http://jqueryui.com/autocomplete/).
@@ -926,25 +926,9 @@ class City < ActiveRecord::Base
 end
 ```
 
-The `geo_shape` hash is passed through to Elasticsearch without modification. Please see the [geo shape documentation](https://www.elastic.co/guide/en/elasticsearch/reference/current/geo-shape.html) for options.
+See the [Elasticsearch documentation](https://www.elastic.co/guide/en/elasticsearch/reference/current/geo-shape.html) for details.
 
-Any geospatial data type can be held in the index or give as a search query. It is up to you to ensure that it is a valid GeoJSON representation. Possible shapes are:
-
-* **point**: single lat/lon pair
-* **multipoint**: array of points
-* **linestring**: array of at least two lat/lon pairs
-* **multilinestring**: array of lines
-* **polygon**: an array of paths, each being an array of at least four lat/lon pairs whose first and last points are the same. Paths after the first represent exclusions. Elasticsearch will return an error if a polygon contains two consecutive identical points, intersects itself or is not closed.
-* **multipolygon**: array of polygons
-* **envelope**: a bounding box defined by top left and bottom right points
-* **circle**: a bounding circle defined by center point and radius
-* **geometrycollection**: an array of separate GeoJSON objects possibly of various types
-
-See the [Elasticsearch documentation](https://www.elastic.co/guide/en/elasticsearch/reference/current/geo-shape.html) for details. GeoJSON coordinates are usually given as an array of `[lon, lat]` points but searchkick can also take objects with `lon` and `lat` keys.
-
-Once a geo shape index is established, you can include a geo shape filter in any search. This also takes a GeoJSON shape and will return a list of items based on their overlap with that shape.
-
-Find shapes (of any kind) intersecting with the query shape
+Find shapes intersecting with the query shape
 
 ```ruby
 City.search "san", where: {bounds: {geo_shape: {type: "polygon", coordinates: [[{lat: 38, lon: -123}, ...]]}}}
@@ -968,26 +952,6 @@ Containing the query shape (Elasticsearch 2.2+)
 City.search "san", where: {bounds: {geo_shape: {type: "envelope", relation: "contains", coordinates: [{lat: 38, lon: -123}, {lat: 37, lon: -122}]}}}
 ```
 
-### Routing
-
-Searchkick supports [Elasticsearch’s routing feature](https://www.elastic.co/blog/customizing-your-document-routing).
-
-```ruby
-class Business < ActiveRecord::Base
-  searchkick routing: true
-
-  def search_routing
-    city_id
-  end
-end
-```
-
-Reindex and search with:
-
-```ruby
-Business.search "ice cream", routing: params[:city_id]
-```
-
 ## Inheritance
 
 Searchkick supports single table inheritance.
@@ -1137,7 +1101,37 @@ Then deploy and reindex:
 rake searchkick:reindex CLASS=Product
 ```
 
-### Performance
+### Automatic Failover
+
+Create an initializer `config/initializers/elasticsearch.rb` with multiple hosts:
+
+```ruby
+ENV["ELASTICSEARCH_URL"] = "http://localhost:9200,http://localhost:9201"
+
+Searchkick.client_options = {
+  retry_on_failure: true
+}
+```
+
+See [elasticsearch-transport](https://github.com/elastic/elasticsearch-ruby/blob/master/elasticsearch-transport) for a complete list of options.
+
+### Lograge
+
+Add the following to `config/environments/production.rb`:
+
+```ruby
+config.lograge.custom_options = lambda do |event|
+  options = {}
+  options[:search] = event.payload[:searchkick_runtime] if event.payload[:searchkick_runtime].to_f > 0
+  options
+end
+```
+
+See [Production Rails](https://github.com/ankane/production_rails) for other good practices.
+
+## Performance
+
+### Persistent HTTP Connections
 
 For the best performance, add [Typhoeus](https://github.com/typhoeus/typhoeus) to your Gemfile.
 
@@ -1145,38 +1139,53 @@ For the best performance, add [Typhoeus](https://github.com/typhoeus/typhoeus) t
 gem 'typhoeus'
 ```
 
-And create an initializer with:
+And create an initializer to reduce log noise with:
 
 ```ruby
-require "typhoeus/adapters/faraday"
-Ethon.logger.level = Logger::WARN
+Ethon.logger = Logger.new("/dev/null")
 ```
 
 If you run into issues on Windows, check out [this post](https://www.rastating.com/fixing-issues-in-typhoeus-and-httparty-on-windows/).
 
-### Automatic Failover
+### Searchable Fields
 
-Create an initializer `config/initializers/elasticsearch.rb` with multiple hosts:
+By default, all string fields are searchable. Speed up indexing and reduce index size by only making some fields searchable.
 
 ```ruby
-Searchkick.client = Elasticsearch::Client.new(hosts: ["localhost:9200", "localhost:9201"], retry_on_failure: true)
+class Product < ActiveRecord::Base
+  searchkick searchable: [:name]
+end
 ```
 
-See [elasticsearch-transport](https://github.com/elastic/elasticsearch-ruby/blob/master/elasticsearch-transport) for a complete list of options.
+### Filterable Fields
 
-### Lograge
+By default, all fields are filterable (can be used in `where` option). Speed up indexing and reduce index size by only making some fields filterable.
 
-Add the following to `config/environments/production.rb`:
+```ruby
+class Product < ActiveRecord::Base
+  searchkick filterable: [:store_id]
+end
+```
+
+### Routing
+
+Searchkick supports [Elasticsearch’s routing feature](https://www.elastic.co/blog/customizing-your-document-routing).
 
 ```ruby
-config.lograge.custom_options = lambda do |event|
-  options = {}
-  options[:search] = event.payload[:searchkick_runtime] if event.payload[:searchkick_runtime].to_f > 0
-  options
+class Business < ActiveRecord::Base
+  searchkick routing: true
+
+  def search_routing
+    city_id
+  end
 end
 ```
 
-See [Production Rails](https://github.com/ankane/production_rails) for other good practices.
+Reindex and search with:
+
+```ruby
+Business.search "ice cream", routing: params[:city_id]
+```
 
 ## Advanced
 
@@ -1271,7 +1280,7 @@ indices_boost: {Category => 2, Product => 1}
 To query nested data, use dot notation.
 
 ```ruby
-User.search "*", where: {"address.zip_code" => 12345}
+User.search "san", fields: ["address.city"], where: {"address.zip_code" => 12345}
 ```
 
 ## Reference
@@ -1304,7 +1313,7 @@ Product.where("id > 100000").find_in_batches do |batch|
 end
 ```
 
-Reindex a subset of attributes
+Reindex a subset of attributes (partial reindex)
 
 ```ruby
 class Product < ActiveRecord::Base
@@ -1316,13 +1325,13 @@ class Product < ActiveRecord::Base
   end
 end
 
-Product.partial_reindex(:search_prices)
+Product.reindex(:search_prices)
 ```
 
 Remove old indices
 
 ```ruby
-Product.clean_indices
+Product.searchkick_index.clean_indices
 ```
 
 Use custom settings
@@ -1369,7 +1378,7 @@ class Product < ActiveRecord::Base
   def search_data
     {
       name: name,
-      unique_user_conversions: searches.group(:query).uniq.count(:user_id)
+      unique_user_conversions: searches.group(:query).uniq.count(:user_id),
       # {"ice cream" => 234, "chocolate" => 67, "cream" => 2}
       total_conversions: searches.group(:query).count
       # {"ice cream" => 412, "chocolate" => 117, "cream" => 6}
@@ -1419,11 +1428,11 @@ class Product < ActiveRecord::Base
 end
 ```
 
-Use [Okapi BM25](https://www.elastic.co/guide/en/elasticsearch/guide/current/pluggable-similarites.html) for ranking
+Use a different [similarity algorithm](https://www.elastic.co/guide/en/elasticsearch/reference/current/index-modules-similarity.html) for scoring
 
 ```ruby
 class Product < ActiveRecord::Base
-  searchkick similarity: "BM25"
+  searchkick similarity: "classic"
 end
 ```
 
@@ -1454,14 +1463,6 @@ Add [request parameters](https://www.elastic.co/guide/en/elasticsearch/reference
 Product.search("carrots", request_params: {search_type: "dfs_query_then_fetch"})
 ```
 
-Make fields unsearchable but include in the source
-
-```ruby
-class Product < ActiveRecord::Base
-  searchkick unsearchable: [:color]
-end
-```
-
 Reindex conditionally
 
 **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)
@@ -1471,7 +1472,7 @@ class Product < ActiveRecord::Base
   searchkick callbacks: false
 
   # add the callbacks manually
-  after_save :reindex, if: proc{|model| model.name_changed? } # use your own condition
+  after_save :reindex, if: -> (model) { model.name_changed? } # use your own condition
   after_destroy :reindex
 end
 ```
@@ -1508,7 +1509,6 @@ This section could use some love.
 describe Product do
   it "searches" do
     Product.reindex
-    Product.searchkick_index.refresh # don't forget this
     # test goes here...
   end
 end
@@ -1518,44 +1518,13 @@ end
 
 ```ruby
 product = FactoryGirl.create(:product)
-product.reindex # don't forget this
-Product.searchkick_index.refresh # or this
+product.reindex(refresh: true)
 ```
 
 ## Multi-Tenancy
 
 Check out [this great post](https://www.tiagoamaro.com.br/2014/12/11/multi-tenancy-with-searchkick/) on the [Apartment](https://github.com/influitive/apartment) gem. Follow a similar pattern if you use another gem.
 
-## Migrating from Tire
-
-1. Change `search` methods to `tire.search` and add index name in existing search calls
-
-  ```ruby
-  Product.search "fruit"
-  ```
-
-  should be replaced with
-
-  ```ruby
-  Product.tire.search "fruit", index: "products"
-  ```
-
-2. Replace tire mapping w/ searchkick method
-
-  ```ruby
-  class Product < ActiveRecord::Base
-    searchkick
-  end
-  ```
-
-3. Deploy and reindex
-
-  ```ruby
-  rake searchkick:reindex CLASS=Product # or Product.reindex in the console
-  ```
-
-4. Once it finishes, replace search calls w/ searchkick calls
-
 ## Upgrading
 
 View the [changelog](https://github.com/ankane/searchkick/blob/master/CHANGELOG.md).

data/lib/searchkick.rb

@@ -4,6 +4,7 @@ require "hashie"
 require "searchkick/version"
 require "searchkick/index_options"
 require "searchkick/index"
+require "searchkick/indexer"
 require "searchkick/results"
 require "searchkick/query"
 require "searchkick/reindex_job"
@@ -11,6 +12,7 @@ require "searchkick/model"
 require "searchkick/tasks"
 require "searchkick/middleware"
 require "searchkick/logging" if defined?(ActiveSupport::Notifications)
+require "active_support/core_ext/hash/deep_merge"
 
 # background jobs
 begin
@@ -29,7 +31,7 @@ module Searchkick
   class ImportError < Error; end
 
   class << self
-    attr_accessor :search_method_name, :wordnet_path, :timeout, :models
+    attr_accessor :search_method_name, :wordnet_path, :timeout, :models, :client_options
     attr_writer :client, :env, :search_timeout
     attr_reader :aws_credentials
   end
@@ -37,15 +39,16 @@ module Searchkick
   self.wordnet_path = "/var/lib/wn_s.pl"
   self.timeout = 10
   self.models = []
+  self.client_options = {}
 
   def self.client
     @client ||= begin
       require "typhoeus/adapters/faraday" if defined?(Typhoeus)
 
-      Elasticsearch::Client.new(
+      Elasticsearch::Client.new({
         url: ENV["ELASTICSEARCH_URL"],
         transport_options: {request: {timeout: timeout}, headers: {content_type: "application/json"}}
-      ) do |f|
+      }.deep_merge(client_options)) do |f|
         f.use Searchkick::Middleware
         f.request :aws_signers_v4, {
           credentials: Aws::Credentials.new(aws_credentials[:access_key_id], aws_credentials[:secret_access_key]),
@@ -72,6 +75,28 @@ module Searchkick
     Gem::Version.new(server_version.sub("-", ".")) < Gem::Version.new(version.sub("-", "."))
   end
 
+  def self.search(term = nil, options = {}, &block)
+    query = Searchkick::Query.new(nil, term, options)
+    block.call(query.body) if block
+    if options[:execute] == false
+      query
+    else
+      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
+
+  # callbacks
+
   def self.enable_callbacks
     self.callbacks_value = nil
   end
@@ -90,7 +115,7 @@ module Searchkick
       begin
         self.callbacks_value = value
         yield
-        perform_bulk if callbacks_value == :bulk
+        indexer.perform if callbacks_value == :bulk
       ensure
         self.callbacks_value = previous_value
       end
@@ -106,39 +131,8 @@ module Searchkick
   end
 
   # private
-  def self.queue_items(items)
-    queued_items.concat(items)
-    perform_bulk unless callbacks_value == :bulk
-  end
-
-  # private
-  def self.perform_bulk
-    items = queued_items
-    clear_queued_items
-    perform_items(items)
-  end
-
-  # private
-  def self.perform_items(items)
-    if items.any?
-      response = client.bulk(body: items)
-      if response["errors"]
-        first_with_error = response["items"].map do |item|
-          (item["index"] || item["delete"] || item["update"])
-        end.find { |item| item["error"] }
-        raise Searchkick::ImportError, "#{first_with_error["error"]} on item with id '#{first_with_error["_id"]}'"
-      end
-    end
-  end
-
-  # private
-  def self.queued_items
-    Thread.current[:searchkick_queued_items] ||= []
-  end
-
-  # private
-  def self.clear_queued_items
-    Thread.current[:searchkick_queued_items] = []
+  def self.indexer
+    Thread.current[:searchkick_indexer] ||= Searchkick::Indexer.new
   end
 
   # private
@@ -150,26 +144,6 @@ module Searchkick
   def self.callbacks_value=(value)
     Thread.current[:searchkick_callbacks_enabled] = value
   end
-
-  def self.search(term = nil, options = {}, &block)
-    query = Searchkick::Query.new(nil, term, options)
-    block.call(query.body) if block
-    if options[:execute] == false
-      query
-    else
-      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

@@ -9,8 +9,8 @@ module Searchkick
       @options = options
     end
 
-    def create(options = {})
-      client.indices.create index: name, body: options
+    def create(body = {})
+      client.indices.create index: name, body: body
     end
 
     def delete
@@ -59,16 +59,16 @@ module Searchkick
     end
 
     def bulk_delete(records)
-      Searchkick.queue_items(records.reject { |r| r.id.blank? }.map { |r| {delete: record_data(r)} })
+      Searchkick.indexer.queue(records.reject { |r| r.id.blank? }.map { |r| {delete: record_data(r)} })
     end
 
     def bulk_index(records)
-      Searchkick.queue_items(records.map { |r| {index: record_data(r).merge(data: search_data(r))} })
+      Searchkick.indexer.queue(records.map { |r| {index: record_data(r).merge(data: search_data(r))} })
     end
     alias_method :import, :bulk_index
 
     def bulk_update(records, method_name)
-      Searchkick.queue_items(records.map { |r| {update: record_data(r).merge(data: {doc: search_data(r, method_name)})} })
+      Searchkick.indexer.queue(records.map { |r| {update: record_data(r).merge(data: {doc: search_data(r, method_name)})} })
     end
 
     def record_data(r)
@@ -257,7 +257,16 @@ module Searchkick
     end
 
     def import_or_update(records, method_name)
-      method_name ? bulk_update(records, method_name) : import(records)
+      retries = 0
+      begin
+        method_name ? bulk_update(records, method_name) : import(records)
+      rescue Faraday::ClientError => e
+        if retries < 1
+          retries += 1
+          retry
+        end
+        raise e
+      end
     end
 
     # other

data/lib/searchkick/index_options.rb

@@ -336,9 +336,12 @@ module Searchkick
             dynamic_fields["{name}"].merge(fields: dynamic_fields.except("{name}"))
           end
 
+        # TODO make dynamic
+        all_enabled = true
+
         mappings = {
           _default_: {
-            _all: {type: default_type, index: "analyzed", analyzer: default_analyzer},
+            _all: all_enabled ? {type: default_type, index: "analyzed", analyzer: default_analyzer} : {enabled: false},
             properties: mapping,
             _routing: routing,
             # https://gist.github.com/kimchy/2898285

data/lib/searchkick/indexer.rb

@@ -0,0 +1,28 @@
+module Searchkick
+  class Indexer
+    attr_reader :queued_items
+
+    def initialize
+      @queued_items = []
+    end
+
+    def queue(items)
+      @queued_items.concat(items)
+      perform unless Searchkick.callbacks_value == :bulk
+    end
+
+    def perform
+      items = @queued_items
+      @queued_items = []
+      if items.any?
+        response = Searchkick.client.bulk(body: items)
+        if response["errors"]
+          first_with_error = response["items"].map do |item|
+            (item["index"] || item["delete"] || item["update"])
+          end.find { |item| item["error"] }
+          raise Searchkick::ImportError, "#{first_with_error["error"]} on item with id '#{first_with_error["_id"]}'"
+        end
+      end
+    end
+  end
+end

data/lib/searchkick/logging.rb

@@ -58,22 +58,12 @@ 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
+  module IndexerWithInstrumentation
+    def perform
+      if Searchkick.callbacks_value == :bulk
         event = {
           name: "Bulk",
-          count: items.size
+          count: queued_items.size
         }
         ActiveSupport::Notifications.instrument("request.searchkick", event) do
           super
@@ -84,6 +74,18 @@ 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
+  end
+
   # https://github.com/rails/rails/blob/master/activerecord/lib/active_record/log_subscriber.rb
   class LogSubscriber < ActiveSupport::LogSubscriber
     def self.runtime=(value)
@@ -178,6 +180,7 @@ module Searchkick
 end
 Searchkick::Query.send(:prepend, Searchkick::QueryWithInstrumentation)
 Searchkick::Index.send(:prepend, Searchkick::IndexWithInstrumentation)
+Searchkick::Indexer.send(:prepend, Searchkick::IndexerWithInstrumentation)
 Searchkick.singleton_class.send(:prepend, Searchkick::SearchkickWithInstrumentation)
 Searchkick::LogSubscriber.attach_to :searchkick
 ActiveSupport.on_load(:action_controller) do

data/lib/searchkick/model.rb

@@ -43,21 +43,25 @@ module Searchkick
             class_variable_get(:@@searchkick_callbacks) && Searchkick.callbacks?
           end
 
-          def searchkick_reindex(options = {})
-            unless options[:accept_danger]
-              if (respond_to?(:current_scope) && respond_to?(:default_scoped) && current_scope && current_scope.to_sql != default_scoped.to_sql) ||
-                (respond_to?(:queryable) && queryable != unscoped.with_default_scope)
-                raise Searchkick::DangerousOperation, "Only call reindex on models, not relations. Pass `accept_danger: true` if this is your intention."
+          def searchkick_reindex(method_name = nil, **options)
+            if method_name
+              searchkick_index.import_scope(searchkick_klass, method_name: method_name)
+              searchkick_index.refresh
+              true
+            else
+              unless options[:accept_danger]
+                if (respond_to?(:current_scope) && respond_to?(:default_scoped) && current_scope && current_scope.to_sql != default_scoped.to_sql) ||
+                  (respond_to?(:queryable) && queryable != unscoped.with_default_scope)
+                  raise Searchkick::DangerousOperation, "Only call reindex on models, not relations. Pass `accept_danger: true` if this is your intention."
+                end
               end
+              searchkick_index.reindex_scope(searchkick_klass, options)
             end
-            searchkick_index.reindex_scope(searchkick_klass, options)
           end
           alias_method :reindex, :searchkick_reindex unless method_defined?(:reindex)
 
           def searchkick_partial_reindex(method_name)
-            searchkick_index.import_scope(searchkick_klass, method_name: method_name)
-            searchkick_index.refresh
-            true
+            searchkick_reindex(method_name)
           end
           alias_method :partial_reindex, :searchkick_partial_reindex unless method_defined?(:partial_reindex)
 
@@ -93,8 +97,13 @@ module Searchkick
           after_destroy callback_name, if: proc { self.class.search_callbacks? }
         end
 
-        def reindex
-          self.class.searchkick_index.reindex_record(self)
+        def reindex(method_name = nil, **options)
+          if method_name
+            self.class.searchkick_index.bulk_update([self], method_name)
+          else
+            self.class.searchkick_index.reindex_record(self)
+          end
+          self.class.searchkick_index.refresh if options[:refresh]
         end unless method_defined?(:reindex)
 
         def reindex_async
@@ -102,8 +111,7 @@ module Searchkick
         end unless method_defined?(:reindex_async)
 
         def partial_reindex(method_name)
-          self.class.searchkick_index.bulk_update([self], method_name)
-          self.class.searchkick_index.refresh
+          reindex(method_name, refresh: true)
           true
         end unless method_defined?(:partial_reindex)
 

data/lib/searchkick/version.rb

@@ -1,3 +1,3 @@
 module Searchkick
-  VERSION = "1.5.0"
+  VERSION = "1.5.1"
 end

data/test/boost_test.rb

@@ -164,6 +164,6 @@ class BoostTest < Minitest::Test
     store_names ["Rex"], Animal
     store_names ["Rexx"], Product
 
-    assert_order "Rex", ["Rexx", "Rex"], {index_name: [Animal, Product], indices_boost: {Animal => 1, Product => 200}}, Store
+    assert_order "Rex", ["Rexx", "Rex"], {index_name: [Animal, Product], indices_boost: {Animal => 1, Product => 200}, fields: [:name]}, Store
   end
 end

data/test/gemfiles/mongoid6.gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in searchkick.gemspec
+gemspec path: "../../"
+
+gem "mongoid", "~> 6.0.0"

data/test/highlight_test.rb

@@ -41,10 +41,10 @@ class HighlightTest < Minitest::Test
     assert_equal "&lt;b&gt;<em>Hello</em>&lt;&#x2F;b&gt;", Product.search("hello", fields: [:name], highlight: {encoder: "html"}, misspellings: false).with_details.first[1][:highlight][:name]
   end
 
-  def test_json
+  def test_body
     skip if ENV["MATCH"] == "word_start"
     store_names ["Two Door Cinema Club"]
-    json = {
+    body = {
       query: {
         match: {
           "name.analyzed" => "cinema"
@@ -58,6 +58,6 @@ class HighlightTest < Minitest::Test
         }
       }
     }
-    assert_equal "Two Door <strong>Cinema</strong> Club", Product.search(json: json).with_details.first[1][:highlight][:"name.analyzed"]
+    assert_equal "Two Door <strong>Cinema</strong> Club", Product.search(body: body).with_details.first[1][:highlight][:"name.analyzed"]
   end
 end

data/test/index_test.rb

@@ -93,7 +93,7 @@ class IndexTest < Minitest::Test
   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
@@ -103,8 +103,8 @@ class IndexTest < Minitest::Test
     end
   end
 
-  def test_invalid_query
-    assert_raises(Searchkick::InvalidQueryError) { Product.search(query: {boom: true}) }
+  def test_invalid_body
+    assert_raises(Searchkick::InvalidQueryError) { Product.search(body: {boom: true}) }
   end
 
   def test_transaction

data/test/partial_reindex_test.rb

@@ -22,7 +22,7 @@ class PartialReindexTest < Minitest::Test
     assert_search "blue", ["Hi"], fields: [:color], load: false
 
     # partial reindex
-    Product.partial_reindex(:search_name)
+    Product.reindex(:search_name)
 
     # name updated, but not color
     assert_search "bye", ["Bye"], fields: [:name], load: false
@@ -49,7 +49,7 @@ class PartialReindexTest < Minitest::Test
     assert_search "hi", ["Hi"], fields: [:name], load: false
     assert_search "blue", ["Hi"], fields: [:color], load: false
 
-    product.partial_reindex(:search_name)
+    product.reindex(:search_name, refresh: true)
 
     # name updated, but not color
     assert_search "bye", ["Bye"], fields: [:name], load: false

data/test/sql_test.rb

@@ -76,9 +76,9 @@ class SqlTest < Minitest::Test
     assert_equal "Product A", Product.search("product", load: false).first.name
   end
 
-  def test_load_false_with_include
+  def test_load_false_with_includes
     store_names ["Product A"]
-    assert_kind_of Hash, Product.search("product", load: false, include: [:store]).first
+    assert_kind_of Hash, Product.search("product", load: false, includes: [:store]).first
   end
 
   def test_load_false_nested_object
@@ -227,16 +227,15 @@ class SqlTest < Minitest::Test
   # nested
 
   def test_nested_search
-    skip
-    store [{name: "Product A", aisle: {"id" => 1, "name" => "Frozen"}}]
-    assert_search "frozen", ["Product A"], fields: ["aisle.name"], debug: true
+    store [{name: "Product A", aisle: {"id" => 1, "name" => "Frozen"}}], Speaker
+    assert_search "frozen", ["Product A"], {fields: ["aisle.name"]}, Speaker
   end
 
   # other tests
 
-  def test_include
+  def test_includes
     skip unless defined?(ActiveRecord)
     store_names ["Product A"]
-    assert Product.search("product", include: [:store]).first.association(:store).loaded?
+    assert Product.search("product", includes: [:store]).first.association(:store).loaded?
   end
 end

data/test/test_helper.rb

@@ -268,6 +268,7 @@ else
   end
 
   class Product < ActiveRecord::Base
+    belongs_to :store
   end
 
   class Store < ActiveRecord::Base
@@ -291,8 +292,6 @@ else
 end
 
 class Product
-  belongs_to :store
-
   searchkick \
     synonyms: [
       ["clorox", "bleach"],
@@ -317,6 +316,7 @@ class Product
     word_end: [:name],
     highlight: [:name],
     searchable: [:name, :color],
+    default_fields: [:name, :color],
     filterable: [:name, :color, :description],
     # unsearchable: [:description],
     # only_analyzed: [:alt_description],
@@ -388,12 +388,13 @@ class Speaker
   searchkick \
     conversions: ["conversions_a", "conversions_b"]
 
-  attr_accessor :conversions_a, :conversions_b
+  attr_accessor :conversions_a, :conversions_b, :aisle
 
   def search_data
     serializable_hash.except("id").merge(
       conversions_a: conversions_a,
-      conversions_b: conversions_b
+      conversions_b: conversions_b,
+      aisle: aisle
     )
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: searchkick
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-23 00:00:00.000000000 Z
+date: 2016-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -111,6 +111,7 @@ files:
 - lib/searchkick.rb
 - lib/searchkick/index.rb
 - lib/searchkick/index_options.rb
+- lib/searchkick/indexer.rb
 - lib/searchkick/logging.rb
 - lib/searchkick/middleware.rb
 - lib/searchkick/model.rb
@@ -139,6 +140,7 @@ files:
 - test/gemfiles/mongoid3.gemfile
 - test/gemfiles/mongoid4.gemfile
 - test/gemfiles/mongoid5.gemfile
+- test/gemfiles/mongoid6.gemfile
 - test/gemfiles/nobrainer.gemfile
 - test/geo_shape_test.rb
 - test/highlight_test.rb
@@ -209,6 +211,7 @@ test_files:
 - test/gemfiles/mongoid3.gemfile
 - test/gemfiles/mongoid4.gemfile
 - test/gemfiles/mongoid5.gemfile
+- test/gemfiles/mongoid6.gemfile
 - test/gemfiles/nobrainer.gemfile
 - test/geo_shape_test.rb
 - test/highlight_test.rb