searchkick 2.3.2 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f081bd9d81b729d9bd3610154f95aeb355684f8
-  data.tar.gz: 88702f0b0417396e58697bd86919b92f716d470b
+  metadata.gz: 4bbb1863e16cb46d246eb067805b4a2cc1471c68
+  data.tar.gz: ea1bc2af0dcb8eb2e059aae9586697086a3cbc0e
 SHA512:
-  metadata.gz: bbebeb45ba1cff82280c6d0eab7f25ac42dbc6f22b600a23f583b4da36fa6e42a4ebab6d9e149087192ca765dd75aadd5eaa4fb3b5add5e8ce3613ff8f91a85f
-  data.tar.gz: d643fbc24e36968f2820b92875a28fbf215e68d752717d4d2fa8a8fcd7efa32009f03a4c8a983d88666ab7c18e2602e58895f6c36e4934b651c0a838ae4f45ab
+  metadata.gz: 50d82877150dc9a875e8d67539f1992d29870b8cef227b7e81eb1c05f8e6e8346b952914035af8d2b1b5177cd8c730f5e55eb57c0a725feeaf0a2d6bfad6a29a
+  data.tar.gz: 45bea9181b909710ff9f446df5151f536e002caf11249d3d53c40ea7a1eecb465e797acf896c23ab15fc9b54f7028ce9d0244c1680dcb6f5281d7f3dc4f6d754

data/.travis.yml

@@ -1,6 +1,6 @@
 sudo: false
 language: ruby
-rvm: 2.3.1
+rvm: 2.4.2
 services:
   - mongodb
   - redis-server
@@ -20,7 +20,7 @@ gemfile:
   - test/gemfiles/mongoid5.gemfile
   - test/gemfiles/mongoid6.gemfile
 env:
-  - ELASTICSEARCH_VERSION=5.5.0
+  - ELASTICSEARCH_VERSION=6.0.0
 jdk: oraclejdk8
 matrix:
   include:
@@ -28,12 +28,11 @@ matrix:
       env: ELASTICSEARCH_VERSION=2.0.0
       jdk: oraclejdk7
     - gemfile: Gemfile
-      env: ELASTICSEARCH_VERSION=2.4.3
+      env: ELASTICSEARCH_VERSION=2.4.6
       jdk: oraclejdk7
     - gemfile: Gemfile
       env: ELASTICSEARCH_VERSION=5.0.1
       jdk: oraclejdk8
-  allow_failures:
     - gemfile: Gemfile
-      env: ELASTICSEARCH_VERSION=6.0.0-beta1
+      env: ELASTICSEARCH_VERSION=5.6.4
       jdk: oraclejdk8

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 2.4.0
+
+- Fixed `similar` for Elasticsearch 6
+- Added `inheritance` option
+- Added `_type` option
+- Fixed `Must specify fields to search` error when searching `*`
+
 ## 2.3.2
 
 - Added `_all` and `default_fields` options

data/README.md

@@ -54,12 +54,12 @@ Add this line to your application’s Gemfile:
 gem 'searchkick'
 ```
 
-The latest version works with Elasticsearch 2 and 5. For Elasticsearch 1, use version 1.5.1 and [this readme](https://github.com/ankane/searchkick/blob/v1.5.1/README.md).
+The latest version works with Elasticsearch 2, 5, and 6. For Elasticsearch 1, use version 1.5.1 and [this readme](https://github.com/ankane/searchkick/blob/v1.5.1/README.md).
 
 Add searchkick to models you want to search.
 
 ```ruby
-class Product < ActiveRecord::Base
+class Product < ApplicationRecord
   searchkick
 end
 ```
@@ -73,7 +73,7 @@ Product.reindex
 And to query, use:
 
 ```ruby
-products = Product.search "apples"
+products = Product.search("apples", fields: [:name])
 products.each do |product|
   puts product.name
 end
