Add convenience methods for checking ORM

Author: ellnix

lib/meilisearch-rails.rb

@@ -88,7 +88,7 @@ def meilisearch(options = {}, &block)
         attr_accessor :formatted
 
         if options[:synchronous] == true
-          if defined?(::Sequel::Model) && self < Sequel::Model
+          if ms_config.sequel_model?
             class_eval do
               copy_after_validation = instance_method(:after_validation)
               define_method(:after_validation) do |*args|
@@ -122,7 +122,7 @@ def meilisearch(options = {}, &block)
           end
         end
         unless options[:auto_index] == false
-          if defined?(::Sequel::Model) && self < Sequel::Model
+          if ms_config.sequel_model?
             class_eval do
               copy_after_validation = instance_method(:after_validation)
               copy_before_save = instance_method(:before_save)
@@ -169,7 +169,7 @@ def meilisearch(options = {}, &block)
           end
         end
         unless options[:auto_remove] == false
-          if defined?(::Sequel::Model) && self < Sequel::Model
+          if ms_config.sequel_model?
             class_eval do
               copy_after_destroy = instance_method(:after_destroy)
 
@@ -391,7 +391,7 @@ def ms_search(query, params = {})
         # The condition_key must be a valid column otherwise, the `.where` below will not work
         # Since we provide a way to customize the primary_key value, `ms_pk(meilisearch_options)` may not
         # respond with a valid database column. The blocks below prevent that from happening.
-        has_virtual_column_as_pk = if defined?(::Sequel::Model) && self < Sequel::Model
+        has_virtual_column_as_pk = if ms_config.sequel_model?
                                      columns.map(&:to_s).exclude?(condition_key.to_s)
                                    else
                                      columns.map(&:name).map(&:to_s).exclude?(condition_key.to_s)
@@ -591,10 +591,10 @@ def ms_indexing_disabled?(options = nil)
       end
 
       def ms_find_in_batches(batch_size, &block)
-        if (defined?(::ActiveRecord) && ancestors.include?(::ActiveRecord::Base)) || respond_to?(:find_in_batches)
+        if ms_config.active_record_model? || respond_to?(:find_in_batches)
           scope = respond_to?(:meilisearch_import) ? meilisearch_import : all
           scope.find_in_batches(batch_size: batch_size, &block)
-        elsif defined?(::Sequel::Model) && self < Sequel::Model
+        elsif ms_config.sequel_model?
           dataset.extension(:pagination).each_page(batch_size, &block)
         else
           # don't worry, mongoid has its own underlying cursor/streaming mechanism
@@ -682,7 +682,7 @@ def ms_mark_must_reindex
         # ms_must_reindex flag is reset after every commit as part. If we must reindex at any point in
         # a transaction, keep flag set until it is explicitly unset
         @ms_must_reindex ||=
-          if defined?(::Sequel::Model) && is_a?(Sequel::Model)
+          if self.class.ms_config.sequel_model?
             new? || self.class.ms_must_reindex?(self)
           else
             new_record? || self.class.ms_must_reindex?(self)

lib/meilisearch/rails/model_configuration.rb

@@ -8,6 +8,14 @@ def initialize(model, options = {})
         parse_options(options)
       end
 
+      def sequel_model?
+        defined?(::Sequel::Model) && model < Sequel::Model
+      end
+
+      def active_record_model?
+        defined?(::ActiveRecord) && model.ancestors.include?(::ActiveRecord::Base)
+      end
+
       private
 
       def parse_options(options)

spec/model_configuration_spec.rb

@@ -1,5 +1,7 @@
 require 'spec_helper'
 require 'support/models/unconfigured_model'
+require 'support/sequel_models/book'
+require 'support/models/color'
 
 describe 'Model configuration' do
   describe 'options' do
@@ -19,4 +21,26 @@
       end
     end
   end
+
+  describe '#sequel_model?' do
+    it 'returns false for activerecord' do
+      expect(Color.ms_config).not_to be_sequel_model
+    end
+
+    it 'returns true for sequel' do
+      expect(SequelBook.ms_config).to be_sequel_model
+    end
+
+    # TODO: Add similar methods for mongodb
+  end
+
+  describe '#active_record_model?' do
+    it 'returns true for activerecord' do
+      expect(Color.ms_config).to be_active_record_model
+    end
+
+    it 'returns false for sequel' do
+      expect(SequelBook.ms_config).not_to be_active_record_model
+    end
+  end
 end