searchkick 2.1.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5fcfaef2d99cf6def7035bc882eecf161f687dca
-  data.tar.gz: a50200b8381e063e3c355586c898d1d8dc3b360a
+  metadata.gz: 85108ff6dc90bd7075f66c5627fc06eba581657f
+  data.tar.gz: 062420bd6cd4c9601026425d40923cc82e649364
 SHA512:
-  metadata.gz: 6ddbce0ef6d29c51b2884ffc1791acedb886a3a4915889b059941fdcf0c9a5f9cbe68e50df7a82934d9cbc8b278b032bd789a2ec57d354f7b2fc09ebe9a91f8b
-  data.tar.gz: ab3dbbb296596682c5b9caaf6ba47f5d5299e60fd66bc53f31d14ecd9ac99f3f2f96404ea5f71e36f4cf02e310ffabb8c0d5c1b9a155d05e474e1e03bae67764
+  metadata.gz: 680ef536ba5e15456b0df70412eec5e47d13f43424c02e7d039921abf3c83b06fbaefa95d824fa2ae0efeecde8c6488ad56b4aabed442eb6c191a309f2204c6c
+  data.tar.gz: d118d331ffd37c1fbec228bba2cc043f03730510a0ca45d7bd9afe9c04aa31a8ebeeaba82b57113c070fd7af3b1c8c347f0b22bd8cff43565f9246ed408a0c77

data/.travis.yml

@@ -19,7 +19,7 @@ gemfile:
   - test/gemfiles/mongoid5.gemfile
   - test/gemfiles/mongoid6.gemfile
 env:
-  - ELASTICSEARCH_VERSION=5.1.1
+  - ELASTICSEARCH_VERSION=5.2.0
 jdk: oraclejdk8
 matrix:
   include:

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 2.2.0
+
+- Fixed bug with text values longer than 256 characters and `_all` field - see [#850](https://github.com/ankane/searchkick/issues/850)
+- Fixed issue with `_all` field in `searchable`
+- Fixed `exclude` option with `word_start`
+
 ## 2.1.1
 
 - Fixed duplicate notifications
@@ -41,6 +47,10 @@ Breaking changes
 - Removed support for Elasticsearch 1 as it reaches [end of life](https://www.elastic.co/support/eol)
 - Removed facets, legacy options, and legacy methods
 - Invalid options now throw an `ArgumentError`
+- The `query` and `json` options have been removed in favor of `body`
+- The `include` option has been removed in favor of `includes`
+- The `personalize` option has been removed in favor of `boost_where`
+- The `partial` option has been removed in favor of `operator`
 - Renamed `select_v2` to `select` (legacy `select` no longer available)
 - The `_all` field is disabled if `searchable` option is used (for performance)
 - The `partial_reindex(:method_name)` method has been replaced with `reindex(:method_name)`

data/README.md

@@ -47,9 +47,7 @@ Plus:
 
 ```sh
 brew install elasticsearch
-
-# start the server
-elasticsearch
+brew services start elasticsearch
 ```
 
 Add this line to your application’s Gemfile:
@@ -385,6 +383,17 @@ If a user searches `butter`, they may also get results for `peanut butter`. To p
 Product.search "butter", exclude: ["peanut butter"]
 ```
 
+You can map queries and terms to exclude with:
+
+```ruby
+exclude_queries = {
+  "butter" => ["peanut butter"],
+  "cream" => ["ice cream"]
+}
+
+Product.search query, exclude: exclude_queries[query]
+```
+
 ### Emoji
 
 Search :ice_cream::cake: and get `ice cream cake`!
@@ -1018,7 +1027,7 @@ Product.search_index.tokens("dieg", analyzer: "searchkick_word_search")
 # ["dieg"] - match!!
 ```
 
-See the [complete list of analyzers](lib/searchkick/index.rb#L209).
+See the [complete list of analyzers](https://github.com/ankane/searchkick/blob/31780ddac7a89eab1e0552a32b403f2040a37931/lib/searchkick/index_options.rb#L32).
 
 ## Deployment
 
@@ -1136,9 +1145,11 @@ Significantly increase performance with faster JSON generation. Add [Oj](https:/
 gem 'oj'
 ```
 
+This speeds up all JSON generation and parsing in your application (automatically!)
+
 ### Persistent HTTP Connections
 
-Significantly increase performance with persistent HTTP connections. Add [Typhoeus](https://github.com/typhoeus/typhoeus) to your Gemfile.
+Significantly increase performance with persistent HTTP connections. Add [Typhoeus](https://github.com/typhoeus/typhoeus) to your Gemfile and it’ll automatically be used.
 
 ```ruby
 gem 'typhoeus'
@@ -1199,18 +1210,19 @@ And use:
 Searchkick.reindex_status(index_name)
 ```
 
-You can use [ActiveJob::TrafficControl](https://github.com/nickelser/activejob-traffic_control) to control concurrency. Install the gem and create an initializer with:
+You can use [ActiveJob::TrafficControl](https://github.com/nickelser/activejob-traffic_control) to control concurrency. Install the gem:
 
 ```ruby
-require "active_job/traffic_control"
+gem 'activejob-traffic_control', '>= 0.1.3'
+```
 
-Searchkick.redis = Redis.new
+And create an initializer with:
+
+```ruby
 ActiveJob::TrafficControl.client = Searchkick.redis
 
 class Searchkick::BulkReindexJob
-  include ActiveJob::TrafficControl::Concurrency
-
-  concurrency 3, drop: false
+  concurrency 3
 end
 ```
 
@@ -1677,21 +1689,78 @@ Product.search "ah", misspellings: {prefix_length: 2} # ah, no aha
 
 ## Testing
 
-This section could use some love.
+For performance, only enable Searchkick callbacks for the tests that need it.
+
+### Minitest
+
+Add to your `test/test_helper.rb`:
+
+```ruby
+# reindex models
+Product.reindex
+
+# and disable callbacks
+Searchkick.disable_callbacks
+```
+
+And use:
+
+```ruby
+class ProductTest < Minitest::Test
+  def setup
+    Searchkick.enable_callbacks
+  end
+
+  def teardown
+    Searchkick.disable_callbacks
+  end
+
+  def test_search
+    Product.create!(name: "Apple")
+    Product.search_index.refresh
+    assert_equal ["Apple"], Product.search("apple").map(&:name)
+  end
+end
+```
 
 ### RSpec
 
+Add to your `spec/spec_helper.rb`:
+
 ```ruby
-describe Product do
-  it "searches" do
+RSpec.configure do |config|
+  config.before(:suite) do
+    # reindex models
     Product.reindex
-    # test goes here...
+
+    # and disable callbacks
+    Searchkick.disable_callbacks
+  end
+
+  config.around(:each, search: true) do |example|
+    Searchkick.enable_callbacks
+    example.run
+    Searchkick.disable_callbacks
+  end
+end
+```
+
+And use:
+
+```ruby
+describe Product, search: true do
+  it "searches" do
+    Product.create!(name: "Apple")
+    Product.search_index.refresh
+    assert_equal ["Apple"], Product.search("apple").map(&:name)
   end
 end
 ```
 
 ### Factory Girl
 
+Manually reindex after an instance is created.
+
 ```ruby
 product = FactoryGirl.create(:product)
 product.reindex(refresh: true)
@@ -1716,6 +1785,10 @@ Important notes are listed below.
 - Removed support for Elasticsearch 1 as it reaches [end of life](https://www.elastic.co/support/eol)
 - Removed facets, legacy options, and legacy methods
 - Invalid options now throw an `ArgumentError`
+- The `query` and `json` options have been removed in favor of `body`
+- The `include` option has been removed in favor of `includes`
+- The `personalize` option has been removed in favor of `boost_where`
+- The `partial` option has been removed in favor of `operator`
 - Renamed `select_v2` to `select` (legacy `select` no longer available)
 - The `_all` field is disabled if `searchable` option is used (for performance)
 - The `partial_reindex(:method_name)` method has been replaced with `reindex(:method_name)`
@@ -1754,6 +1827,15 @@ Before `0.3.0`, locations were indexed incorrectly. When upgrading, be sure to r
 
 ## Elasticsearch Gotchas
 
+### Consistency
+
+Elasticsearch is eventually consistent, meaning it can take up to a second for a change to reflect in search. You can use the `refresh` method to have it show up immediately.
+
+```ruby
+product.save!
+Product.search_index.refresh
+```
+
 ### Inconsistent Scores
 
 Due to the distributed nature of Elasticsearch, you can get incorrect results when the number of documents in the index is low. You can [read more about it here](https://www.elastic.co/blog/understanding-query-then-fetch-vs-dfs-query-then-fetch). To fix this, do:

data/lib/searchkick/index.rb

@@ -159,6 +159,7 @@ module Searchkick
 
     # search
 
+    # TODO remove in next major version
     def search_model(searchkick_klass, term = "*", **options, &block)
       query = Searchkick::Query.new(searchkick_klass, term, options)
       yield(query.body) if block

data/lib/searchkick/index_options.rb

@@ -25,7 +25,7 @@ module Searchkick
             }
           end
 
-        keyword_mapping[:ignore_above] = (options[:ignore_above] || 256) unless below22
+        keyword_mapping[:ignore_above] = (options[:ignore_above] || 30000) unless below22
 
         settings = {
           analysis: {
@@ -227,6 +227,8 @@ module Searchkick
 
         word = options[:word] != false && (!options[:match] || options[:match] == :word)
 
+        mapping_options[:searchable].delete("_all")
+
         mapping_options.values.flatten.uniq.each do |field|
           fields = {}
 
@@ -286,8 +288,6 @@ module Searchkick
           dynamic_fields["{name}"] = {type: default_type, index: "no"}
         end
 
-        dynamic_fields["{name}"][:ignore_above] = (options[:ignore_above] || 256) unless below22
-
         unless options[:searchable]
           if options[:match] && options[:match] != :word
             dynamic_fields[options[:match]] = {type: default_type, index: "analyzed", analyzer: "searchkick_#{options[:match]}_index"}
@@ -301,7 +301,7 @@ module Searchkick
         # http://www.elasticsearch.org/guide/reference/mapping/multi-field-type/
         multi_field = dynamic_fields["{name}"].merge(fields: dynamic_fields.except("{name}"))
 
-        all_enabled = !options[:searchable] || options[:searchable].to_a.include?("_all")
+        all_enabled = !options[:searchable] || options[:searchable].to_a.map(&:to_s).include?("_all")
 
         mappings = {
           _default_: {

data/lib/searchkick/model.rb

@@ -26,7 +26,7 @@ module Searchkick
 
         class << self
           def searchkick_search(term = "*", **options, &block)
-            searchkick_index.search_model(self, term, options, &block)
+            Searchkick.search(term, {model: self}.merge(options), &block)
           end
           alias_method Searchkick.search_method_name, :searchkick_search if Searchkick.search_method_name
 
@@ -144,6 +144,12 @@ module Searchkick
         def should_index?
           true
         end unless method_defined?(:should_index?)
+
+        if defined?(Cequel) && self < Cequel::Record && !method_defined?(:destroyed?)
+          def destroyed?
+            transient?
+          end
+        end
       end
     end
   end

data/lib/searchkick/process_queue_job.rb

@@ -6,7 +6,7 @@ module Searchkick
       model = class_name.constantize
 
       limit = model.searchkick_index.options[:batch_size] || 1000
-      record_ids = Searchkick::ReindexQueue.new(model.searchkick_index.name).reserve(limit: limit)
+      record_ids = model.searchkick_index.reindex_queue.reserve(limit: limit)
       if record_ids.any?
         Searchkick::ProcessBatchJob.perform_later(
           class_name: model.name,

data/lib/searchkick/query.rb

@@ -283,18 +283,25 @@ module Searchkick
 
             shared_options[:operator] = operator if match_type == :match
 
+            exclude_analyzer = nil
+            exclude_field = field
+
             if field == "_all" || field.end_with?(".analyzed")
               shared_options[:cutoff_frequency] = 0.001 unless operator == "and" || misspellings == false
               qs.concat [
                 shared_options.merge(analyzer: "searchkick_search"),
                 shared_options.merge(analyzer: "searchkick_search2")
               ]
+              exclude_analyzer = "searchkick_search2"
             elsif field.end_with?(".exact")
               f = field.split(".")[0..-2].join(".")
               queries_to_add << {match: {f => shared_options.merge(analyzer: "keyword")}}
+              exclude_field = f
+              exclude_analyzer = "keyword"
             else
               analyzer = field =~ /\.word_(start|middle|end)\z/ ? "searchkick_word_search" : "searchkick_autocomplete_search"
               qs << shared_options.merge(analyzer: analyzer)
+              exclude_analyzer = analyzer
             end
 
             if misspellings != false && match_type == :match
@@ -324,7 +331,10 @@ module Searchkick
                 options[:exclude].map do |phrase|
                   {
                     match_phrase: {
-                      field => phrase
+                      exclude_field => {
+                        query: phrase,
+                        analyzer: exclude_analyzer
+                      }
                     }
                   }
                 end

data/lib/searchkick/reindex_v2_job.rb

@@ -3,7 +3,8 @@ module Searchkick
     RECORD_NOT_FOUND_CLASSES = [
       "ActiveRecord::RecordNotFound",
       "Mongoid::Errors::DocumentNotFound",
-      "NoBrainer::Error::DocumentNotFound"
+      "NoBrainer::Error::DocumentNotFound",
+      "Cequel::Record::RecordNotFound"
     ]
 
     queue_as :searchkick

data/lib/searchkick/version.rb

@@ -1,3 +1,3 @@
 module Searchkick
-  VERSION = "2.1.1"
+  VERSION = "2.2.0"
 end

data/lib/searchkick.rb

@@ -81,7 +81,17 @@ module Searchkick
   end
 
   def self.search(term = "*", **options, &block)
-    query = Searchkick::Query.new(nil, term, options)
+    klass = options[:model]
+
+    # TODO add in next major version
+    # if !klass
+    #   index_name = Array(options[:index_name])
+    #   if index_name.size == 1 && index_name.first.respond_to?(:searchkick_index)
+    #     klass = index_name.first
+    #   end
+    # end
+
+    query = Searchkick::Query.new(klass, term, options.except(:model))
     block.call(query.body) if block
     if options[:execute] == false
       query
@@ -169,6 +179,8 @@ module Searchkick
       elsif records.respond_to?(:unscoped) && :id.respond_to?(:in)
         # Nobrainer
         records.unscoped.where(:id.in => ids)
+      elsif records.respond_to?(:key_column_names)
+        records.where(records.key_column_names.first => ids)
       end
 
     raise Searchkick::Error, "Not sure how to load records" if !records

data/test/aggs_test.rb

@@ -6,8 +6,8 @@ class AggsTest < Minitest::Test
     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}
+      {name: "Product B", latitude: 43.9333, longitude: -122.4667, store_id: 2, in_stock: false, color: "red", price: 5, created_at: Time.now},
+      {name: "Foo", latitude: 43.9333, longitude: 12.4667, store_id: 3, in_stock: false, color: "yellow", price: 15, created_at: Time.now}
     ]
   end
 

data/test/boost_test.rb

@@ -86,6 +86,14 @@ class BoostTest < Minitest::Test
     assert_order "red", ["Red", "White"], fields: [{"name^10" => :word_start}, "color"]
   end
 
+  # for issue #855
+  def test_apostrophes
+    store_names ["Valentine's Day Special"]
+    assert_search "Valentines", ["Valentine's Day Special"], fields: ["name^5"]
+    assert_search "Valentine's", ["Valentine's Day Special"], fields: ["name^5"]
+    assert_search "Valentine", ["Valentine's Day Special"], fields: ["name^5"]
+  end
+
   def test_boost_by
     store [
       {name: "Tomato A"},
@@ -157,6 +165,8 @@ class BoostTest < Minitest::Test
   end
 
   def test_boost_by_indices
+    skip if cequel?
+
     store_names ["Rex"], Animal
     store_names ["Rexx"], Product
 

data/test/errors_test.rb

@@ -2,8 +2,8 @@ require_relative "test_helper"
 
 class ErrorsTest < Minitest::Test
   def test_bulk_import_raises_error
-    valid_dog = Dog.new(name: "2016-01-02")
-    invalid_dog = Dog.new(name: "Ol' One-Leg")
+    valid_dog = Product.new(name: "2016-01-02")
+    invalid_dog = Product.new(name: "Ol' One-Leg")
     index = Searchkick::Index.new "dogs", mappings: {
       dog: {
         properties: {

data/test/gemfiles/activerecord51.gemfile

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

data/test/gemfiles/cequel.gemfile

@@ -0,0 +1,8 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in searchkick.gemspec
+gemspec path: "../../"
+
+gem "cequel"
+gem "activejob"
+gem "redis"

data/test/highlight_test.rb

@@ -46,6 +46,11 @@ class HighlightTest < Minitest::Test
     assert_equal "&lt;b&gt;<em>Hello</em>&lt;&#x2F;b&gt;", Product.search("hello", fields: [:name], highlight: {encoder: "html"}, misspellings: false).first.search_highlights[:name]
   end
 
+  def test_word_middle
+    store_names ["Two Door Cinema Club"]
+    assert_equal "Two Door <em>Cinema</em> Club", Product.search("ine", fields: [:name], match: :word_middle, highlight: true).first.search_highlights[:name]
+  end
+
   def test_body
     skip if ENV["MATCH"] == "word_start"
     store_names ["Two Door Cinema Club"]

data/test/index_test.rb

@@ -1,6 +1,11 @@
 require_relative "test_helper"
 
 class IndexTest < Minitest::Test
+  def setup
+    super
+    Region.destroy_all
+  end
+
   def test_clean_indices
     old_index = Searchkick::Index.new("products_test_20130801000000000")
     different_index = Searchkick::Index.new("items_test_20130801000000000")
@@ -127,8 +132,20 @@ class IndexTest < Minitest::Test
 
   def test_large_value
     skip if nobrainer?
+    large_value = 1000.times.map { "hello" }.join(" ")
+    store [{name: "Product A", text: large_value}], Region
+    assert_search "product", ["Product A"], {}, Region
+    assert_search "hello", ["Product A"], {fields: [:name, :text]}, Region
+    assert_search "hello", ["Product A"], {}, Region
+  end
+
+  def test_very_large_value
+    skip if nobrainer? || elasticsearch_below22?
     large_value = 10000.times.map { "hello" }.join(" ")
-    store [{name: "Product A", alt_description: large_value}]
-    assert_search "product", ["Product A"]
+    store [{name: "Product A", text: large_value}], Region
+    assert_search "product", ["Product A"], {}, Region
+    assert_search "hello", ["Product A"], {fields: [:name, :text]}, Region
+    # values that exceed ignore_above are not included in _all field :(
+    # assert_search "hello", ["Product A"], {}, Region
   end
 end

data/test/inheritance_test.rb

@@ -1,6 +1,11 @@
 require_relative "test_helper"
 
 class InheritanceTest < Minitest::Test
+  def setup
+    skip if defined?(Cequel)
+    super
+  end
+
   def test_child_reindex
     store_names ["Max"], Cat
     assert Dog.reindex

data/test/match_test.rb

@@ -161,21 +161,31 @@ class MatchTest < Minitest::Test
 
   # butter
 
-  def test_butter
+  def test_exclude_butter
     store_names ["Butter Tub", "Peanut Butter Tub"]
     assert_search "butter", ["Butter Tub"], exclude: ["peanut butter"]
   end
 
-  def test_butter_word_start
+  def test_exclude_butter_word_start
     store_names ["Butter Tub", "Peanut Butter Tub"]
     assert_search "butter", ["Butter Tub"], exclude: ["peanut butter"], match: :word_start
   end
 
-  def test_butter_exact
+  def test_exclude_butter_exact
     store_names ["Butter Tub", "Peanut Butter Tub"]
     assert_search "butter", [], exclude: ["peanut butter"], match: :exact
   end
 
+  def test_exclude_same_exact
+    store_names ["Butter Tub", "Peanut Butter Tub"]
+    assert_search "Butter Tub", [], exclude: ["Butter Tub"], match: :exact
+  end
+
+  def test_exclude_egg_word_start
+    store_names ["eggs", "eggplant"]
+    assert_search "egg", ["eggs"], exclude: ["eggplant"], match: :word_start
+  end
+
   # other
 
   def test_all
@@ -184,6 +194,7 @@ class MatchTest < Minitest::Test
   end
 
   def test_no_arguments
+    store_names []
     assert_equal [], Product.search.to_a
   end
 

data/test/model_test.rb

@@ -37,6 +37,6 @@ class ModelTest < Minitest::Test
   def test_multiple_models
     store_names ["Product A"]
     store_names ["Product B"], Speaker
-    assert_equal Product.all + Speaker.all, Searchkick.search("product", index_name: [Product, Speaker], fields: [:name], order: "name").to_a
+    assert_equal Product.all.to_a + Speaker.all.to_a, Searchkick.search("product", index_name: [Product, Speaker], fields: [:name], order: "name").to_a
   end
 end

data/test/order_test.rb

@@ -12,6 +12,8 @@ class OrderTest < Minitest::Test
   end
 
   def test_order_id
+    skip if cequel?
+
     store_names ["Product A", "Product B"]
     product_a = Product.where(name: "Product A").first
     product_b = Product.where(name: "Product B").first

data/test/records_test.rb

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

data/test/reindex_test.rb

@@ -2,7 +2,7 @@ require_relative "test_helper"
 
 class ReindexTest < Minitest::Test
   def test_scoped
-    skip if nobrainer?
+    skip if nobrainer? || cequel?
 
     store_names ["Product A"]
     Searchkick.callbacks(false) do
@@ -13,7 +13,7 @@ class ReindexTest < Minitest::Test
   end
 
   def test_associations
-    skip if nobrainer?
+    skip if nobrainer? || cequel?
 
     store_names ["Product A"]
     store = Store.create!(name: "Test")

data/test/test_helper.rb

@@ -45,6 +45,10 @@ def nobrainer?
   defined?(NoBrainer)
 end
 
+def cequel?
+  defined?(Cequel)
+end
+
 if defined?(Mongoid)
   Mongoid.logger.level = Logger::INFO
   Mongo::Logger.logger.level = Logger::INFO if defined?(Mongo::Logger)
@@ -162,6 +166,88 @@ elsif defined?(NoBrainer)
 
   class Cat < Animal
   end
+elsif defined?(Cequel)
+  cequel =
+    Cequel.connect(
+      host: "127.0.0.1",
+      port: 9042,
+      keyspace: "searchkick_test",
+      default_consistency: :all
+    )
+  # cequel.logger = ActiveSupport::Logger.new(STDOUT)
+  cequel.schema.drop! if cequel.schema.exists?
+  cequel.schema.create!
+  Cequel::Record.connection = cequel
+
+  class Product
+    include Cequel::Record
+
+    key :id, :uuid, auto: true
+    column :name, :text, index: true
+    column :store_id, :int
+    column :in_stock, :boolean
+    column :backordered, :boolean
+    column :orders_count, :int
+    column :found_rate, :decimal
+    column :price, :int
+    column :color, :text
+    column :latitude, :decimal
+    column :longitude, :decimal
+    column :description, :text
+    column :alt_description, :text
+    column :created_at, :timestamp
+  end
+
+  class Store
+    include Cequel::Record
+
+    key :id, :timeuuid, auto: true
+    column :name, :text
+
+    # has issue with id serialization
+    def search_data
+      {
+        name: name
+      }
+    end
+  end
+
+  class Region
+    include Cequel::Record
+
+    key :id, :timeuuid, auto: true
+    column :name, :text
+    column :text, :text
+  end
+
+  class Speaker
+    include Cequel::Record
+
+    key :id, :timeuuid, auto: true
+    column :name, :text
+  end
+
+  class Animal
+    include Cequel::Record
+
+    key :id, :timeuuid, auto: true
+    column :name, :text
+
+    # has issue with id serialization
+    def search_data
+      {
+        name: name
+      }
+    end
+  end
+
+  class Dog < Animal
+  end
+
+  class Cat < Animal
+  end
+
+  [Product, Store, Region, Speaker, Animal].each(&:synchronize_schema)
 else
   require "active_record"
 

data/test/where_test.rb

@@ -10,16 +10,22 @@ class WhereTest < Minitest::Test
       {name: "Product D", store_id: 4, in_stock: false, backordered: false, created_at: now - 3, orders_count: 1}
     ]
     assert_search "product", ["Product A", "Product B"], where: {in_stock: true}
-    # date
-    assert_search "product", ["Product A"], where: {created_at: {gt: now - 1}}
-    assert_search "product", ["Product A", "Product B"], where: {created_at: {gte: now - 1}}
-    assert_search "product", ["Product D"], where: {created_at: {lt: now - 2}}
-    assert_search "product", ["Product C", "Product D"], where: {created_at: {lte: now - 2}}
+
+    # due to precision
+    unless cequel?
+      # date
+      assert_search "product", ["Product A"], where: {created_at: {gt: now - 1}}
+      assert_search "product", ["Product A", "Product B"], where: {created_at: {gte: now - 1}}
+      assert_search "product", ["Product D"], where: {created_at: {lt: now - 2}}
+      assert_search "product", ["Product C", "Product D"], where: {created_at: {lte: now - 2}}
+    end
+
     # integer
     assert_search "product", ["Product A"], where: {store_id: {lt: 2}}
     assert_search "product", ["Product A", "Product B"], where: {store_id: {lte: 2}}
     assert_search "product", ["Product D"], where: {store_id: {gt: 3}}
     assert_search "product", ["Product C", "Product D"], where: {store_id: {gte: 3}}
+
     # range
     assert_search "product", ["Product A", "Product B"], where: {store_id: 1..2}
     assert_search "product", ["Product A"], where: {store_id: 1...2}
@@ -27,23 +33,30 @@ class WhereTest < Minitest::Test
     assert_search "product", ["Product B", "Product C", "Product D"], where: {store_id: {not: 1}}
     assert_search "product", ["Product C", "Product D"], where: {store_id: {not: [1, 2]}}
     assert_search "product", ["Product A"], where: {user_ids: {lte: 2, gte: 2}}
+
     # or
     assert_search "product", ["Product A", "Product B", "Product C"], where: {or: [[{in_stock: true}, {store_id: 3}]]}
     assert_search "product", ["Product A", "Product B", "Product C"], where: {or: [[{orders_count: [2, 4]}, {store_id: [1, 2]}]]}
     assert_search "product", ["Product A", "Product D"], where: {or: [[{orders_count: 1}, {created_at: {gte: now - 1}, backordered: true}]]}
+
     # _or
     assert_search "product", ["Product A", "Product B", "Product C"], where: {_or: [{in_stock: true}, {store_id: 3}]}
     assert_search "product", ["Product A", "Product B", "Product C"], where: {_or: [{orders_count: [2, 4]}, {store_id: [1, 2]}]}
     assert_search "product", ["Product A", "Product D"], where: {_or: [{orders_count: 1}, {created_at: {gte: now - 1}, backordered: true}]}
+
     # _and
     assert_search "product", ["Product A"], where: {_and: [{in_stock: true}, {backordered: true}]}
+
     # _not
     assert_search "product", ["Product B", "Product C"], where: {_not: {_or: [{orders_count: 1}, {created_at: {gte: now - 1}, backordered: true}]}}
+
     # all
     assert_search "product", ["Product A", "Product C"], where: {user_ids: {all: [1, 3]}}
     assert_search "product", [], where: {user_ids: {all: [1, 2, 3, 4]}}
+
     # any / nested terms
     assert_search "product", ["Product B", "Product C"], where: {user_ids: {not: [2], in: [1, 3]}}
+
     # not / exists
     assert_search "product", ["Product D"], where: {user_ids: nil}
     assert_search "product", ["Product A", "Product B", "Product C"], where: {user_ids: {not: nil}}
@@ -78,7 +91,7 @@ class WhereTest < Minitest::Test
 
   def test_where_id
     store_names ["Product A"]
-    product = Product.last
+    product = Product.first
     assert_search "product", ["Product A"], where: {id: product.id.to_s}
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: searchkick
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-18 00:00:00.000000000 Z
+date: 2017-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -138,7 +138,9 @@ files:
 - test/gemfiles/activerecord40.gemfile
 - test/gemfiles/activerecord41.gemfile
 - test/gemfiles/activerecord42.gemfile
+- test/gemfiles/activerecord51.gemfile
 - test/gemfiles/apartment.gemfile
+- test/gemfiles/cequel.gemfile
 - test/gemfiles/mongoid2.gemfile
 - test/gemfiles/mongoid3.gemfile
 - test/gemfiles/mongoid4.gemfile
@@ -209,7 +211,9 @@ test_files:
 - test/gemfiles/activerecord40.gemfile
 - test/gemfiles/activerecord41.gemfile
 - test/gemfiles/activerecord42.gemfile
+- test/gemfiles/activerecord51.gemfile
 - test/gemfiles/apartment.gemfile
+- test/gemfiles/cequel.gemfile
 - test/gemfiles/mongoid2.gemfile
 - test/gemfiles/mongoid3.gemfile
 - test/gemfiles/mongoid4.gemfile