diff options
| author | Oscar Del Ben <info@oscardelben.com> | 2012-05-14 13:56:26 -0700 |
|---|---|---|
| committer | Oscar Del Ben <info@oscardelben.com> | 2012-05-14 13:56:26 -0700 |
| commit | f2af398efa40dff20d4841d595bc0366660707cc (patch) | |
| tree | 8af0c081de5f2d6cfc1b033c5eefa9954de569dd /activemodel/lib/active_model/serializers | |
| parent | 59462c1e310b85569785cf5f491611e670c2755b (diff) | |
| parent | 151aa9abae131f1a03513f756aeaef2fc403f9bb (diff) | |
| download | rails-f2af398efa40dff20d4841d595bc0366660707cc.tar.gz rails-f2af398efa40dff20d4841d595bc0366660707cc.tar.bz2 rails-f2af398efa40dff20d4841d595bc0366660707cc.zip | |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'activemodel/lib/active_model/serializers')
| -rw-r--r-- | activemodel/lib/active_model/serializers/xml.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/activemodel/lib/active_model/serializers/xml.rb b/activemodel/lib/active_model/serializers/xml.rb index 5084298210..b78f1ff3f3 100644 --- a/activemodel/lib/active_model/serializers/xml.rb +++ b/activemodel/lib/active_model/serializers/xml.rb @@ -115,7 +115,9 @@ module ActiveModel merged_options = opts.merge(options.slice(:builder, :indent)) merged_options[:skip_instruct] = true - if records.is_a?(Enumerable) + if records.respond_to?(:to_ary) + records = records.to_ary + tag = ActiveSupport::XmlMini.rename_key(association.to_s, options) type = options[:skip_types] ? { } : {:type => "array"} association_name = association.to_s.singularize |