complex method simplify and add adaptor to modelconfig options

lib/paper_trail/events/base.rb

@@ -283,15 +283,8 @@ def prepare_object_changes(changes)
       # @api private
       # @param changes HashWithIndifferentAccess
       def recordable_object_changes(changes)
-        if PaperTrail.config.object_changes_adapter.respond_to?(:diff)
-          # We'd like to avoid the `to_hash` here, because it increases memory
-          # usage, but that would be a breaking change because
-          # `object_changes_adapter` expects a plain `Hash`, not a
-          # `HashWithIndifferentAccess`.
-          changes = PaperTrail.config.object_changes_adapter.diff(changes.to_hash)
-        elsif @record.class.paper_trail.object_changes_adapter&.respond_to?(:diff)
-          changes = @record.class.paper_trail.object_changes_adapter.diff(changes.to_hash)
-        end
+        adapter = object_changes_adapter_for_record
+        changes = apply_diff(changes, adapter) if adapter.respond_to?(:diff)
 
         if @record.class.paper_trail.version_class.object_changes_col_is_json?
           changes
@@ -300,6 +293,18 @@ def recordable_object_changes(changes)
         end
       end
 
+      def object_changes_adapter_for_record
+        if @record.class.paper_trail.object_changes_adapter.respond_to?(:diff)
+          @record.class.paper_trail.object_changes_adapter
+        else
+          PaperTrail.config.object_changes_adapter
+        end
+      end
+
+      def apply_diff(changes, adapter)
+        adapter.diff(changes.to_hash)
+      end
+
       # Returns a boolean indicating whether to store serialized version diffs
       # in the `object_changes` column of the version record.
       #

lib/paper_trail/model_config.rb

@@ -121,7 +121,7 @@ def version_class
     end
 
     def object_changes_adapter
-      @model_class.object_changes_adapter
+      @model_class.paper_trail_options[:object_changes_adapter]
     end
 
     private
@@ -256,13 +256,7 @@ def setup_options(options)
         @model_class.paper_trail_options[k] = event_attribute_option(k)
       end
       @model_class.paper_trail_options[:meta] ||= {}
-    end
-
-    def setup_custom_object_changes_adapter(options)
-      @model_class.class_attribute :object_changes_adapter
-      @model_class.object_changes_adapter = options[:object_changes_adapter]
-
-      @model_class.send :attr_accessor, @model_class.object_changes_adapter
+      @model_class.paper_trail_options[:object_changes_adapter] = options[:object_changes_adapter]
     end
   end
 end