@@ -130,6 +130,8 @@ Select
 select: [:name]
 ```
 
+[These source filtering options are supported](https://www.elastic.co/guide/en/elasticsearch/reference/current/search-request-source-filtering.html)
+
 ### Results
 
 Searches return a `Searchkick::Results` object. This responds like an array to most methods.
@@ -236,7 +238,7 @@ Product.search "fresh honey", operator: "or" # fresh OR honey
 By default, results must match the entire word - `back` will not match `backpack`. You can change this behavior with:
 
 ```ruby
-class Product < ActiveRecord::Base
+class Product < ApplicationRecord
   searchkick word_start: [:name]
 end
 ```
@@ -261,7 +263,7 @@ Available options are:
 
 ### Exact Matches
 
-To match a field exactly (case-insensitive), use:
+To match a field exactly (case-sensitive), use:
 
 ```ruby
 User.search query, fields: [{email: :exact}, :name]
@@ -280,7 +282,7 @@ User.search "fresh honey", match: :phrase
 Searchkick defaults to English for stemming. To change this, use:
 
 ```ruby
-class Product < ActiveRecord::Base
+class Product < ApplicationRecord
   searchkick language: "german"
 end
 ```
@@ -290,7 +292,7 @@ end
 ### Synonyms
 
 ```ruby
-class Product < ActiveRecord::Base
+class Product < ApplicationRecord
   searchkick synonyms: [["scallion", "green onion"], ["qtip", "cotton swab"]]
 end
 ```
