searchkick 1.5.1 → 2.0.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: searchkick
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Andrew Kane
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: elasticsearch
   requirement: !ruby/object:Gem::Requirement
@@ -56,16 +56,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -116,7 +116,6 @@ files:
 - lib/searchkick/middleware.rb
 - lib/searchkick/model.rb
 - lib/searchkick/query.rb
-- lib/searchkick/reindex_job.rb
 - lib/searchkick/reindex_v2_job.rb
 - lib/searchkick/results.rb
 - lib/searchkick/tasks.rb
@@ -127,9 +126,7 @@ files:
 - test/boost_test.rb
 - test/callbacks_test.rb
 - test/ci/before_install.sh
-- test/dangerous_reindex_test.rb
 - test/errors_test.rb
-- test/facets_test.rb
 - test/gemfiles/activerecord31.gemfile
 - test/gemfiles/activerecord32.gemfile
 - test/gemfiles/activerecord40.gemfile
@@ -156,7 +153,7 @@ files:
 - test/partial_reindex_test.rb
 - test/query_test.rb
 - test/records_test.rb
-- test/reindex_job_test.rb
+- test/reindex_test.rb
 - test/reindex_v2_job_test.rb
 - test/routing_test.rb
 - test/should_index_test.rb
@@ -198,9 +195,7 @@ test_files:
 - test/boost_test.rb
 - test/callbacks_test.rb
 - test/ci/before_install.sh
-- test/dangerous_reindex_test.rb
 - test/errors_test.rb
-- test/facets_test.rb
 - test/gemfiles/activerecord31.gemfile
 - test/gemfiles/activerecord32.gemfile
 - test/gemfiles/activerecord40.gemfile
@@ -227,7 +222,7 @@ test_files:
 - test/partial_reindex_test.rb
 - test/query_test.rb
 - test/records_test.rb
-- test/reindex_job_test.rb
+- test/reindex_test.rb
 - test/reindex_v2_job_test.rb
 - test/routing_test.rb
 - test/should_index_test.rb

data/lib/searchkick/reindex_job.rb

@@ -1,26 +0,0 @@
-module Searchkick
-  class ReindexJob
-    def initialize(klass, id)
-      @klass = klass
-      @id = id
-    end
-
-    def perform
-      model = @klass.constantize
-      record = model.find(@id) rescue nil # TODO fix lazy coding
-      index = model.searchkick_index
-      if !record || !record.should_index?
-        # hacky
-        record ||= model.new
-        record.id = @id
-        begin
-          index.remove record
-        rescue Elasticsearch::Transport::Transport::Errors::NotFound
-          # do nothing
-        end
-      else
-        index.store record
-      end
-    end
-  end
-end

data/test/dangerous_reindex_test.rb

