Merge pull request #23 from EverFi/FC-1357/fix-mongoid-not-defined

FC-1357 Fix Mongoid not defined
EverFi · Oct 12, 2022 · 004a38f · 004a38f
2 parents 3b6427d + cc0223d
commit 004a38f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    searchkick (5.0.4.pre.everfi.1.0.0)
+    searchkick (5.0.4.pre.everfi.1.0.1)
       activemodel (>= 5.2)
       hashie
 

diff --git a/lib/searchkick.rb b/lib/searchkick.rb
@@ -364,8 +364,10 @@ def self.refresh_value=(value)
   def self.relation?(klass)
     if klass.respond_to?(:current_scope)
       !klass.current_scope.nil?
-    else
+    elsif defined?(Mongoid) # Should be fixed in upstream by https://github.com/ankane/searchkick/issues/1592
       klass.is_a?(Mongoid::Criteria) || !Mongoid::Threaded.current_scope(klass).nil?
+    else
+      false
     end
   end
 

diff --git a/lib/searchkick/version.rb b/lib/searchkick/version.rb
@@ -1,3 +1,3 @@
 module Searchkick
-  VERSION = "5.0.4.pre.everfi.1.0.0"
+  VERSION = "5.0.4.pre.everfi.1.0.1"
 end