lib/searchkick.rb in searchkick-4.4.0 vs lib/searchkick.rb in searchkick-4.4.1

@@ -162,30 +162,30 @@
     end
   end
 
   def self.aws_credentials=(creds)
     begin
+      # TODO remove in Searchkick 5 (just use aws_sigv4)
       require "faraday_middleware/aws_signers_v4"
     rescue LoadError
       require "faraday_middleware/aws_sigv4"
     end
     @aws_credentials = creds
     @client = nil # reset client
   end
 
   def self.reindex_status(index_name)
-    if redis
-      batches_left = Searchkick::Index.new(index_name).batches_left
-      {
-        completed: batches_left == 0,
-        batches_left: batches_left
-      }
-    else
-      raise Searchkick::Error, "Redis not configured"
-    end
+    raise Searchkick::Error, "Redis not configured" unless redis
+
+    batches_left = Searchkick::Index.new(index_name).batches_left
+    {
+      completed: batches_left == 0,
+      batches_left: batches_left
+    }
   end
 
+  # TODO use ConnectionPool::Wrapper when redis is set so this is no longer needed
   def self.with_redis
     if redis
       if redis.respond_to?(:with)
         redis.with do |r|
           yield r
@@ -265,12 +265,15 @@
       !Mongoid::Threaded.current_scope(klass).nil?
     end
   end
 end
 
-# TODO find better ActiveModel hook
 require "active_model/callbacks"
 ActiveModel::Callbacks.include(Searchkick::Model)
+# TODO use
+# ActiveSupport.on_load(:mongoid) do
+#   Mongoid::Document::ClassMethods.include Searchkick::Model
+# end
 
 ActiveSupport.on_load(:active_record) do
   extend Searchkick::Model
 end