searchkick 1.2.1 → 1.3.0

data/lib/searchkick/version.rb

@@ -1,3 +1,3 @@
 module Searchkick
-  VERSION = "1.2.1"
+  VERSION = "1.3.0"
 end

data/test/aggs_test.rb

@@ -30,6 +30,10 @@ class AggsTest < Minitest::Test
     assert_equal ({1 => 1, 2 => 2}), store_agg({aggs: {store_id_new: {field: "store_id"}}}, "store_id_new")
   end
 
+  def test_min_doc_count
+    assert_equal ({2 => 2}), store_agg(aggs: {store_id: {min_doc_count: 2}})
+  end
+
   def test_no_aggs
     assert_nil Product.search("*").aggs
   end

data/test/ci/before_install.sh

@@ -3,8 +3,12 @@
 gem install bundler
 
 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
+if [[ $ELASTICSEARCH_VERSION == 1* ]]; then
+  wget https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-$ELASTICSEARCH_VERSION.deb
+else
+  wget https://download.elastic.co/elasticsearch/release/org/elasticsearch/distribution/deb/elasticsearch/$ELASTICSEARCH_VERSION/elasticsearch-$ELASTICSEARCH_VERSION.deb
+fi
+sudo dpkg -i elasticsearch-$ELASTICSEARCH_VERSION.deb
 sudo service elasticsearch start
 
 if [ -n "$NOBRAINER" ]; then

data/test/facets_test.rb

@@ -2,7 +2,7 @@ require_relative "test_helper"
 
 class FacetsTest < Minitest::Test
   def setup
-    skip if elasticsearch2?
+    skip unless elasticsearch_below20?
     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},

data/test/gemfiles/apartment.gemfile

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

data/test/match_test.rb

@@ -110,12 +110,14 @@ class MatchTest < Minitest::Test
   end
 
   def test_misspelling_zucchini_transposition
+    skip if elasticsearch_below14?
     store_names ["zucchini"]
     assert_search "zuccihni", ["zucchini"]
     assert_search "zuccihni", [], misspellings: {transpositions: false}
   end
 
   def test_misspelling_lasagna
+    skip if elasticsearch_below14?
     store_names ["lasagna"]
     assert_search "lasanga", ["lasagna"], misspellings: {transpositions: true}
     assert_search "lasgana", ["lasagna"], misspellings: {transpositions: true}
@@ -124,6 +126,7 @@ class MatchTest < Minitest::Test
   end
 
   def test_misspelling_lasagna_pasta
+    skip if elasticsearch_below14?
     store_names ["lasagna pasta"]
     assert_search "lasanga", ["lasagna pasta"], misspellings: {transpositions: true}
     assert_search "lasanga pasta", ["lasagna pasta"], misspellings: {transpositions: true}
@@ -191,6 +194,11 @@ class MatchTest < Minitest::Test
     assert_search "ben & jerrys", ["Ben and Jerry's"]
   end
 
