searchkick 0.9.1 → 1.0.0

data/test/suggest_test.rb

@@ -1,7 +1,6 @@
 require_relative "test_helper"
 
-class TestSuggest < Minitest::Test
-
+class SuggestTest < Minitest::Test
   def test_basic
     store_names ["Great White Shark", "Hammerhead Shark", "Tiger Shark"]
     assert_suggest "How Big is a Tigre Shar", "how big is a tiger shark", fields: [:name]
@@ -78,5 +77,4 @@ class TestSuggest < Minitest::Test
   def assert_suggest_all(term, expected, options = {})
     assert_equal expected.sort, Product.search(term, options.merge(suggest: true)).suggestions.sort
   end
-
 end

data/test/synonyms_test.rb

@@ -1,7 +1,6 @@
 require_relative "test_helper"
 
-class TestSynonyms < Minitest::Test
-
+class SynonymsTest < Minitest::Test
   def test_bleach
     store_names ["Clorox Bleach", "Kroger Bleach"]
     assert_search "clorox", ["Clorox Bleach", "Kroger Bleach"]
@@ -46,5 +45,4 @@ class TestSynonyms < Minitest::Test
   #   store_names ["Creature", "Beast", "Dragon"], Animal
   #   assert_search "animal", ["Creature", "Beast"], {}, Animal
   # end
-
 end

data/test/test_helper.rb

@@ -3,6 +3,7 @@ Bundler.require(:default)
 require "minitest/autorun"
 require "minitest/pride"
 require "logger"
+require "active_support/core_ext" if defined?(NoBrainer)
 
 ENV["RACK_ENV"] = "test"
 
@@ -17,11 +18,25 @@ I18n.config.enforce_available_locales = true
 
 ActiveJob::Base.logger = nil if defined?(ActiveJob)
 
-if defined?(Mongoid)
+def elasticsearch2?
+  Searchkick.server_version.starts_with?("2.")
+end
 
-  def mongoid2?
-    Mongoid::VERSION.starts_with?("2.")
-  end
+def mongoid2?
+  defined?(Mongoid) && Mongoid::VERSION.starts_with?("2.")
+end
+
+def nobrainer?
+  defined?(NoBrainer)
+end
+
+def activerecord_below41?
+  defined?(ActiveRecord) && Gem::Version.new(ActiveRecord::VERSION::STRING) < Gem::Version.new("4.1.0")
+end
+
+if defined?(Mongoid)
+  Mongoid.logger.level = Logger::INFO
+  Mongo::Logger.logger.level = Logger::INFO if defined?(Mongo::Logger)
 
   if mongoid2?
     # enable comparison of BSON::ObjectIds
@@ -96,7 +111,7 @@ elsif defined?(NoBrainer)
     field :color,        type: String
     field :latitude
     field :longitude
-    field :description,  type: String
+    field :description, type: String
 
     belongs_to :store, validates: false
   end
@@ -220,15 +235,15 @@ end
 
 class Store
   searchkick \
-    routing: :name,
+    routing: elasticsearch2? ? false : "name",
     merge_mappings: true,
     mappings: {
       store: {
         properties: {
-          name: {type: "string", analyzer: "keyword"},
+          name: {type: "string", analyzer: "keyword"}
         }
       }
-  }
+    }
 end
 
 class Animal
@@ -247,7 +262,6 @@ Store.reindex
 Animal.reindex
 
 class Minitest::Test
-
   def setup
     Product.destroy_all
     Store.destroy_all
@@ -279,5 +293,4 @@ class Minitest::Test
   def assert_first(term, expected, options = {}, klass = Product)
     assert_equal expected, klass.search(term, options).map(&:name).first
   end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: searchkick
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-01 00:00:00.000000000 Z
+date: 2015-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -108,15 +108,6 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- ci/before_install.sh
-- gemfiles/activerecord31.gemfile
-- gemfiles/activerecord32.gemfile
-- gemfiles/activerecord40.gemfile
-- gemfiles/activerecord41.gemfile
-- gemfiles/mongoid2.gemfile
-- gemfiles/mongoid3.gemfile
-- gemfiles/mongoid4.gemfile
-- gemfiles/nobrainer.gemfile
 - lib/searchkick.rb
 - lib/searchkick/index.rb
 - lib/searchkick/logging.rb
@@ -128,9 +119,20 @@ files:
 - lib/searchkick/tasks.rb
 - lib/searchkick/version.rb
 - searchkick.gemspec
+- test/aggs_test.rb
 - test/autocomplete_test.rb
 - test/boost_test.rb
+- test/ci/before_install.sh
 - test/facets_test.rb
+- test/gemfiles/activerecord31.gemfile
+- test/gemfiles/activerecord32.gemfile
+- test/gemfiles/activerecord40.gemfile
+- test/gemfiles/activerecord41.gemfile
+- test/gemfiles/mongoid2.gemfile
+- test/gemfiles/mongoid3.gemfile
+- test/gemfiles/mongoid4.gemfile
+- test/gemfiles/mongoid5.gemfile
+- test/gemfiles/nobrainer.gemfile
 - test/highlight_test.rb
 - test/index_test.rb
 - test/inheritance_test.rb
@@ -174,9 +176,20 @@ summary: Searchkick learns what your users are looking for. As more people searc
   it gets smarter and the results get better. It’s friendly for developers - and magical
   for your users.
 test_files:
+- test/aggs_test.rb
 - test/autocomplete_test.rb
 - test/boost_test.rb
+- test/ci/before_install.sh
 - test/facets_test.rb
+- test/gemfiles/activerecord31.gemfile
+- test/gemfiles/activerecord32.gemfile
+- test/gemfiles/activerecord40.gemfile
+- test/gemfiles/activerecord41.gemfile
+- test/gemfiles/mongoid2.gemfile
+- test/gemfiles/mongoid3.gemfile
+- test/gemfiles/mongoid4.gemfile
+- test/gemfiles/mongoid5.gemfile
+- test/gemfiles/nobrainer.gemfile
 - test/highlight_test.rb
 - test/index_test.rb
 - test/inheritance_test.rb