searchkick 2.5.0 → 3.0.0

data/test/index_test.rb

@@ -59,8 +59,10 @@ class IndexTest < Minitest::Test
     assert_equal ["Dollar Tree"], Store.search(body: {query: {match: {name: "Dollar Tree"}}}, load: false).map(&:name)
   end
 
-  def test_body_warning
-    assert_output(nil, "The body option replaces the entire body, so the following options are ignored: where\n") { Store.search(body: {query: {match: {name: "dollar"}}}, where: {id: 1}) }
+  def test_body_incompatible_options
+    assert_raises(ArgumentError) do
+      Store.search(body: {query: {match: {name: "dollar"}}}, where: {id: 1})
+    end
   end
 
   def test_block
@@ -131,9 +133,10 @@ class IndexTest < Minitest::Test
   def test_filterable
     # skip for 5.0 since it throws
     # Cannot search on field [alt_description] since it is not indexed.
-    skip unless elasticsearch_below50?
     store [{name: "Product A", alt_description: "Hello"}]
-    assert_search "*", [], where: {alt_description: "Hello"}
+    assert_raises(Searchkick::InvalidQueryError) do
+      assert_search "*", [], where: {alt_description: "Hello"}
+    end
   end
 
   def test_filterable_non_string
@@ -147,15 +150,11 @@ class IndexTest < Minitest::Test
     store [{name: "Product A", text: large_value}], Region
     assert_search "product", ["Product A"], {}, Region
     assert_search "hello", ["Product A"], {fields: [:name, :text]}, Region
-
-    # needs fields for ES 6
-    if elasticsearch_below60?
-      assert_search "hello", ["Product A"], {}, Region
-    end
+    assert_search "hello", ["Product A"], {}, Region
   end
 
   def test_very_large_value
-    skip if nobrainer? || elasticsearch_below22?
+    skip if nobrainer?
     large_value = 10000.times.map { "hello" }.join(" ")
     store [{name: "Product A", text: large_value}], Region
     assert_search "product", ["Product A"], {}, Region

data/test/language_test.rb

@@ -0,0 +1,16 @@
+require_relative "test_helper"
+
+class LanguageTest < Minitest::Test
+  def setup
+    Song.destroy_all
+  end
+
+  def test_chinese
+    skip unless ENV["CHINESE"]
+    Song.reindex
+    store_names ["中华人民共和国国歌"], Song
+    assert_search "中华人民共和国", ["中华人民共和国国歌"], {}, Song
+    assert_search "国歌", ["中华人民共和国国歌"], {}, Song
+    assert_search "人", [], {}, Song
+  end
+end

data/test/marshal_test.rb

@@ -3,6 +3,11 @@ require_relative "test_helper"
 class MarshalTest < Minitest::Test
   def test_marshal
     store_names ["Product A"]
-    assert Marshal.dump(Product.search("*", load: {dumpable: true}).results)
+    assert Marshal.dump(Product.search("*").results)
+  end
+
+  def test_marshal_highlights
+    store_names ["Product A"]
+    assert Marshal.dump(Product.search("product", highlight: true, load: {dumpable: true}).results)
   end
 end

data/test/match_test.rb

@@ -121,7 +121,11 @@ class MatchTest < Minitest::Test
   def test_misspelling_zucchini_transposition
     store_names ["zucchini"]
     assert_search "zuccihni", ["zucchini"]
-    assert_search "zuccihni", [], misspellings: {transpositions: false}
+
+    # need to specify field
+    # as transposition option isn't supported for multi_match queries
+    # until Elasticsearch 6.1
+    assert_search "zuccihni", [], misspellings: {transpositions: false}, fields: [:name]
   end
 
   def test_misspelling_lasagna
@@ -180,12 +184,12 @@ class MatchTest < Minitest::Test
 
   def test_exclude_butter_exact
     store_names ["Butter Tub", "Peanut Butter Tub"]
-    assert_search "butter", [], exclude: ["peanut butter"], match: :exact
+    assert_search "butter", [], exclude: ["peanut butter"], fields: [{name: :exact}]
   end
 
   def test_exclude_same_exact
     store_names ["Butter Tub", "Peanut Butter Tub"]
-    assert_search "Butter Tub", [], exclude: ["Butter Tub"], match: :exact
+    assert_search "Butter Tub", ["Butter Tub"], exclude: ["Peanut Butter Tub"], fields: [{name: :exact}]
   end
 
   def test_exclude_egg_word_start
@@ -252,7 +256,7 @@ class MatchTest < Minitest::Test
 
   def test_phrase_order
     store_names ["Wheat Bread", "Whole Wheat Bread"]
-    assert_order "wheat bread", ["Wheat Bread", "Whole Wheat Bread"], match: :phrase
+    assert_order "wheat bread", ["Wheat Bread", "Whole Wheat Bread"], match: :phrase, fields: [:name]
   end
 
   def test_dynamic_fields
@@ -261,6 +265,7 @@ class MatchTest < Minitest::Test
   end
 
   def test_unsearchable
+    skip
     store [
       {name: "Unsearchable", description: "Almond"}
     ]

data/test/model_test.rb

@@ -4,13 +4,11 @@ class ModelTest < Minitest::Test
   def test_disable_callbacks_model
     store_names ["product a"]
 
-    Product.disable_search_callbacks
-    assert !Product.search_callbacks?
-
-    store_names ["product b"]
+    Searchkick.callbacks(false) do
+      store_names ["product b"]
+    end
     assert_search "product", ["product a"]
 
-    Product.enable_search_callbacks
     Product.reindex
 
     assert_search "product", ["product a", "product b"]

data/test/multi_search_test.rb

@@ -24,13 +24,6 @@ class MultiSearchTest < Minitest::Test
     store_names ["abc", "abd", "aee"]
     products = Product.search("abc", misspellings: {below: 2}, execute: false)
     Searchkick.multi_search([products])
-    assert_equal ["abc"], products.map(&:name)
-  end
-
-  def test_misspellings_below_unmet_retry
-    store_names ["abc", "abd", "aee"]
-    products = Product.search("abc", misspellings: {below: 2}, execute: false)
-    Searchkick.multi_search([products], retry_misspellings: true)
     assert_equal ["abc", "abd"], products.map(&:name)
   end
 

data/test/order_test.rb

@@ -29,14 +29,8 @@ class OrderTest < Minitest::Test
     assert_order "product", ["Product A", "Product B", "Product C"], order: {color: :asc, store_id: :desc}
   end
 
-  def test_order_ignore_unmapped
-    skip unless elasticsearch_below50?
-    assert_order "product", [], order: {not_mapped: {ignore_unmapped: true}}, conversions: false
-  end
-
   def test_order_unmapped_type
-    skip if elasticsearch_below50?
-    assert_order "product", [], order: {not_mapped: {unmapped_type: "long"}}, conversions: false
+    assert_order "product", [], order: {not_mapped: {unmapped_type: "long"}}
   end
 
   def test_order_array

data/test/pagination_test.rb

@@ -14,7 +14,7 @@ class PaginationTest < Minitest::Test
 
   def test_offset
     store_names ["Product A", "Product B", "Product C", "Product D"]
-    assert_order "product", ["Product C", "Product D"], order: {name: :asc}, offset: 2
+    assert_order "product", ["Product C", "Product D"], order: {name: :asc}, offset: 2, limit: 100
   end
 
   def test_pagination

data/test/reindex_v2_job_test.rb

@@ -4,29 +4,24 @@ class ReindexV2JobTest < Minitest::Test
   def setup
     skip unless defined?(ActiveJob)
     super
-    Searchkick.disable_callbacks
-  end
-
-  def teardown
-    Searchkick.enable_callbacks
   end
 
   def test_create
-    product = Product.create!(name: "Boom")
-    Product.searchkick_index.refresh
+    product = Searchkick.callbacks(false) { Product.create!(name: "Boom") }
+    Product.search_index.refresh
     assert_search "*", []
     Searchkick::ReindexV2Job.perform_later("Product", product.id.to_s)
-    Product.searchkick_index.refresh
+    Product.search_index.refresh
     assert_search "*", ["Boom"]
   end
 
   def test_destroy
-    product = Product.create!(name: "Boom")
+    product = Searchkick.callbacks(false) { Product.create!(name: "Boom") }
     Product.reindex
     assert_search "*", ["Boom"]
-    product.destroy
+    Searchkick.callbacks(false) { product.destroy }
     Searchkick::ReindexV2Job.perform_later("Product", product.id.to_s)
-    Product.searchkick_index.refresh
+    Product.search_index.refresh
     assert_search "*", []
   end
 end

data/test/routing_test.rb

@@ -8,7 +8,7 @@ class RoutingTest < Minitest::Test
 
   def test_routing_mappings
     index_options = Store.searchkick_index.index_options
-    assert_equal index_options[:mappings][:_default_][:_routing], required: true
+    assert_equal index_options[:mappings]["store"][:_routing], required: true
   end
 
   def test_routing_correct_node

data/test/similar_test.rb

@@ -3,7 +3,7 @@ require_relative "test_helper"
 class SimilarTest < Minitest::Test
   def test_similar
     store_names ["Annie's Naturals Organic Shiitake & Sesame Dressing"]
-    assert_search "Annie's Naturals Shiitake & Sesame Vinaigrette", ["Annie's Naturals Organic Shiitake & Sesame Dressing"], similar: true
+    assert_search "Annie's Naturals Shiitake & Sesame Vinaigrette", ["Annie's Naturals Organic Shiitake & Sesame Dressing"], similar: true, fields: [:name]
   end
 
   def test_fields
@@ -13,7 +13,7 @@ class SimilarTest < Minitest::Test
 
   def test_order
     store_names ["Lucerne Milk Chocolate Fat Free", "Clover Fat Free Milk"]
-    assert_order "Lucerne Fat Free Chocolate Milk", ["Lucerne Milk Chocolate Fat Free", "Clover Fat Free Milk"], similar: true
+    assert_order "Lucerne Fat Free Chocolate Milk", ["Lucerne Milk Chocolate Fat Free", "Clover Fat Free Milk"], similar: true, fields: [:name]
   end
 
   def test_limit

data/test/sql_test.rb

@@ -125,36 +125,7 @@ class SqlTest < Minitest::Test
     assert_nil hit["_source"]
   end
 
-  def test_select_include
-    skip unless elasticsearch_below50?
-    store [{name: "Product A", user_ids: [1, 2]}]
-    result = Product.search("product", load: false, select: {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_exclude
-    skip unless elasticsearch_below50?
-    store [{name: "Product A", user_ids: [1, 2], store_id: 1}]
-    result = Product.search("product", load: false, select: {exclude: [:name]}).first
-    assert_nil result.name
-    assert_equal [1, 2], result.user_ids
-    assert_equal 1, result.store_id
-  end
-
-  def test_select_include_and_exclude
-    skip unless elasticsearch_below50?
-    # 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: {include: [:store_id], exclude: [:name]}).first
-    assert_equal 1, result.store_id
-    assert_nil result.name
-    assert_nil result.user_ids
-  end
-
   def test_select_includes
-    skip if elasticsearch_below50?
     store [{name: "Product A", user_ids: [1, 2]}]
     result = Product.search("product", load: false, select: {includes: [:name]}).first
     assert_equal %w(id name), result.keys.reject { |k| k.start_with?("_") }.sort
@@ -163,7 +134,6 @@ class SqlTest < Minitest::Test
   end
 
   def test_select_excludes
-    skip if elasticsearch_below50?
     store [{name: "Product A", user_ids: [1, 2], store_id: 1}]
     result = Product.search("product", load: false, select: {excludes: [:name]}).first
     assert_nil result.name
@@ -172,7 +142,6 @@ class SqlTest < Minitest::Test
   end
 
   def test_select_include_and_excludes
-    skip if elasticsearch_below50?
     # 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: {includes: [:store_id], excludes: [:name]}).first

data/test/test_helper.rb

@@ -38,18 +38,6 @@ end
 
 ActiveSupport::LogSubscriber.logger = ActiveSupport::Logger.new(STDOUT) if ENV["NOTIFICATIONS"]
 
-def elasticsearch_below50?
-  Searchkick.server_below?("5.0.0-alpha1")
-end
-
-def elasticsearch_below60?
-  Searchkick.server_below?("6.0.0-alpha1")
-end
-
-def elasticsearch_below22?
-  Searchkick.server_below?("2.2.0")
-end
-
 def nobrainer?
   defined?(NoBrainer)
 end
@@ -121,6 +109,12 @@ if defined?(Mongoid)
 
     field :name
   end
+
+  class Song
+    include Mongoid::Document
+
+    field :name
+  end
 elsif defined?(NoBrainer)
   NoBrainer.configure do |config|
     config.app_name = :searchkick
@@ -132,7 +126,7 @@ elsif defined?(NoBrainer)
     include NoBrainer::Document::Timestamps
 
     field :id,           type: Object
-    field :name,         type: String
+    field :name,         type: Text
     field :in_stock,     type: Boolean
     field :backordered,  type: Boolean
     field :orders_count, type: Integer
@@ -188,6 +182,13 @@ elsif defined?(NoBrainer)
     field :id,   type: String
     field :name, type: String
   end
+
+  class Song
+    include NoBrainer::Document
+
+    field :id,   type: Object
+    field :name, type: String
+  end
 elsif defined?(Cequel)
   cequel =
     Cequel.connect(
@@ -276,7 +277,14 @@ elsif defined?(Cequel)
     column :name, :text
   end
 
-  [Product, Store, Region, Speaker, Animal].each(&:synchronize_schema)
+  class Song
+    include Cequel::Record
+
+    key :id, :timeuuid, auto: true
+    column :name, :text
+  end
+
+  [Product, Store, Region, Speaker, Animal, Sku, Song].each(&:synchronize_schema)
 else
   require "active_record"
 
@@ -367,6 +375,10 @@ else
     t.string :name
   end
 
+  ActiveRecord::Migration.create_table :songs do |t|
+    t.string :name
+  end
+
   class Product < ActiveRecord::Base
     belongs_to :store
   end
@@ -392,6 +404,9 @@ else
 
   class Sku < ActiveRecord::Base
   end
+
+  class Song < ActiveRecord::Base
+  end
 end
 
 class Product
@@ -417,7 +432,6 @@ class Product
     word_middle: [:name],
     word_end: [:name],
     highlight: [:name],
-    searchable: [:name, :color],
     filterable: [:name, :color, :description],
     similarity: "BM25",
     match: ENV["MATCH"] ? ENV["MATCH"].to_sym : nil
@@ -425,7 +439,7 @@ class Product
   attr_accessor :conversions, :user_ids, :aisle, :details
 
   def search_data
-    serializable_hash.except("id").merge(
+    serializable_hash.except("id", "_id").merge(
       conversions: conversions,
       user_ids: user_ids,
       location: {lat: latitude, lon: longitude},
@@ -448,13 +462,12 @@ end
 
 class Store
   searchkick \
-    default_fields: elasticsearch_below60? ? nil : [:name],
     routing: true,
     merge_mappings: true,
     mappings: {
       store: {
         properties: {
-          name: elasticsearch_below50? ? {type: "string", analyzer: "keyword"} : {type: "keyword"}
+          name: {type: "keyword"}
         }
       }
     }
@@ -470,7 +483,6 @@ end
 
 class Region
   searchkick \
-    default_fields: elasticsearch_below60? ? nil : [:name],
     geo_shape: {
       territory: {tree: "quadtree", precision: "10km"}
     }
@@ -488,13 +500,12 @@ end
 
 class Speaker
   searchkick \
-    default_fields: elasticsearch_below60? ? nil : [:name],
     conversions: ["conversions_a", "conversions_b"]
 
   attr_accessor :conversions_a, :conversions_b, :aisle
 
   def search_data
-    serializable_hash.except("id").merge(
+    serializable_hash.except("id", "_id").merge(
       conversions_a: conversions_a,
       conversions_b: conversions_b,
       aisle: aisle
@@ -504,8 +515,7 @@ end
 
 class Animal
   searchkick \
-    default_fields: elasticsearch_below60? ? nil : [:name],
-    inheritance: !elasticsearch_below60?,
+    inheritance: true,
     text_start: [:name],
     suggest: [:name],
     index_name: -> { "#{name.tableize}-#{Date.today.year}#{Searchkick.index_suffix}" },
@@ -517,6 +527,10 @@ class Sku
   searchkick callbacks: defined?(ActiveJob) ? :async : true
 end
 
+class Song
+  searchkick language: "chinese"
+end
+
 Product.searchkick_index.delete if Product.searchkick_index.exists?
 Product.reindex
 Product.reindex # run twice for both index paths