+  def test_phrase
+    store_names ["Fresh Honey", "Honey Fresh"]
+    assert_search "fresh honey", ["Fresh Honey"], match: :phrase
+  end
+
   def test_unsearchable
     store [
       {name: "Unsearchable", description: "Almond"}

data/test/multi_tenancy_test.rb

@@ -0,0 +1,22 @@
+require_relative "test_helper"
+
+class MultiTenancyTest < Minitest::Test
+  def setup
+    skip unless defined?(Apartment)
+  end
+
+  def test_basic
+    Apartment::Tenant.switch!("tenant1")
+    store_names ["Product A"], Tenant
+    Apartment::Tenant.switch!("tenant2")
+    store_names ["Product B"], Tenant
+    Apartment::Tenant.switch!("tenant1")
+    assert_search "product", ["Product A"], {load: false}, Tenant
+    Apartment::Tenant.switch!("tenant2")
+    assert_search "product", ["Product B"], {load: false}, Tenant
+  end
+
+  def teardown
+    Apartment::Tenant.reset if defined?(Apartment)
+  end
+end

data/test/order_test.rb

@@ -28,9 +28,15 @@ class OrderTest < Minitest::Test
   end
 
   def test_order_ignore_unmapped
+    skip unless elasticsearch_below50?
     assert_order "product", [], order: {not_mapped: {ignore_unmapped: true}}
   end
 
+  def test_order_unmapped_type
+    skip if elasticsearch_below50?
+    assert_order "product", [], order: {not_mapped: {unmapped_type: "long"}}
+  end
+
   def test_order_array
     store [{name: "San Francisco", latitude: 37.7833, longitude: -122.4167}]
     assert_order "francisco", ["San Francisco"], order: [{_geo_distance: {location: "0,0"}}]

data/test/sql_test.rb

@@ -77,6 +77,7 @@ class SqlTest < Minitest::Test
   # select
 
   def test_select
+    skip unless elasticsearch_below50?
     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
@@ -85,12 +86,14 @@ class SqlTest < Minitest::Test
   end
 
   def test_select_array
+    skip unless elasticsearch_below50?
     store [{name: "Product A", user_ids: [1, 2]}]
     result = Product.search("product", load: false, select: [:user_ids]).first
     assert_equal [1, 2], result.user_ids
   end
 
   def test_select_single_field
+    skip unless elasticsearch_below50?
     store [{name: "Product A", store_id: 1}]
     result = Product.search("product", load: false, select: :name).first
     assert_equal %w(id name), result.keys.reject { |k| k.start_with?("_") }.sort
@@ -99,6 +102,7 @@ class SqlTest < Minitest::Test
   end
 
   def test_select_all
+    skip unless elasticsearch_below50?
     store [{name: "Product A", user_ids: [1, 2]}]
     hit = Product.search("product", select: true).hits.first
     assert_equal hit["_source"]["name"], "Product A"
@@ -106,6 +110,7 @@ class SqlTest < Minitest::Test
   end
 
   def test_select_none
+    skip unless elasticsearch_below50?
     store [{name: "Product A", user_ids: [1, 2]}]
     hit = Product.search("product", select: []).hits.first
     assert_nil hit["_source"]

data/test/test_helper.rb

@@ -21,8 +21,16 @@ I18n.config.enforce_available_locales = true
 ActiveJob::Base.logger = nil if defined?(ActiveJob)
 ActiveSupport::LogSubscriber.logger = Logger.new(STDOUT) if ENV["NOTIFICATIONS"]
 
-def elasticsearch2?
-  Searchkick.server_version.starts_with?("2.")
+def elasticsearch_below50?
+  Searchkick.server_below?("5.0.0-alpha1")
+end
+
+def elasticsearch_below20?
+  Searchkick.server_below?("2.0.0")
+end
+
+def elasticsearch_below14?
+  Searchkick.server_below?("1.4.0")
 end
 
 def mongoid2?
@@ -156,6 +164,43 @@ else
 
   ActiveRecord::Base.raise_in_transactional_callbacks = true if ActiveRecord::Base.respond_to?(:raise_in_transactional_callbacks=)
 
+  if defined?(Apartment)
+    class Rails
+      def self.env
+        ENV["RACK_ENV"]
+      end
+    end
+
+    tenants = ["tenant1", "tenant2"]
+    Apartment.configure do |config|
+      config.tenant_names = tenants
+      config.database_schema_file = false
+      config.excluded_models = ["Product", "Store", "Animal", "Dog", "Cat"]
+    end
+
+    class Tenant < ActiveRecord::Base
+      searchkick index_prefix: -> { Apartment::Tenant.current }
+    end
+
+    tenants.each do |tenant|
+      begin
+        Apartment::Tenant.create(tenant)
+      rescue Apartment::TenantExists
+        # do nothing
+      end
+      Apartment::Tenant.switch!(tenant)
+
+      ActiveRecord::Migration.create_table :tenants, force: true do |t|
+        t.string :name
+        t.timestamps null: true
+      end
+
+      Tenant.reindex
+    end
+
+    Apartment::Tenant.reset
+  end
+
   ActiveRecord::Migration.create_table :products do |t|
     t.string :name
     t.integer :store_id
@@ -251,7 +296,7 @@ class Store
     mappings: {
       store: {
         properties: {
-          name: {type: "string", analyzer: "keyword"}
+          name: elasticsearch_below50? ? {type: "string", analyzer: "keyword"} : {type: "keyword"}
         }
       }
     }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: searchkick
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-15 00:00:00.000000000 Z
+date: 2016-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -131,6 +131,7 @@ files:
 - test/gemfiles/activerecord32.gemfile
 - test/gemfiles/activerecord40.gemfile
 - test/gemfiles/activerecord41.gemfile
+- test/gemfiles/apartment.gemfile
 - test/gemfiles/mongoid2.gemfile
 - test/gemfiles/mongoid3.gemfile
 - test/gemfiles/mongoid4.gemfile
@@ -143,6 +144,7 @@ files:
 - test/misspellings_test.rb
 - test/model_test.rb
 - test/multi_search_test.rb
+- test/multi_tenancy_test.rb
 - test/order_test.rb
 - test/pagination_test.rb
 - test/query_test.rb
@@ -177,7 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.1
 signing_key: 
 specification_version: 4
 summary: Searchkick learns what your users are looking for. As more people search,
@@ -195,6 +197,7 @@ test_files:
 - test/gemfiles/activerecord32.gemfile
 - test/gemfiles/activerecord40.gemfile
 - test/gemfiles/activerecord41.gemfile
+- test/gemfiles/apartment.gemfile
 - test/gemfiles/mongoid2.gemfile
 - test/gemfiles/mongoid3.gemfile
 - test/gemfiles/mongoid4.gemfile
@@ -207,6 +210,7 @@ test_files:
 - test/misspellings_test.rb
 - test/model_test.rb
 - test/multi_search_test.rb
+- test/multi_tenancy_test.rb
 - test/order_test.rb
 - test/pagination_test.rb
 - test/query_test.rb