From 10c3304db6fbb7d7b04c6651a793927fcb6e201a Mon Sep 17 00:00:00 2001 From: Carlos Antonio da Silva Date: Fri, 9 Mar 2012 21:51:12 -0300 Subject: Make sure serializable hash with :include always returns string keys --- activemodel/lib/active_model/serialization.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'activemodel/lib/active_model') 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) -- cgit v1.2.3