Dropped support for NoBrainer and Cequel [skip ci]

Andrew Kane
1 parent 7c73e489
Showing 17 changed files with 9 additions and 247 deletions Show diff stats
CHANGELOG.md
README.md
gemfiles/cequel.gemfile
gemfiles/nobrainer.gemfile
lib/searchkick.rb
lib/searchkick/model.rb
lib/searchkick/reindex_v2_job.rb
lib/searchkick/results.rb
test/boost_test.rb
test/index_test.rb
test/inheritance_test.rb
test/order_test.rb
test/reindex_test.rb
test/support/cequel.rb
test/support/nobrainer.rb
test/test_helper.rb
test/where_test.rb
 ## 5.0.0 (unreleased)
 - Dropped support for Ruby < 2.6 and Active Record < 5.2
+- Dropped support for NoBrainer and Cequel
 ## 4.6.3 (2021-11-19)
@@ -20,7 +20,7 @@ Plus:
 - autocomplete
 - “Did you mean” suggestions
 - supports many languages
-- works with Active Record, Mongoid, and NoBrainer
+- works with Active Record and Mongoid
 Check out [Searchjoy](https://github.com/ankane/searchjoy) for analytics and [Autosuggest](https://github.com/ankane/autosuggest) for query suggestions
@@ -1,9 +0,0 @@
-source "https://rubygems.org"
-
-gemspec path: ".."
-
-gem "rake"
-gem "minitest", ">= 5"
-gem "cequel"
-gem "activejob"
-gem "redis"
@@ -1,9 +0,0 @@
-source "https://rubygems.org"
-
-gemspec path: ".."
-
-gem "rake"
-gem "minitest", ">= 5"
-gem "nobrainer", ">= 0.21.0"
-gem "activejob"
-gem "redis"
@@ -223,9 +223,6 @@ module Searchkick
       elsif records.respond_to?(:queryable)
         # Mongoid 3+
         records.queryable.for_ids(ids)
-      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
@@ -99,12 +99,6 @@ 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
@@ -2,9 +2,7 @@ module Searchkick
   class ReindexV2Job < ActiveJob::Base
     RECORD_NOT_FOUND_CLASSES = [
       "ActiveRecord::RecordNotFound",
-      "Mongoid::Errors::DocumentNotFound",
-      "NoBrainer::Error::DocumentNotFound",
-      "Cequel::Record::RecordNotFound"
+      "Mongoid::Errors::DocumentNotFound"
     ]
     queue_as { Searchkick.queue_name }
@@ -309,16 +309,7 @@ module Searchkick
         combine_includes(included_relations, options[:includes])
         combine_includes(included_relations, options[:model_includes][records]) if options[:model_includes]
-        records =
-          if defined?(NoBrainer::Document) && records < NoBrainer::Document
-            if Gem.loaded_specs["nobrainer"].version >= Gem::Version.new("0.21")
-              records.eager_load(included_relations)
-            else
-              records.preload(included_relations)
-            end
-          else
-            records.includes(included_relations)
-          end
+        records = records.includes(included_relations)
       end
       if options[:scope_results]
@@ -171,8 +171,6 @@ class BoostTest &lt; Minitest::Test
   end
   def test_boost_by_indices
-    skip if cequel?
-
     store_names ["Rex"], Animal
     store_names ["Rexx"], Product
@@ -87,7 +87,6 @@ class IndexTest &lt; Minitest::Test
   end
   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
@@ -97,7 +96,6 @@ class IndexTest &lt; Minitest::Test
   end
   def test_very_large_value
-    skip if nobrainer?
     large_value = 10000.times.map { "hello" }.join(" ")
     store [{name: "Product A", text: large_value}], Region
     assert_search "product", ["Product A"], {}, Region
 require_relative "test_helper"
 class InheritanceTest < Minitest::Test
-  def setup
-    skip if cequel?
-    super
-  end
-
   def test_child_reindex
     store_names ["Max"], Cat
     assert Dog.reindex
@@ -14,8 +14,6 @@ class OrderTest &lt; Minitest::Test
   # TODO no longer map id to _id in Searchkick 5
   # since sorting on _id is deprecated in Elasticsearch
   def test_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
@@ -37,8 +37,6 @@ class ReindexTest &lt; Minitest::Test
   end
   def test_relation_inline
-    skip if nobrainer? || cequel?
-
     store_names ["Product A"]
     store_names ["Product B", "Product C"], reindex: false
     Product.where(name: "Product B").reindex(refresh: true)
@@ -46,8 +44,6 @@ class ReindexTest &lt; Minitest::Test
   end
   def test_relation_associations
-    skip if nobrainer? || cequel?
-
     store_names ["Product A"]
     store = Store.create!(name: "Test")
     Product.create!(name: "Product B", store_id: store.id)
@@ -56,8 +52,6 @@ class ReindexTest &lt; Minitest::Test
   end
   def test_relation_should_index
-    skip if nobrainer? || cequel?
-
     skip "TODO make pass in Searchkick 5"
     store_names ["Product A", "Product B"]
@@ -1,95 +0,0 @@
-cequel =
-  Cequel.connect(
-    host: "127.0.0.1",
-    port: 9042,
-    keyspace: "searchkick_test",
-    default_consistency: :all
-  )
-cequel.logger = $logger
-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
-
-class Sku
-  include Cequel::Record
-
-  key :id, :uuid
-  column :name, :text
-end
-
-class Song
-  include Cequel::Record
-
-  key :id, :timeuuid, auto: true
-  column :name, :text
-end
-
-[Product, Store, Region, Speaker, Animal, Sku, Song].each(&:synchronize_schema)
@@ -1,73 +0,0 @@
-NoBrainer.configure do |config|
-  config.app_name = :searchkick
-  config.environment = :test
-end
-
-class Product
-  include NoBrainer::Document
-  include NoBrainer::Document::Timestamps
-
-  field :id,           type: Object
-  field :name,         type: Text
-  field :in_stock,     type: Boolean
-  field :backordered,  type: Boolean
-  field :orders_count, type: Integer
-  field :found_rate
-  field :price,        type: Integer
-  field :color,        type: String
-  field :latitude
-  field :longitude
-  field :description, type: String
-  field :alt_description, type: String
-
-  belongs_to :store, validates: false
-end
-
-class Store
-  include NoBrainer::Document
-
-  field :id,   type: Object
-  field :name, type: String
-end
-
-class Region
-  include NoBrainer::Document
-
-  field :id,   type: Object
-  field :name, type: String
-  field :text, type: Text
-end
-
-class Speaker
-  include NoBrainer::Document
-
-  field :id,   type: Object
-  field :name, type: String
-end
-
-class Animal
-  include NoBrainer::Document
-
-  field :id,   type: Object
-  field :name, type: String
-end
-
-class Dog < Animal
-end
-
-class Cat < Animal
-end
-
-class Sku
-  include NoBrainer::Document
-
-  field :id,   type: String
-  field :name, type: String
-end
-
-class Song
-  include NoBrainer::Document
-
-  field :id,   type: Object
-  field :name, type: String
-end
@@ -2,7 +2,6 @@ require &quot;bundler/setup&quot;
 Bundler.require(:default)
 require "minitest/autorun"
 require "minitest/pride"
-require "active_support/core_ext" if defined?(NoBrainer)
 require "active_support/notifications"
 ENV["RACK_ENV"] = "test"
@@ -47,10 +46,6 @@ ActiveSupport::LogSubscriber.logger = ActiveSupport::Logger.new(STDOUT) if ENV[&quot;
 if defined?(Mongoid)
   require_relative "support/mongoid"
-elsif defined?(NoBrainer)
-  require_relative "support/nobrainer"
-elsif defined?(Cequel)
-  require_relative "support/cequel"
 else
   require_relative "support/activerecord"
 end
@@ -147,14 +142,6 @@ class Minitest::Test
     defined?(ActiveRecord)
   end
-  def nobrainer?
-    defined?(NoBrainer)
-  end
-
-  def cequel?
-    defined?(Cequel)
-  end
-
   def default_model
     Product
   end
@@ -15,14 +15,11 @@ class WhereTest &lt; Minitest::Test
     assert_search "product", ["Product A"], where: {user_ids: 2}
     assert_search "product", ["Product A", "Product C"], where: {user_ids: [2, 3]}
-    # 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
+    # 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}}
     # integer
     assert_search "product", ["Product A"], where: {store_id: {lt: 2}}
1	## 5.0.0 (unreleased)	1	## 5.0.0 (unreleased)
2		2
3	- Dropped support for Ruby < 2.6 and Active Record < 5.2	3	- Dropped support for Ruby < 2.6 and Active Record < 5.2
		4	+- Dropped support for NoBrainer and Cequel
4		5
5	## 4.6.3 (2021-11-19)	6	## 4.6.3 (2021-11-19)
6		7
	@@ -20,7 +20,7 @@ Plus:		@@ -20,7 +20,7 @@ Plus:
20	- autocomplete	20	- autocomplete
21	- “Did you mean” suggestions	21	- “Did you mean” suggestions
22	- supports many languages	22	- supports many languages
23	-- works with Active Record, Mongoid, and NoBrainer	23	+- works with Active Record and Mongoid
24		24
25	Check out [Searchjoy](https://github.com/ankane/searchjoy) for analytics and [Autosuggest](https://github.com/ankane/autosuggest) for query suggestions	25	Check out [Searchjoy](https://github.com/ankane/searchjoy) for analytics and [Autosuggest](https://github.com/ankane/autosuggest) for query suggestions
26		26
	@@ -1,9 +0,0 @@	@@ -1,9 +0,0 @@
1	-source "https://rubygems.org"
2	-
3	-gemspec path: ".."
4	-
5	-gem "rake"
6	-gem "minitest", ">= 5"
7	-gem "cequel"
8	-gem "activejob"
9	-gem "redis"
	@@ -99,12 +99,6 @@ module Searchkick		@@ -99,12 +99,6 @@ module Searchkick
99	def should_index?	99	def should_index?
100	true	100	true
101	end unless method_defined?(:should_index?)	101	end unless method_defined?(:should_index?)
102	-
103	- if defined?(Cequel) && self < Cequel::Record && !method_defined?(:destroyed?)
104	- def destroyed?
105	- transient?
106	- end
107	- end
108	end	102	end
109	end	103	end
110	end	104	end
	@@ -309,16 +309,7 @@ module Searchkick		@@ -309,16 +309,7 @@ module Searchkick
309	combine_includes(included_relations, options[:includes])	309	combine_includes(included_relations, options[:includes])
310	combine_includes(included_relations, options[:model_includes][records]) if options[:model_includes]	310	combine_includes(included_relations, options[:model_includes][records]) if options[:model_includes]
311		311
312	- records =
313	- if defined?(NoBrainer::Document) && records < NoBrainer::Document
314	- if Gem.loaded_specs["nobrainer"].version >= Gem::Version.new("0.21")
315	- records.eager_load(included_relations)
316	- else
317	- records.preload(included_relations)
318	- end
319	- else
320	- records.includes(included_relations)
321	- end	312	+ records = records.includes(included_relations)
322	end	313	end
323		314
324	if options[:scope_results]	315	if options[:scope_results]
	@@ -171,8 +171,6 @@ class BoostTest < Minitest::Test		@@ -171,8 +171,6 @@ class BoostTest < Minitest::Test
171	end	171	end
172		172
173	def test_boost_by_indices	173	def test_boost_by_indices
174	- skip if cequel?
175	-
176	store_names ["Rex"], Animal	174	store_names ["Rex"], Animal
177	store_names ["Rexx"], Product	175	store_names ["Rexx"], Product
178		176
	@@ -1,95 +0,0 @@	@@ -1,95 +0,0 @@
1	-cequel =
2	- Cequel.connect(
3	- host: "127.0.0.1",
4	- port: 9042,
5	- keyspace: "searchkick_test",
6	- default_consistency: :all
7	- )
8	-cequel.logger = $logger
9	-cequel.schema.drop! if cequel.schema.exists?
10	-cequel.schema.create!
11	-Cequel::Record.connection = cequel
12	-
13	-class Product
14	- include Cequel::Record
15	-
16	- key :id, :uuid, auto: true
17	- column :name, :text, index: true
18	- column :store_id, :int
19	- column :in_stock, :boolean
20	- column :backordered, :boolean
21	- column :orders_count, :int
22	- column :found_rate, :decimal
23	- column :price, :int
24	- column :color, :text
25	- column :latitude, :decimal
26	- column :longitude, :decimal
27	- column :description, :text
28	- column :alt_description, :text
29	- column :created_at, :timestamp
30	-end
31	-
32	-class Store
33	- include Cequel::Record
34	-
35	- key :id, :timeuuid, auto: true
36	- column :name, :text
37	-
38	- # has issue with id serialization
39	- def search_data
40	- {
41	- name: name
42	- }
43	- end
44	-end
45	-
46	-class Region
47	- include Cequel::Record
48	-
49	- key :id, :timeuuid, auto: true
50	- column :name, :text
51	- column :text, :text
52	-end
53	-
54	-class Speaker
55	- include Cequel::Record
56	-
57	- key :id, :timeuuid, auto: true
58	- column :name, :text
59	-end
60	-
61	-class Animal
62	- include Cequel::Record
63	-
64	- key :id, :timeuuid, auto: true
65	- column :name, :text
66	-
67	- # has issue with id serialization
68	- def search_data
69	- {
70	- name: name
71	- }
72	- end
73	-end
74	-
75	-class Dog < Animal
76	-end
77	-
78	-class Cat < Animal
79	-end
80	-
81	-class Sku
82	- include Cequel::Record
83	-
84	- key :id, :uuid
85	- column :name, :text
86	-end
87	-
88	-class Song
89	- include Cequel::Record
90	-
91	- key :id, :timeuuid, auto: true
92	- column :name, :text
93	-end
94	-
95	-[Product, Store, Region, Speaker, Animal, Sku, Song].each(&:synchronize_schema)
	@@ -1,73 +0,0 @@	@@ -1,73 +0,0 @@
1	-NoBrainer.configure do \|config\|
2	- config.app_name = :searchkick
3	- config.environment = :test
4	-end
5	-
6	-class Product
7	- include NoBrainer::Document
8	- include NoBrainer::Document::Timestamps
9	-
10	- field :id, type: Object
11	- field :name, type: Text
12	- field :in_stock, type: Boolean
13	- field :backordered, type: Boolean
14	- field :orders_count, type: Integer
15	- field :found_rate
16	- field :price, type: Integer
17	- field :color, type: String
18	- field :latitude
19	- field :longitude
20	- field :description, type: String
21	- field :alt_description, type: String
22	-
23	- belongs_to :store, validates: false
24	-end
25	-
26	-class Store
27	- include NoBrainer::Document
28	-
29	- field :id, type: Object
30	- field :name, type: String
31	-end
32	-
33	-class Region
34	- include NoBrainer::Document
35	-
36	- field :id, type: Object
37	- field :name, type: String
38	- field :text, type: Text
39	-end
40	-
41	-class Speaker
42	- include NoBrainer::Document
43	-
44	- field :id, type: Object
45	- field :name, type: String
46	-end
47	-
48	-class Animal
49	- include NoBrainer::Document
50	-
51	- field :id, type: Object
52	- field :name, type: String
53	-end
54	-
55	-class Dog < Animal
56	-end
57	-
58	-class Cat < Animal
59	-end
60	-
61	-class Sku
62	- include NoBrainer::Document
63	-
64	- field :id, type: String
65	- field :name, type: String
66	-end
67	-
68	-class Song
69	- include NoBrainer::Document
70	-
71	- field :id, type: Object
72	- field :name, type: String
73	-end