From 12e9b50664c7ea59b0487ef827fbb180e33464f0 Mon Sep 17 00:00:00 2001 From: Andrew Date: Fri, 2 Mar 2018 22:47:01 -0800 Subject: [PATCH] Fixed support for NoBrainer and Cequel [skip ci] --- lib/searchkick/model.rb | 1 + lib/searchkick/reindex_v2_job.rb | 6 +++++- test/test_helper.rb | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/searchkick/model.rb b/lib/searchkick/model.rb index 445440b..01013f8 100644 --- a/lib/searchkick/model.rb +++ b/lib/searchkick/model.rb @@ -86,6 +86,7 @@ module Searchkick data = respond_to?(:to_hash) ? to_hash : serializable_hash data.delete("id") data.delete("_id") + data.delete("_type") data end unless method_defined?(:search_data) diff --git a/lib/searchkick/reindex_v2_job.rb b/lib/searchkick/reindex_v2_job.rb index bab9a8b..22794de 100644 --- a/lib/searchkick/reindex_v2_job.rb +++ b/lib/searchkick/reindex_v2_job.rb @@ -13,7 +13,11 @@ module Searchkick model = klass.constantize record = begin - model.unscoped.find(id) + if model.respond_to?(:unscoped) + model.unscoped.find(id) + else + model.find(id) + end rescue => e # check by name rather than rescue directly so we don't need # to determine which classes are defined diff --git a/test/test_helper.rb b/test/test_helper.rb index b318504..2ad2255 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -134,7 +134,7 @@ elsif defined?(NoBrainer) include NoBrainer::Document::Timestamps field :id, type: Object - field :name, type: String + field :name, type: Text field :in_stock, type: Boolean field :backordered, type: Boolean field :orders_count, type: Integer -- libgit2 0.21.0