aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel/lib/active_model/serializers/xml.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2012-10-26 19:53:32 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2012-10-26 19:53:32 -0700
commit94f6b3dcfa454043307ba32045223eea0358de67 (patch)
treeb56eb43b83515e2d08fc5ad745f624a31436bc4a /activemodel/lib/active_model/serializers/xml.rb
parentb79444053c6e000180c3b7787140bdb3cdafa183 (diff)
parent10d9cb2052610202b4f1b2db4b822aa5850b1da4 (diff)
downloadrails-94f6b3dcfa454043307ba32045223eea0358de67.tar.gz
rails-94f6b3dcfa454043307ba32045223eea0358de67.tar.bz2
rails-94f6b3dcfa454043307ba32045223eea0358de67.zip
Merge pull request #8038 from frodsan/fix_am_serializers_xml_dependency
Fix AM::Serializers::Xml dependency
Diffstat (limited to 'activemodel/lib/active_model/serializers/xml.rb')
-rwxr-xr-xactivemodel/lib/active_model/serializers/xml.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/activemodel/lib/active_model/serializers/xml.rb b/activemodel/lib/active_model/serializers/xml.rb
index cf742d0569..fb6093cce5 100755
--- a/activemodel/lib/active_model/serializers/xml.rb
+++ b/activemodel/lib/active_model/serializers/xml.rb
@@ -4,12 +4,16 @@ require 'active_support/core_ext/hash/conversions'
require 'active_support/core_ext/hash/slice'
module ActiveModel
- # == Active Model XML Serializer
module Serializers
+ # == Active Model XML Serializer
module Xml
extend ActiveSupport::Concern
include ActiveModel::Serialization
+ included do
+ extend ActiveModel::Naming
+ end
+
class Serializer #:nodoc:
class Attribute #:nodoc:
attr_reader :name, :value, :type