diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-03-09 21:51:12 -0300 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-03-09 21:51:12 -0300 |
| commit | 10c3304db6fbb7d7b04c6651a793927fcb6e201a (patch) | |
| tree | 066ab8d82775e386390c50c71bc5d6fd5cb315e0 /activemodel/lib | |
| parent | a39ee473128f3d33538f7b6cd5edf1d000f5d80e (diff) | |
| download | rails-10c3304db6fbb7d7b04c6651a793927fcb6e201a.tar.gz rails-10c3304db6fbb7d7b04c6651a793927fcb6e201a.tar.bz2 rails-10c3304db6fbb7d7b04c6651a793927fcb6e201a.zip | |
Make sure serializable hash with :include always returns string keys
Diffstat (limited to 'activemodel/lib')
| -rw-r--r-- | activemodel/lib/active_model/serialization.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/activemodel/lib/active_model/serialization.rb b/activemodel/lib/active_model/serialization.rb index 51f078e662..efc507c168 100644 --- a/activemodel/lib/active_model/serialization.rb +++ b/activemodel/lib/active_model/serialization.rb @@ -2,7 +2,6 @@ require 'active_support/core_ext/hash/except' require 'active_support/core_ext/hash/slice' require 'active_support/core_ext/array/wrap' - module ActiveModel # == Active Model Serialization # @@ -88,7 +87,7 @@ module ActiveModel method_names.each { |n| hash[n.to_s] = send(n) } serializable_add_includes(options) do |association, records, opts| - hash[association] = if records.is_a?(Enumerable) + hash[association.to_s] = if records.is_a?(Enumerable) records.map { |a| a.serializable_hash(opts) } else records.serializable_hash(opts) |