diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2011-02-01 11:07:02 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2011-02-01 14:25:46 -0800 |
| commit | a6cf6ec98b58dc2a7d0586ccb6ef970d93f0bafc (patch) | |
| tree | f3999f8e7aca92110819970198e4e6fca3baf37d /activerecord/lib/active_record/attribute_methods/read.rb | |
| parent | 69600a9f97d2f678972500d8a741edc745833718 (diff) | |
| download | rails-a6cf6ec98b58dc2a7d0586ccb6ef970d93f0bafc.tar.gz rails-a6cf6ec98b58dc2a7d0586ccb6ef970d93f0bafc.tar.bz2 rails-a6cf6ec98b58dc2a7d0586ccb6ef970d93f0bafc.zip | |
move the coders to the serialized_attributes hash
Diffstat (limited to 'activerecord/lib/active_record/attribute_methods/read.rb')
| -rw-r--r-- | activerecord/lib/active_record/attribute_methods/read.rb | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/activerecord/lib/active_record/attribute_methods/read.rb b/activerecord/lib/active_record/attribute_methods/read.rb index ff088200a1..895c16b9b3 100644 --- a/activerecord/lib/active_record/attribute_methods/read.rb +++ b/activerecord/lib/active_record/attribute_methods/read.rb @@ -106,14 +106,10 @@ module ActiveRecord # Returns the unserialized object of the attribute. def unserialize_attribute(attr_name) - unserialized_object = object_from_yaml(@attributes[attr_name]) + coder = self.class.serialized_attributes[attr_name] + unserialized_object = coder.load(@attributes[attr_name]) - if unserialized_object.is_a?(self.class.serialized_attributes[attr_name]) || unserialized_object.nil? - @attributes.frozen? ? unserialized_object : @attributes[attr_name] = unserialized_object - else - raise SerializationTypeMismatch, - "#{attr_name} was supposed to be a #{self.class.serialized_attributes[attr_name]}, but was a #{unserialized_object.class.to_s}" - end + @attributes.frozen? ? unserialized_object : @attributes[attr_name] = unserialized_object end private |