mirror of
https://github.com/paper-trail-gem/paper_trail.git
synced 2022-11-09 11:33:19 -05:00
Changed name of (un)serialize_attributes methods so they don't conflict with other gems
This commit is contained in:
parent
7a7483ec26
commit
667dc7c325
2 changed files with 4 additions and 4 deletions
|
@ -82,7 +82,7 @@ module PaperTrail
|
||||||
end
|
end
|
||||||
|
|
||||||
# Used for Version#object attribute
|
# Used for Version#object attribute
|
||||||
def serialize_attributes(attributes)
|
def serialize_attributes_for_paper_trail(attributes)
|
||||||
serialized_attributes.each do |key, coder|
|
serialized_attributes.each do |key, coder|
|
||||||
if attributes.key?(key)
|
if attributes.key?(key)
|
||||||
attributes[key] = coder.dump(attributes[key])
|
attributes[key] = coder.dump(attributes[key])
|
||||||
|
@ -90,7 +90,7 @@ module PaperTrail
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def unserialize_attributes(attributes)
|
def unserialize_attributes_for_paper_trail(attributes)
|
||||||
serialized_attributes.each do |key, coder|
|
serialized_attributes.each do |key, coder|
|
||||||
if attributes.key?(key)
|
if attributes.key?(key)
|
||||||
attributes[key] = coder.load(attributes[key])
|
attributes[key] = coder.load(attributes[key])
|
||||||
|
@ -264,7 +264,7 @@ module PaperTrail
|
||||||
|
|
||||||
def object_to_string(object)
|
def object_to_string(object)
|
||||||
_attrs = object.attributes.except(*self.class.paper_trail_options[:skip]).tap do |attributes|
|
_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
|
end
|
||||||
PaperTrail.serializer.dump(_attrs)
|
PaperTrail.serializer.dump(_attrs)
|
||||||
end
|
end
|
||||||
|
|
|
@ -79,7 +79,7 @@ class Version < ActiveRecord::Base
|
||||||
model = klass.new
|
model = klass.new
|
||||||
end
|
end
|
||||||
|
|
||||||
model.class.unserialize_attributes attrs
|
model.class.unserialize_attributes_for_paper_trail attrs
|
||||||
attrs.each do |k, v|
|
attrs.each do |k, v|
|
||||||
if model.respond_to?("#{k}=")
|
if model.respond_to?("#{k}=")
|
||||||
model.send :write_attribute, k.to_sym, v
|
model.send :write_attribute, k.to_sym, v
|
||||||
|
|
Loading…
Reference in a new issue