kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Merge pull request #8164 from nikitug/keep_serialization_in_its_module

Browse source 
Keep the code related to serialization in Serialization module.
This commit is contained in:
Carlos Antonio da Silva 2012-11-10 02:16:40 -08:00
commit a002442fbc
2 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
activerecord/lib/active_record/attribute_methods.rb
View file

@ -369,14 +369,10 @@ module ActiveRecord
end
def typecasted_attribute_value(name)
if self.class.serialized_attributes.include?(name)
@attributes[name].serialized_value
else
# FIXME: we need @attributes to be used consistently.
# If the values stored in @attributes were already typecasted, this code
# could be simplified
read_attribute(name)
end
# FIXME: we need @attributes to be used consistently.
# If the values stored in @attributes were already typecasted, this code
# could be simplified
read_attribute(name)
end
end
end

10
activerecord/lib/active_record/attribute_methods/serialization.rb
View file

@ -5,7 +5,7 @@ module ActiveRecord
included do
# Returns a hash of all the attributes that have been specified for
# serialization as keys and their class restriction as values.
# serialization as keys and their class restriction as values.
class_attribute :serialized_attributes, instance_accessor: false
self.serialized_attributes = {}
end
@ -129,6 +129,14 @@ module ActiveRecord
end
end
end
def typecasted_attribute_value(name)
if self.class.serialized_attributes.include?(name)
@attributes[name].serialized_value
else
super
end
end
end
end
end