@@ -1,27 +0,0 @@
-require_relative "test_helper"
-
-class DangerousReindexTest < Minitest::Test
-  def setup
-    skip if mongoid2? || nobrainer? || activerecord_below41?
-    super
-  end
-
-  def test_dangerous_reindex
-    assert_raises(Searchkick::DangerousOperation) { Product.where(id: [1, 2, 3]).reindex }
-  end
-
-  def test_dangerous_index_associations
-    Store.create!(name: "Test")
-    assert_raises(Searchkick::DangerousOperation) { Store.first.products.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

data/test/facets_test.rb

@@ -1,90 +0,0 @@
-require_relative "test_helper"
-
-class FacetsTest < Minitest::Test
-  def setup
-    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},
-      {name: "Product Hide", latitude: 29.4167, longitude: -98.5000, store_id: 2, in_stock: false, color: "green", price: 25, created_at: 2.days.from_now},
-      {name: "Product B", latitude: 43.9333, longitude: -122.4667, store_id: 2, in_stock: false, color: "red", price: 5},
-      {name: "Foo", latitude: 43.9333, longitude: 12.4667, store_id: 3, in_stock: false, color: "yellow", price: 15}
-    ]
-  end
-
-  def test_basic
-    assert_equal ({1 => 1, 2 => 2}), store_facet(facets: [:store_id])
-  end
-
-  def test_where
-    assert_equal ({1 => 1}), store_facet(facets: {store_id: {where: {in_stock: true}}})
-  end
-
-  def test_field
-    assert_equal ({1 => 1, 2 => 2}), store_facet(facets: {store_id: {}})
-    assert_equal ({1 => 1, 2 => 2}), store_facet(facets: {store_id: {field: "store_id"}})
-    assert_equal ({1 => 1, 2 => 2}), store_facet({facets: {store_id_new: {field: "store_id"}}}, "store_id_new")
-  end
-
-  def test_limit
-    facet = Product.search("Product", facets: {store_id: {limit: 1}}).facets["store_id"]
-    assert_equal 1, facet["terms"].size
-    assert_equal 3, facet["total"]
-    assert_equal 1, facet["other"]
-  end
-
-  def test_ranges
-    price_ranges = [{to: 10}, {from: 10, to: 20}, {from: 20}]
-    facet = Product.search("Product", facets: {price: {ranges: price_ranges}}).facets["price"]
-
-    assert_equal 3, facet["ranges"].size
-    assert_equal 10.0, facet["ranges"][0]["to"]
-    assert_equal 20.0, facet["ranges"][2]["from"]
-    assert_equal 1, facet["ranges"][0]["count"]
-    assert_equal 0, facet["ranges"][1]["count"]
-    assert_equal 2, facet["ranges"][2]["count"]
-  end
-
-  def test_ranges_dates
-    ranges = [{to: 1.day.ago}, {from: 1.day.ago, to: 1.day.from_now}, {from: 1.day.from_now}]
-    facet = Product.search("Product", facets: {created_at: {ranges: ranges}}).facets["created_at"]
-
-    assert_equal 1, facet["ranges"][0]["count"]
-    assert_equal 1, facet["ranges"][1]["count"]
-    assert_equal 1, facet["ranges"][2]["count"]
-  end
-
-  def test_where_no_smart_facets
-    assert_equal ({2 => 2}), store_facet(where: {color: "red"}, facets: {store_id: {where: {in_stock: false}}})
-  end
-
-  def test_smart_facets
-    assert_equal ({1 => 1}), store_facet(where: {in_stock: true}, facets: [:store_id], smart_facets: true)
-  end
-
-  def test_smart_facets_where
-    assert_equal ({2 => 1}), store_facet(where: {color: "red"}, facets: {store_id: {where: {in_stock: false}}}, smart_facets: true)
-  end
-
-  def test_smart_facets_skip_facet
-    assert_equal ({1 => 1, 2 => 2}), store_facet(where: {store_id: 2}, facets: [:store_id], smart_facets: true)
-  end
-
-  def test_smart_facets_skip_facet_complex
-    assert_equal ({1 => 1, 2 => 1}), store_facet(where: {store_id: 2, price: {gt: 5}}, facets: [:store_id], smart_facets: true)
-  end
-
-  def test_stats_facets
-    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)
-    assert_equal expected_facets_keys, facets.first.keys
-  end
-
-  protected
-
-  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/test/reindex_job_test.rb

@@ -1,31 +0,0 @@
-require_relative "test_helper"
-
-class ReindexJobTest < Minitest::Test
-  def setup
-    super
-    Searchkick.disable_callbacks
-  end
-
-  def teardown
-    Searchkick.enable_callbacks
-  end
-
-  def test_create
-    product = Product.create!(name: "Boom")
-    Product.searchkick_index.refresh
-    assert_search "*", []
-    Searchkick::ReindexJob.new("Product", product.id.to_s).perform
-    Product.searchkick_index.refresh
-    assert_search "*", ["Boom"]
-  end
-
-  def test_destroy
-    product = Product.create!(name: "Boom")
-    Product.reindex
-    assert_search "*", ["Boom"]
-    product.destroy
-    Searchkick::ReindexJob.new("Product", product.id.to_s).perform
-    Product.searchkick_index.refresh
-    assert_search "*", []
-  end
-end