Better relation check

Andrew Kane
1 parent 0255fb80
Showing 2 changed files with 14 additions and 3 deletions Show diff stats
lib/searchkick.rb
lib/searchkick/model.rb
@@ -253,6 +253,18 @@ module Searchkick
       }
     end
   end
+
+  # private
+  # methods are forwarded to base class
+  # this check to see if scope exists on that class
+  # it's a bit tricky, but this seems to work
+  def self.relation?(klass)
+    if klass.respond_to?(:current_scope)
+      !klass.current_scope.nil?
+    elsif defined?(Mongoid::Threaded)
+      !Mongoid::Threaded.current_scope(klass).nil?
+    end
+  end
 end
 # TODO find better ActiveModel hook
@@ -42,8 +42,7 @@ module Searchkick
         class << self
           def searchkick_search(term = "*", **options, &block)
             # TODO throw error in next major version
-            relation = respond_to?(:current_scope) ? !current_scope.nil? : !Mongoid::Threaded.current_scope(self).nil?
-            Searchkick.warn("calling search on a relation is deprecated") if relation
+            Searchkick.warn("calling search on a relation is deprecated") if Searchkick.relation?(self)
             Searchkick.search(term, model: self, **options, &block)
           end
@@ -58,7 +57,7 @@ module Searchkick
           alias_method :search_index, :searchkick_index unless method_defined?(:search_index)
           def searchkick_reindex(method_name = nil, **options)
-            # TODO properly check relation like in searchkick_search method
+            # TODO use Searchkick.relation?
             relation = (respond_to?(:current_scope) && respond_to?(:default_scoped) && current_scope && current_scope.to_sql != default_scoped.to_sql) ||
               (respond_to?(:queryable) && queryable != unscoped.with_default_scope)
	@@ -253,6 +253,18 @@ module Searchkick		@@ -253,6 +253,18 @@ module Searchkick
253	}	253	}
254	end	254	end
255	end	255	end
		256	+
		257	+ # private
		258	+ # methods are forwarded to base class
		259	+ # this check to see if scope exists on that class
		260	+ # it's a bit tricky, but this seems to work
		261	+ def self.relation?(klass)
		262	+ if klass.respond_to?(:current_scope)
		263	+ !klass.current_scope.nil?
		264	+ elsif defined?(Mongoid::Threaded)
		265	+ !Mongoid::Threaded.current_scope(klass).nil?
		266	+ end
		267	+ end
256	end	268	end
257		269
258	# TODO find better ActiveModel hook	270	# TODO find better ActiveModel hook