@@ -314,7 +316,7 @@ synonyms: ["lightbulb => halogenlamp"]
 The above approach works well when your synonym list is static, but in practice, this is often not the case. When you analyze search conversions, you often want to add new synonyms or tags without a full reindex. You can use a library like [ActsAsTaggableOn](https://github.com/mbleigh/acts-as-taggable-on) and do:
 
 ```ruby
-class Product < ActiveRecord::Base
+class Product < ApplicationRecord
   acts_as_taggable
   scope :search_import, -> { includes(:tags) }
 
@@ -348,7 +350,7 @@ mv prolog/wn_s.pl /var/lib
 Tell each model to use it:
 
 ```ruby
-class Product < ActiveRecord::Base
+class Product < ApplicationRecord
   searchkick wordnet: true
 end
 ```
@@ -417,7 +419,7 @@ Product.search "🍨🍰", emoji: true
 Control what data is indexed with the `search_data` method. Call `Product.reindex` after changing this method.
 
 ```ruby
-class Product < ActiveRecord::Base
+class Product < ApplicationRecord
   belongs_to :department
 
   def search_data
@@ -433,7 +435,7 @@ end
 Searchkick uses `find_in_batches` to import documents. To eager load associations, use the `search_import` scope.
 
 ```ruby
-class Product < ActiveRecord::Base
+class Product < ApplicationRecord
   scope :search_import, -> { includes(:department) }
 end
 ```
@@ -441,7 +443,7 @@ end
 By default, all records are indexed. To control which records are indexed, use the `should_index?` method together with the `search_import` scope.
 
 ```ruby
-class Product < ActiveRecord::Base
+class Product < ApplicationRecord
   scope :search_import, -> { where(active: true) }
 
   def should_index?
@@ -483,7 +485,7 @@ There are four strategies for keeping the index synced with your database.
   Use background jobs for better performance
 
   ```ruby
-  class Product < ActiveRecord::Base
+  class Product < ApplicationRecord
     searchkick callbacks: :async
   end
   ```
@@ -499,7 +501,7 @@ There are four strategies for keeping the index synced with your database.
   Turn off automatic syncing
 
   ```ruby
-  class Product < ActiveRecord::Base
+  class Product < ApplicationRecord
     searchkick callbacks: false
   end
   ```
@@ -525,7 +527,7 @@ end
 Data is **not** automatically synced when an association is updated. If this is desired, add a callback to reindex:
 
 ```ruby
-class Image < ActiveRecord::Base
+class Image < ApplicationRecord
   belongs_to :product
 
   after_commit :reindex_product
@@ -564,7 +566,7 @@ You do **not** need to clean up the search queries. Searchkick automatically tre
 Next, add conversions to the index.
 
 ```ruby
-class Product < ActiveRecord::Base
+class Product < ApplicationRecord
   has_many :searches, class_name: "Searchjoy::Search", as: :convertable
 
   searchkick conversions: ["conversions"] # name of field
@@ -592,7 +594,7 @@ rake searchkick:reindex CLASS=Product
 Order results differently for each user. For example, show a user’s previously purchased products before other results.
 
 ```ruby
-class Product < ActiveRecord::Base
+class Product < ApplicationRecord
   def search_data
     {
       name: name,
@@ -621,7 +623,7 @@ Autocomplete predicts what a user will type, making the search experience faster
 First, specify which fields use this feature. This is necessary since autocomplete can increase the index size significantly, but don’t worry - this gives you blazing faster queries.
 
 ```ruby
-class Movie < ActiveRecord::Base
+class Movie < ApplicationRecord
   searchkick word_start: [:title, :director]
 end
 ```
@@ -681,7 +683,7 @@ Then add the search box and JavaScript code to a view.
 ![Suggest](https://raw.githubusercontent.com/ankane/searchkick/gh-pages/recursion.png)
 
 ```ruby
-class Product < ActiveRecord::Base
+class Product < ApplicationRecord
   searchkick suggest: [:name] # fields to generate suggestions
 end
 ```
@@ -819,7 +821,7 @@ Product.search "pear", aggs: {products_per_year: {date_histogram: {field: :creat
 Specify which fields to index with highlighting.
 
 ```ruby
-class Product < ActiveRecord::Base
+class Product < ApplicationRecord
   searchkick highlight: [:name]
 end
 ```
@@ -872,7 +874,7 @@ product.similar(fields: [:name], where: {size: "12 oz"})
 ### Geospatial Searches
 
 ```ruby
-class Restaurant < ActiveRecord::Base
+class Restaurant < ApplicationRecord
   searchkick locations: [:location]
 
   def search_data
@@ -918,7 +920,7 @@ Restaurant.search "wings", boost_by_distance: {location: {origin: {lat: 37, lon:
 You can also index and search geo shapes.
 
 ```ruby
-class Restaurant < ActiveRecord::Base
+class Restaurant < ApplicationRecord
   searchkick geo_shape: {
     bounds: {tree: "geohash", precision: "1km"}
   }
@@ -969,11 +971,19 @@ class Dog < Animal
 end
 ```
 
+In your parent model, set:
+
+```ruby
+class Animal < ApplicationRecord
+  searchkick inheritance: true
+end
+```
+
 The parent and child model can both reindex.
 
 ```ruby
 Animal.reindex
-Dog.reindex # equivalent
+Dog.reindex # equivalent, all animals reindexed
 ```
 
 And to search, use:
@@ -1076,7 +1086,7 @@ ENV["ELASTICSEARCH_URL"] = "https://es-domain-1234.us-east-1.es.amazonaws.com"
 To use signed request, include in your Gemfile:
 
 ```ruby
-gem 'faraday_middleware-aws-signers-v4'
+gem 'faraday_middleware-aws-signers-v4', '>= 0.1.9'
 ```
 
 and add to your initializer:
@@ -1170,7 +1180,7 @@ If you run into issues on Windows, check out [this post](https://www.rastating.c
 By default, all string fields are searchable (can be used in `fields` option). Speed up indexing and reduce index size by only making some fields searchable. This disables the `_all` field unless it’s listed.
 
 ```ruby
-class Product < ActiveRecord::Base
+class Product < ApplicationRecord
   searchkick searchable: [:name]
 end
 ```
@@ -1180,7 +1190,7 @@ end
 By default, all string fields are filterable (can be used in `where` option). Speed up indexing and reduce index size by only making some fields filterable.
 
 ```ruby
-class Product < ActiveRecord::Base
+class Product < ApplicationRecord
   searchkick filterable: [:brand]
 end
 ```
@@ -1214,7 +1224,7 @@ And use:
 Searchkick.reindex_status(index_name)
 ```
 
-You can also have Searchkick wait for reindexing to complete [master]
+You can also have Searchkick wait for reindexing to complete
 
 ```ruby
 Searchkick.reindex(async: {wait: true})
@@ -1265,7 +1275,7 @@ Searchkick.redis = ConnectionPool.new { Redis.new }
 And ask your models to queue updates.
 
 ```ruby
-class Product < ActiveRecord::Base
+class Product < ApplicationRecord
   searchkick callbacks: :queue
 end
 ```
@@ -1289,7 +1299,7 @@ For more tips, check out [Keeping Elasticsearch in Sync](https://www.elastic.co/
 Searchkick supports [Elasticsearch’s routing feature](https://www.elastic.co/blog/customizing-your-document-routing), which can significantly speed up searches.
 
 ```ruby
-class Business < ActiveRecord::Base
+class Business < ApplicationRecord
   searchkick routing: true
 
   def search_routing
@@ -1309,7 +1319,7 @@ Business.search "ice cream", routing: params[:city_id]
 Reindex a subset of attributes to reduce time spent generating search data and cut down on network traffic.
 
 ```ruby
-class Product < ActiveRecord::Base
+class Product < ApplicationRecord
   def search_data
     {
       name: name
@@ -1336,7 +1346,7 @@ Product.reindex(:search_prices)
 Split out conversions into a separate method so you can use partial reindexing, and cache conversions to prevent N+1 queries. Be sure to use a centralized cache store like Memcached or Redis.
 
 ```ruby
-class Product < ActiveRecord::Base
+class Product < ApplicationRecord
   def search_data
     {
       name: name
@@ -1401,7 +1411,7 @@ Searchkick makes it easy to use the Elasticsearch DSL on its own.
 Create a custom mapping:
 
 ```ruby
-class Product < ActiveRecord::Base
+class Product < ApplicationRecord
   searchkick mappings: {
     product: {
       properties: {
@@ -1416,7 +1426,7 @@ end
 To keep the mappings and settings generated by Searchkick, use:
 
 ```ruby
-class Product < ActiveRecord::Base
+class Product < ApplicationRecord
   searchkick merge_mappings: true, mappings: {...}
 end
 ```
@@ -1542,7 +1552,7 @@ Product.search_index.clean_indices
 Use custom settings
 
 ```ruby
-class Product < ActiveRecord::Base
+class Product < ApplicationRecord
   searchkick settings: {number_of_shards: 3}
 end
 ```
@@ -1550,7 +1560,7 @@ end
 Use a different index name
 
 ```ruby
-class Product < ActiveRecord::Base
+class Product < ApplicationRecord
   searchkick index_name: "products_v2"
 end
 ```
@@ -1558,7 +1568,7 @@ end
 Use a dynamic index name
 
 ```ruby
-class Product < ActiveRecord::Base
+class Product < ApplicationRecord
   searchkick index_name: -> { "#{name.tableize}-#{I18n.locale}" }
 end
 ```
@@ -1566,11 +1576,17 @@ end
 Prefix the index name
 
 ```ruby
-class Product < ActiveRecord::Base
+class Product < ApplicationRecord
   searchkick index_prefix: "datakick"
 end
 ```
 
+For all models
+
+```ruby
+Searchkick.index_prefix = "datakick"
+```
+
 Use a different term for boosting by conversions
 
 ```ruby
@@ -1580,7 +1596,7 @@ Product.search("banana", conversions_term: "organic banana")
 Multiple conversion fields
 
 ```ruby
-class Product < ActiveRecord::Base
+class Product < ApplicationRecord
   has_many :searches, class_name: "Searchjoy::Search"
 
   # searchkick also supports multiple "conversions" fields
@@ -1636,16 +1652,24 @@ Eager load associations
 Product.search "milk", includes: [:brand, :stores]
 ```
 
-Eager load different associations by model [master]
+Eager load different associations by model
 
 ```ruby
 Searchkick.search("*",  index_name: [Product, Store], model_includes: {Product => [:store], Store => [:product]})
 ```
 
+Specify default fields to search
+
+```ruby
+class Product < ApplicationRecord
+  searchkick default_fields: [:name]
+end
+```
+
 Turn off special characters
 
 ```ruby
-class Product < ActiveRecord::Base
+class Product < ApplicationRecord
   # A will not match Ä
   searchkick special_characters: false
 end
@@ -1654,7 +1678,7 @@ end
 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
+class Product < ApplicationRecord
   searchkick similarity: "classic"
 end
 ```
@@ -1662,7 +1686,7 @@ end
 Change import batch size
 
 ```ruby
-class Product < ActiveRecord::Base
+class Product < ApplicationRecord
   searchkick batch_size: 200 # defaults to 1000
 end
 ```
@@ -1689,7 +1713,7 @@ Product.search("carrots", request_params: {search_type: "dfs_query_then_fetch"})
 Reindex conditionally
 
 ```ruby
-class Product < ActiveRecord::Base
+class Product < ApplicationRecord
   searchkick callbacks: false
 
   # add the callbacks manually
@@ -1891,7 +1915,7 @@ Product.search_index.refresh
 Due to the distributed nature of Elasticsearch, you can get incorrect results when the number of documents in the index is low. You can [read more about it here](https://www.elastic.co/blog/understanding-query-then-fetch-vs-dfs-query-then-fetch). To fix this, do:
 
 ```ruby
-class Product < ActiveRecord::Base
+class Product < ApplicationRecord
   searchkick settings: {number_of_shards: 1}
 end
 ```

data/lib/searchkick/index.rb

@@ -318,10 +318,14 @@ module Searchkick
       client.indices.analyze(body: {text: text}.merge(options), index: name)["tokens"].map { |t| t["token"] }
     end
 
-    def klass_document_type(klass)
-      @klass_document_type[klass] ||= begin
+    def klass_document_type(klass, ignore_type = false)
+      @klass_document_type[[klass, ignore_type]] ||= begin
         if klass.respond_to?(:document_type)
           klass.document_type
+        elsif !ignore_type && klass.searchkick_klass.searchkick_options[:_type]
+          type = klass.searchkick_klass.searchkick_options[:_type]
+          type = type.call if type.respond_to?(:call)
+          type
         else
           klass.model_name.to_s.underscore
         end
@@ -334,11 +338,11 @@ module Searchkick
       Searchkick.client
     end
 
-    def document_type(record)
+    def document_type(record, ignore_type = false)
       if record.respond_to?(:search_document_type)
         record.search_document_type
       else
-        klass_document_type(record.class)
+        klass_document_type(record.class, ignore_type)
       end
     end
 
@@ -386,6 +390,10 @@ module Searchkick
         end
       end
 
+      if !source.key?("type") && record.class.searchkick_klass.searchkick_options[:inheritance]
+        source["type"] = document_type(record, true)
+      end
+
       cast_big_decimal(source)
 
       source

data/lib/searchkick/index_options.rb

@@ -4,6 +4,8 @@ module Searchkick
       options = @options
       language = options[:language]
       language = language.call if language.respond_to?(:call)
+      type = options[:_type] || :_default_
+      type = type.call if type.respond_to?(:call)
 
       if options[:mappings] && !options[:merge_mappings]
         settings = options[:settings] || {}
@@ -275,6 +277,10 @@ module Searchkick
           mapping[field] = shape_options.merge(type: "geo_shape")
         end
 
+        if options[:inheritance]
+          mapping[:type] = keyword_mapping
+        end
+
         routing = {}
         if options[:routing]
           routing = {required: true}
@@ -313,7 +319,7 @@ module Searchkick
         multi_field = dynamic_fields["{name}"].merge(fields: dynamic_fields.except("{name}"))
 
         mappings = {
-          _default_: {
+          type => {
             properties: mapping,
             _routing: routing,
             # https://gist.github.com/kimchy/2898285
@@ -331,7 +337,7 @@ module Searchkick
 
         if below60
           all_enabled = all && (!options[:searchable] || options[:searchable].to_a.map(&:to_s).include?("_all"))
-          mappings[:_default_][:_all] = all_enabled ? analyzed_field_options : {enabled: false}
+          mappings[type][:_all] = all_enabled ? analyzed_field_options : {enabled: false}
         end
 
         mappings = mappings.deep_merge(options[:mappings] || {})

data/lib/searchkick/model.rb

@@ -1,8 +1,8 @@
 module Searchkick
   module Model
     def searchkick(**options)
-      unknown_keywords = options.keys - [:_all, :batch_size, :callbacks, :conversions, :default_fields,
-        :filterable, :geo_shape, :highlight, :ignore_above, :index_name, :index_prefix, :language,
+      unknown_keywords = options.keys - [:_all, :_type, :batch_size, :callbacks, :conversions, :default_fields,
+        :filterable, :geo_shape, :highlight, :ignore_above, :index_name, :index_prefix, :inheritance, :language,
         :locations, :mappings, :match, :merge_mappings, :routing, :searchable, :settings, :similarity,
         :special_characters, :stem_conversions, :suggest, :synonyms, :text_end,
         :text_middle, :text_start, :word, :wordnet, :word_end, :word_middle, :word_start]
@@ -12,6 +12,8 @@ module Searchkick
 
       Searchkick.models << self
 
+      options[:_type] ||= -> { searchkick_index.klass_document_type(self, true) } if options[:inheritance]
+
       class_eval do
         cattr_reader :searchkick_options, :searchkick_klass
 

data/lib/searchkick/query.rb

@@ -233,7 +233,7 @@ module Searchkick
         if options[:similar]
           payload = {
             more_like_this: {
-              like_text: term,
+              like: term,
               min_doc_freq: 1,
               min_term_freq: 1,
               analyzer: "searchkick_search2"
@@ -307,7 +307,7 @@ module Searchkick
             exclude_field = field
 
             if field == "_all" || field.end_with?(".analyzed")
-              shared_options[:cutoff_frequency] = 0.001 unless operator == "and" || misspellings == false
+              shared_options[:cutoff_frequency] = 0.001 unless operator.to_s == "and" || misspellings == false
               qs.concat [
                 shared_options.merge(analyzer: "searchkick_search"),
                 shared_options.merge(analyzer: "searchkick_search2")
@@ -449,8 +449,14 @@ module Searchkick
         # indices_boost
         set_boost_by_indices(payload)
 
+        # type when inheritance
+        where = (options[:where] || {}).dup
+        if searchkick_options[:inheritance] && (options[:type] || (klass != searchkick_klass && searchkick_index))
+          where[:type] = [options[:type] || klass].flatten.map { |v| searchkick_index.klass_document_type(v, true) }
+        end
+
         # filters
-        filters = where_filters(options[:where])
+        filters = where_filters(where)
         set_filters(payload, filters) if filters.any?
 
         # aggregations
@@ -466,8 +472,7 @@ module Searchkick
         payload[:timeout] ||= "#{Searchkick.search_timeout + 1}s"
 
         # An empty array will cause only the _id and _type for each hit to be returned
-        # 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
+        # https://www.elastic.co/guide/en/elasticsearch/reference/current/search-request-source-filtering.html
         if options[:select]
           if options[:select] == []
             # intuitively [] makes sense to return no fields, but ES by default returns all fields
@@ -481,7 +486,7 @@ module Searchkick
       end
 
       # type
-      if options[:type] || (klass != searchkick_klass && searchkick_index)
+      if !searchkick_options[:inheritance] && (options[:type] || (klass != searchkick_klass && searchkick_index))
         @type = [options[:type] || klass].flatten.map { |v| searchkick_index.klass_document_type(v) }
       end
 
@@ -516,6 +521,8 @@ module Searchkick
           ["_all"]
         elsif all && default_match == :phrase
           ["_all.phrase"]
+        elsif term == "*"
+          []
         else
           raise ArgumentError, "Must specify fields to search"
         end

data/lib/searchkick/version.rb

@@ -1,3 +1,3 @@
 module Searchkick
-  VERSION = "2.3.2"
+  VERSION = "2.4.0"
 end

data/test/autocomplete_test.rb

@@ -72,4 +72,10 @@ class AutocompleteTest < Minitest::Test
     store_names ["hi@example.org"]
     assert_search "hi@example.org", ["hi@example.org"], fields: [{name: :exact}]
   end
+
+  def test_exact_case
+    store_names ["Hello"]
+    assert_search "hello", [], fields: [{name: :exact}]
+    assert_search "Hello", ["Hello"], fields: [{name: :exact}]
+  end
 end

data/test/inheritance_test.rb

@@ -9,7 +9,6 @@ class InheritanceTest < Minitest::Test
   def test_child_reindex
     store_names ["Max"], Cat
     assert Dog.reindex
-    Animal.searchkick_index.refresh
     assert_equal 1, Animal.search("*").size
   end
 
@@ -70,7 +69,7 @@ class InheritanceTest < Minitest::Test
     store_names ["Bear A"], Cat
     store_names ["Bear B"], Dog
     Animal.reindex
-    assert_equal 1, Dog.search("bear").size
+    assert_equal 2, Animal.search("bear").size
   end
 
   # TODO move somewhere better

data/test/match_test.rb

@@ -18,6 +18,13 @@ class MatchTest < Minitest::Test
     assert_search "pepperjack cheese skewers", ["Pepper Jack Cheese Skewers"]
   end
 
+  def test_operator
+    store_names ["fresh", "honey"]
+    assert_search "fresh honey", ["fresh", "honey"], {operator: "or"}
+    assert_search "fresh honey", [], {operator: "and"}
+    assert_search "fresh honey", ["fresh", "honey"], {operator: :or}
+  end
+
   # def test_cheese_space_in_query
   #   store_names ["Pepperjack Cheese Skewers"]
   #   assert_search "pepper jack cheese skewers", ["Pepperjack Cheese Skewers"]
@@ -238,6 +245,11 @@ class MatchTest < Minitest::Test
     assert_search "fresh honey", ["Fresh Honey"], match: :phrase
   end
 
+  def test_phrase_again
+    store_names ["Social entrepreneurs don't have it easy raising capital"]
+    assert_search "social entrepreneurs don't have it easy raising capital", ["Social entrepreneurs don't have it easy raising capital"], match: :phrase
+  end
+
   def test_phrase_order
     store_names ["Wheat Bread", "Whole Wheat Bread"]
     assert_order "wheat bread", ["Wheat Bread", "Whole Wheat Bread"], match: :phrase

data/test/test_helper.rb

@@ -505,6 +505,7 @@ end
 class Animal
   searchkick \
     default_fields: elasticsearch_below60? ? nil : [:name],
+    inheritance: !elasticsearch_below60?,
     text_start: [:name],
     suggest: [:name],
     index_name: -> { "#{name.tableize}-#{Date.today.year}#{Searchkick.index_suffix}" },

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: searchkick
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 2.4.0
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-09 00:00:00.000000000 Z
+date: 2017-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel