searchkick 0.9.1 → 1.0.0

data/test/boost_test.rb

@@ -1,7 +1,6 @@
 require_relative "test_helper"
 
-class TestBoost < Minitest::Test
-
+class BoostTest < Minitest::Test
   # conversions
 
   def test_conversions
@@ -133,5 +132,4 @@ class TestBoost < Minitest::Test
     ]
     assert_order "san", ["San Francisco", "San Antonio", "San Marino"], boost_by_distance: {field: :location, origin: [37, -122], scale: "1000mi"}
   end
-
 end

data/{ci → test/ci}/before_install.sh

@@ -1,8 +1,9 @@
 #!/usr/bin/env bash
 
-wget https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-1.3.2.deb
-sudo dpkg -i elasticsearch-1.3.2.deb
-sudo service elasticsearch restart
+sudo apt-get purge elasticsearch
+wget https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-1.7.3.deb
+sudo dpkg -i elasticsearch-1.7.3.deb
+sudo service elasticsearch start
 
 if [ -n "$NOBRAINER" ]; then
   source /etc/lsb-release && echo "deb http://download.rethinkdb.com/apt $DISTRIB_CODENAME main" | sudo tee /etc/apt/sources.list.d/rethinkdb.list

data/test/facets_test.rb

@@ -1,9 +1,8 @@
 require_relative "test_helper"
-require "active_support/core_ext"
-
-class TestFacets < Minitest::Test
 
+class FacetsTest < Minitest::Test
   def setup
+    skip if elasticsearch2?
     super
     store [
       {name: "Product Show", latitude: 37.7833, longitude: 12.4167, store_id: 1, in_stock: true, color: "blue", price: 21, created_at: 2.days.ago},
@@ -79,14 +78,13 @@ class TestFacets < Minitest::Test
     skip if Gem::Version.new(Searchkick.server_version) >= Gem::Version.new("1.4.0")
     options = {where: {store_id: 2}, facets: {store_id: {stats: true}}}
     facets = Product.search("Product", options).facets["store_id"]["terms"]
-    expected_facets_keys = %w[term count total_count min max total mean]
+    expected_facets_keys = %w(term count total_count min max total mean)
     assert_equal expected_facets_keys, facets.first.keys
   end
 
   protected
 
-  def store_facet(options, facet_key="store_id")
+  def store_facet(options, facet_key = "store_id")
     Hash[Product.search("Product", options).facets[facet_key]["terms"].map { |v| [v["term"], v["count"]] }]
   end
-
 end

data/{gemfiles → test/gemfiles}/activerecord31.gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in searchkick.gemspec
-gemspec path: "../"
+gemspec path: "../../"
 
 gem "sqlite3"
 gem "activerecord", "~> 3.1.0"

data/{gemfiles → test/gemfiles}/activerecord32.gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in searchkick.gemspec
-gemspec path: "../"
+gemspec path: "../../"
 
 gem "sqlite3"
 gem "activerecord", "~> 3.2.0"

data/{gemfiles → test/gemfiles}/activerecord40.gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in searchkick.gemspec
-gemspec path: "../"
+gemspec path: "../../"
 
 gem "sqlite3"
 gem "activerecord", "~> 4.0.0"

data/{gemfiles → test/gemfiles}/activerecord41.gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in searchkick.gemspec
-gemspec path: "../"
+gemspec path: "../../"
 
 gem "sqlite3"
 gem "activerecord", "~> 4.1.0"

data/{gemfiles → test/gemfiles}/mongoid2.gemfile

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

data/{gemfiles → test/gemfiles}/mongoid3.gemfile

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

data/{gemfiles → test/gemfiles}/mongoid4.gemfile

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

data/test/gemfiles/mongoid5.gemfile

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

data/{gemfiles → test/gemfiles}/nobrainer.gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in searchkick.gemspec
-gemspec path: "../"
+gemspec path: "../../"
 
 gem "nobrainer", "0.27.0"

data/test/highlight_test.rb

@@ -1,7 +1,6 @@
 require_relative "test_helper"
 
-class TestHighlight < Minitest::Test
-
+class HighlightTest < Minitest::Test
   def test_basic
     store_names ["Two Door Cinema Club"]
     assert_equal "Two Door <em>Cinema</em> Club", Product.search("cinema", fields: [:name], highlight: true).with_details.first[1][:highlight][:name]
@@ -41,7 +40,7 @@ class TestHighlight < Minitest::Test
     json = {
       query: {
         match: {
-          _all: "cinema"
+          "name.analyzed" => "cinema"
         }
       },
       highlight: {
@@ -54,5 +53,4 @@ class TestHighlight < Minitest::Test
     }
     assert_equal "Two Door <strong>Cinema</strong> Club", Product.search(json: json).with_details.first[1][:highlight][:"name.analyzed"]
   end
-
 end

data/test/index_test.rb

@@ -1,7 +1,6 @@
 require_relative "test_helper"
 
-class TestIndex < Minitest::Test
-
+class IndexTest < Minitest::Test
   def test_clean_indices
     old_index = Searchkick::Index.new("products_test_20130801000000000")
     different_index = Searchkick::Index.new("items_test_20130801000000000")
@@ -93,27 +92,39 @@ class TestIndex < Minitest::Test
   end
 
   def test_unsupported_version
-    raises_exception = ->(s) { raise Elasticsearch::Transport::Transport::Error.new("[500] No query registered for [multi_match]") }
+    raises_exception = ->(_) { raise Elasticsearch::Transport::Transport::Error.new("[500] No query registered for [multi_match]") }
     Searchkick.client.stub :search, raises_exception do
       assert_raises(Searchkick::UnsupportedVersionError) { Product.search("test") }
     end
   end
 
   def test_invalid_query
-    assert_raises(Searchkick::InvalidQueryError) { Product.search(query: {}) }
+    assert_raises(Searchkick::InvalidQueryError) { Product.search(query: {boom: true}) }
   end
 
-  if defined?(ActiveRecord)
+  unless mongoid2? || nobrainer? || activerecord_below41?
+    def test_dangerous_reindex
+      assert_raises(Searchkick::DangerousOperation) { Product.where(id: [1, 2, 3]).reindex }
+    end
+
+    def test_dangerous_reindex_accepted
+      store_names ["Product A", "Product B"]
+      Product.where(name: "Product A").reindex(accept_danger: true)
+      assert_search "product", ["Product A"]
+    end
+
+    def test_dangerous_reindex_inheritance
+      assert_raises(Searchkick::DangerousOperation) { Dog.where(id: [1, 2, 3]).reindex }
+    end
+  end
 
+  if defined?(ActiveRecord)
     def test_transaction
       Product.transaction do
         store_names ["Product A"]
         raise ActiveRecord::Rollback
       end
-
-      assert_search "product", []
+      assert_search "product", [], conversions: false
     end
-
   end
-
 end

data/test/inheritance_test.rb

@@ -1,7 +1,6 @@
 require_relative "test_helper"
 
-class TestInheritance < Minitest::Test
-
+class InheritanceTest < Minitest::Test
   def test_child_reindex
     store_names ["Max"], Cat
     assert Dog.reindex
@@ -76,5 +75,4 @@ class TestInheritance < Minitest::Test
     store_names ["Product B"], Animal
     assert_search "product", ["Product A", "Product B"], index_name: [Product.searchkick_index.name, Animal.searchkick_index.name], conversions: false
   end
-
 end

data/test/match_test.rb

@@ -1,9 +1,6 @@
-# encoding: utf-8
-
 require_relative "test_helper"
 
-class TestMatch < Minitest::Test
-
+class MatchTest < Minitest::Test
   # exact
 
   def test_match
@@ -114,8 +111,8 @@ class TestMatch < Minitest::Test
 
   def test_misspelling_zucchini_transposition
     store_names ["zucchini"]
-    assert_search "zuccihni", [] # doesn't work without transpositions:true option
-    assert_search "zuccihni", ["zucchini"], misspellings: {transpositions: true}
+    assert_search "zuccihni", ["zucchini"]
+    assert_search "zuccihni", [], misspellings: {transpositions: false}
   end
 
   def test_misspelling_lasagna
@@ -133,6 +130,11 @@ class TestMatch < Minitest::Test
     assert_search "lasanga pasat", ["lasagna pasta"], misspellings: {transpositions: true} # both words misspelled with a transposition should still work
   end
 
+  def test_misspellings_word_start
+    store_names ["Sriracha"]
+    assert_search "siracha", ["Sriracha"], fields: [{name: :word_start}]
+  end
+
   # spaces
 
   def test_spaces_in_field
@@ -195,5 +197,4 @@ class TestMatch < Minitest::Test
     ]
     assert_search "almond", []
   end
-
 end

data/test/model_test.rb

@@ -1,7 +1,6 @@
 require_relative "test_helper"
 
-class TestModel < Minitest::Test
-
+class ModelTest < Minitest::Test
   def test_disable_callbacks_model
     store_names ["product a"]
 
@@ -20,7 +19,7 @@ class TestModel < Minitest::Test
   def test_disable_callbacks_global
     # make sure callbacks default to on
     assert Searchkick.callbacks?
-    
+
     store_names ["product a"]
 
     Searchkick.disable_callbacks
@@ -34,5 +33,4 @@ class TestModel < Minitest::Test
 
     assert_search "product", ["product a", "product b"]
   end
-
 end

data/test/query_test.rb

@@ -1,7 +1,6 @@
 require_relative "test_helper"
 
-class TestQuery < Minitest::Test
-
+class QueryTest < Minitest::Test
   def test_basic
     store_names ["Milk", "Apple"]
     query = Product.search("milk", execute: false)
@@ -10,5 +9,4 @@ class TestQuery < Minitest::Test
     query.body[:query] = {match_all: {}}
     assert_equal ["Apple", "Milk"], query.execute.map(&:name).sort
   end
-
 end

data/test/records_test.rb

@@ -1,10 +1,8 @@
 require_relative "test_helper"
 
 class RecordsTest < Minitest::Test
-
   def test_records
     store_names ["Milk", "Apple"]
     assert_equal Product.search("milk").records.where(name: "Milk").count, 1
   end
-
 end

data/test/reindex_job_test.rb

@@ -1,7 +1,6 @@
 require_relative "test_helper"
 
-class TestReindexJob < Minitest::Test
-
+class ReindexJobTest < Minitest::Test
   def setup
     super
     Searchkick.disable_callbacks
@@ -29,5 +28,4 @@ class TestReindexJob < Minitest::Test
     Product.searchkick_index.refresh
     assert_search "*", []
   end
-
 end

data/test/reindex_v2_job_test.rb

@@ -1,7 +1,6 @@
 require_relative "test_helper"
 
-class TestReindexV2Job < Minitest::Test
-
+class ReindexV2JobTest < Minitest::Test
   def setup
     skip unless defined?(ActiveJob)
     super
@@ -30,5 +29,4 @@ class TestReindexV2Job < Minitest::Test
     Product.searchkick_index.refresh
     assert_search "*", []
   end
-
 end

data/test/routing_test.rb

@@ -1,14 +1,15 @@
 require_relative "test_helper"
 
-class TestRouting < Minitest::Test
-
+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, path: "name"
   end
 end

data/test/should_index_test.rb

@@ -1,7 +1,6 @@
 require_relative "test_helper"
 
-class TestShouldIndex < Minitest::Test
-
+class ShouldIndexTest < Minitest::Test
   def test_basic
     store_names ["INDEX", "DO NOT INDEX"]
     assert_search "index", ["INDEX"]
@@ -30,5 +29,4 @@ class TestShouldIndex < Minitest::Test
     Product.searchkick_index.refresh
     assert_search "index", []
   end
-
 end

data/test/similar_test.rb

@@ -1,7 +1,6 @@
 require_relative "test_helper"
 
-class TestSimilar < Minitest::Test
-
+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
@@ -16,5 +15,4 @@ class TestSimilar < Minitest::Test
     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
   end
-
 end

data/test/sql_test.rb

@@ -1,7 +1,6 @@
 require_relative "test_helper"
 
-class TestSql < Minitest::Test
-
+class SqlTest < Minitest::Test
   def test_limit
     store_names ["Product A", "Product B", "Product C", "Product D"]
     assert_order "product", ["Product A", "Product B"], order: {name: :asc}, limit: 2
@@ -139,11 +138,11 @@ class TestSql < Minitest::Test
   # https://gist.github.com/jprante/7099463
   def test_where_range_array
     store [
-      {name: "Product A", user_ids: [11, 23, 13, 16, 17, 23.6]},
-      {name: "Product B", user_ids: [1, 2, 3, 4, 5, 6, 7, 8, 8.9, 9.1, 9.4]},
+      {name: "Product A", user_ids: [11, 23, 13, 16, 17, 23]},
+      {name: "Product B", user_ids: [1, 2, 3, 4, 5, 6, 7, 8, 9]},
       {name: "Product C", user_ids: [101, 230, 150, 200]}
     ]
-    assert_search "product", ["Product A"], where: {user_ids: {gt: 10, lt: 23.9}}
+    assert_search "product", ["Product A"], where: {user_ids: {gt: 10, lt: 24}}
   end
 
   def test_where_range_array_again
@@ -301,9 +300,9 @@ class TestSql < Minitest::Test
 
   def test_big_decimal
     store [
-      {name: "Product", latitude: 100.0}
+      {name: "Product", latitude: 80.0}
     ]
-    assert_search "product", ["Product"], where: {latitude: {gt: 99}}
+    assert_search "product", ["Product"], where: {latitude: {gt: 79}}
   end
 
   # load
@@ -333,7 +332,7 @@ class TestSql < Minitest::Test
   def test_select
     store [{name: "Product A", store_id: 1}]
     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 %w(id name store_id), result.keys.reject { |k| k.start_with?("_") }.sort
     assert_equal ["Product A"], result.name # this is not great
   end
 
@@ -363,5 +362,4 @@ class TestSql < Minitest::Test
       assert Product.search("product", include: [:store]).first.association(:store).loaded?
     end
   end
-
 end