searchkick 1.3.4 → 1.3.5

data/lib/searchkick/version.rb

@@ -1,3 +1,3 @@
 module Searchkick
-  VERSION = "1.3.4"
+  VERSION = "1.3.5"
 end

data/test/aggs_test.rb

@@ -100,16 +100,14 @@ class AggsTest < Minitest::Test
     store [{name: "Old Product", created_at: 3.years.ago}]
     aggs = Product.search(
       "Product",
-      {
-        aggs: {
-          products_per_year: {
-            date_histogram: {
-              field: :created_at,
-              interval: :year
-            }
-          }
-        }
-      }
+              aggs: {
+                products_per_year: {
+                  date_histogram: {
+                    field: :created_at,
+                    interval: :year
+                  }
+                }
+              }
     ).aggs
 
     if elasticsearch_below20?

data/test/boost_test.rb

@@ -10,7 +10,7 @@ class BoostTest < Minitest::Test
       {name: "Tomato C", conversions: {"tomato" => 3}}
     ]
     assert_order "tomato", ["Tomato C", "Tomato B", "Tomato A"]
-    assert_equal_scores "tomato", {conversions: false}
+    assert_equal_scores "tomato", conversions: false
   end
 
   def test_multiple_conversions
@@ -19,7 +19,7 @@ class BoostTest < Minitest::Test
     store [
       {name: "Speaker A", conversions_a: {"speaker" => 1}, conversions_b: {"speaker" => 6}},
       {name: "Speaker B", conversions_a: {"speaker" => 2}, conversions_b: {"speaker" => 5}},
-      {name: "Speaker C", conversions_a: {"speaker" => 3}, conversions_b: {"speaker" => 4}},
+      {name: "Speaker C", conversions_a: {"speaker" => 3}, conversions_b: {"speaker" => 4}}
     ], Speaker
 
     assert_equal_scores "speaker", {conversions: false}, Speaker

data/test/errors_test.rb

@@ -12,7 +12,7 @@ class ErrorsTest < Minitest::Test
       }
     }
     index.store valid_dog
-    error = assert_raises(Searchkick::ImportError) do
+    assert_raises(Searchkick::ImportError) do
       index.bulk_index [valid_dog, invalid_dog]
     end
   end

data/test/index_test.rb

@@ -92,7 +92,7 @@ class IndexTest < Minitest::Test
   end
 
   def test_unsupported_version
-    raises_exception = ->(_) { raise Elasticsearch::Transport::Transport::Error.new("[500] No query registered for [multi_match]") }
+    raises_exception = ->(_) { raise Elasticsearch::Transport::Transport::Error, "[500] No query registered for [multi_match]" }
     Searchkick.client.stub :search, raises_exception do
       assert_raises(Searchkick::UnsupportedVersionError) { Product.search("test") }
     end
@@ -112,6 +112,14 @@ class IndexTest < Minitest::Test
   end
 
   def test_analyzed_only
+    # 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"}
+  end
+
+  def test_analyzed_only_large_value
     skip if nobrainer?
     large_value = 10000.times.map { "hello" }.join(" ")
     store [{name: "Product A", alt_description: large_value}]

data/test/query_test.rb

@@ -12,8 +12,9 @@ class QueryTest < Minitest::Test
   end
 
   def test_with_effective_min_score
+    min_score = elasticsearch_below50? ? 0.1 : 1
     store_names ["Milk", "Milk2"]
-    assert_search "milk", ["Milk"], body_options: {min_score: 0.1}
+    assert_search "milk", ["Milk"], body_options: {min_score: min_score}
   end
 
   def test_with_uneffective_min_score
@@ -28,4 +29,8 @@ class QueryTest < Minitest::Test
   def test_timeout_override
     assert_equal "1s", Product.search("*", body_options: {timeout: "1s"}, execute: false).body[:timeout]
   end
+
+  def test_request_params
+    assert_equal "dfs_query_then_fetch", Product.search("*", request_params: {search_type: "dfs_query_then_fetch"}, execute: false).params[:search_type]
+  end
 end

data/test/sql_test.rb

@@ -55,7 +55,7 @@ class SqlTest < Minitest::Test
   # body_options
 
   def test_body_options_should_merge_into_body
-    query = Product.search({ query: { name: "milk"}, body_options: { min_score: 1.0 }}, execute: false)
+    query = Product.search({query: {name: "milk"}, body_options: {min_score: 1.0}}, execute: false)
     assert_equal 1.0, query.body[:min_score]
   end
 
@@ -163,6 +163,7 @@ class SqlTest < Minitest::Test
   end
 
   def test_select_v2_include
+    skip unless elasticsearch_below50?
     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
@@ -171,6 +172,7 @@ class SqlTest < Minitest::Test
   end
 
   def test_select_v2_exclude
+    skip unless elasticsearch_below50?
     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
@@ -179,6 +181,7 @@ class SqlTest < Minitest::Test
   end
 
   def test_select_v2_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_v2: {include: [:store_id], exclude: [:name]}).first
@@ -187,6 +190,34 @@ class SqlTest < Minitest::Test
     assert_nil result.user_ids
   end
 
+  def test_select_v2_includes
+    skip if elasticsearch_below50?
+    store [{name: "Product A", user_ids: [1, 2]}]
+    result = Product.search("product", load: false, select_v2: {includes: [: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_excludes
+    skip if elasticsearch_below50?
+    store [{name: "Product A", user_ids: [1, 2], store_id: 1}]
+    result = Product.search("product", load: false, select_v2: {excludes: [: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_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_v2: {includes: [:store_id], excludes: [:name]}).first
+    assert_equal 1, result.store_id
+    assert_nil result.name
+    assert_nil result.user_ids
+  end
+
   # other tests
 
   def test_nested_object

data/test/test_helper.rb

@@ -277,9 +277,9 @@ class Product
     ],
     autocomplete: [:name],
     suggest: [:name, :color],
-    conversions: "conversions",
-    personalize: "user_ids",
-    locations: ["location", "multiple_locations"],
+    conversions: [:conversions],
+    personalize: :user_ids,
+    locations: [:location, :multiple_locations],
     text_start: [:name],
     text_middle: [:name],
     text_end: [:name],
@@ -287,12 +287,13 @@ class Product
     word_middle: [:name],
     word_end: [:name],
     highlight: [:name],
-    # unsearchable: [:description],
     searchable: [:name, :color],
-    only_analyzed: [:alt_description],
+    filterable: [:name, :color, :description],
+    # unsearchable: [:description],
+    # only_analyzed: [:alt_description],
     match: ENV["MATCH"] ? ENV["MATCH"].to_sym : nil
 
-  attr_accessor :conversions, :user_ids, :aisle
+  attr_accessor :conversions, :user_ids, :aisle, :details
 
   def search_data
     serializable_hash.except("id").merge(
@@ -300,7 +301,8 @@ class Product
       user_ids: user_ids,
       location: {lat: latitude, lon: longitude},
       multiple_locations: [{lat: latitude, lon: longitude}, {lat: 0, lon: 0}],
-      aisle: aisle
+      aisle: aisle,
+      details: details
     )
   end
 
@@ -339,7 +341,7 @@ class Speaker
   def search_data
     serializable_hash.except("id").merge(
       conversions_a: conversions_a,
-      conversions_b: conversions_b,
+      conversions_b: conversions_b
     )
   end
 end
@@ -392,7 +394,7 @@ class Minitest::Test
   end
 
   def assert_equal_scores(term, options = {}, klass = Product)
-    assert_equal 1, klass.search(term, options).hits.map { |a| a['_score'] }.uniq.size
+    assert_equal 1, klass.search(term, options).hits.map { |a| a["_score"] }.uniq.size
   end
 
   def assert_first(term, expected, options = {}, klass = Product)

data/test/where_test.rb

@@ -168,4 +168,11 @@ class WhereTest < Minitest::Test
     ]
     assert_search "san", ["San Francisco"], where: {multiple_locations: {near: {lat: 37.5, lon: -122.5}}}
   end
+
+  def test_nested
+    store [
+      {name: "Product A", details: {year: 2016}}
+    ]
+    assert_search "product", ["Product A"], where: {"details.year" => 2016}
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: searchkick
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.5
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-24 00:00:00.000000000 Z
+date: 2016-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -110,6 +110,7 @@ files:
 - Rakefile
 - lib/searchkick.rb
 - lib/searchkick/index.rb
+- lib/searchkick/index_options.rb
 - lib/searchkick/logging.rb
 - lib/searchkick/middleware.rb
 - lib/searchkick/model.rb
@@ -181,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Searchkick learns what your users are looking for. As more people search,
@@ -229,4 +230,3 @@ test_files:
 - test/synonyms_test.rb
 - test/test_helper.rb
 - test/where_test.rb
-has_rdoc: