diff --git a/lib/paper_trail/has_paper_trail.rb b/lib/paper_trail/has_paper_trail.rb index 064b9ff0..2d49326e 100644 --- a/lib/paper_trail/has_paper_trail.rb +++ b/lib/paper_trail/has_paper_trail.rb @@ -82,7 +82,7 @@ module PaperTrail end # Used for Version#object attribute - def serialize_attributes(attributes) + def serialize_attributes_for_paper_trail(attributes) serialized_attributes.each do |key, coder| if attributes.key?(key) attributes[key] = coder.dump(attributes[key]) @@ -90,7 +90,7 @@ module PaperTrail end end - def unserialize_attributes(attributes) + def unserialize_attributes_for_paper_trail(attributes) serialized_attributes.each do |key, coder| if attributes.key?(key) attributes[key] = coder.load(attributes[key]) @@ -264,7 +264,7 @@ module PaperTrail def object_to_string(object) _attrs = object.attributes.except(*self.class.paper_trail_options[:skip]).tap do |attributes| - self.class.serialize_attributes attributes + self.class.serialize_attributes_for_paper_trail attributes end PaperTrail.serializer.dump(_attrs) end diff --git a/lib/paper_trail/version.rb b/lib/paper_trail/version.rb index 95225aa0..58d138ec 100644 --- a/lib/paper_trail/version.rb +++ b/lib/paper_trail/version.rb @@ -79,7 +79,7 @@ class Version < ActiveRecord::Base model = klass.new end - model.class.unserialize_attributes attrs + model.class.unserialize_attributes_for_paper_trail attrs attrs.each do |k, v| if model.respond_to?("#{k}=") model.send :write_attribute, k.to_sym, v