diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2012-10-26 19:53:32 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-10-27 12:56:28 -0200 |
| commit | 4b1a7bcc4ceefeebaa14dbc2571a2e6cd593556d (patch) | |
| tree | 35e09b9a91321ab02f4faa76e87617db139b19cb /activemodel/lib | |
| parent | 7f09bcd1810fb8295cde1f54c6eece260fdd4519 (diff) | |
| download | rails-4b1a7bcc4ceefeebaa14dbc2571a2e6cd593556d.tar.gz rails-4b1a7bcc4ceefeebaa14dbc2571a2e6cd593556d.tar.bz2 rails-4b1a7bcc4ceefeebaa14dbc2571a2e6cd593556d.zip | |
Merge pull request #8038 from frodsan/fix_am_serializers_xml_dependency
Fix AM::Serializers::Xml dependency
Diffstat (limited to 'activemodel/lib')
| -rw-r--r-- | activemodel/lib/active_model/serializers/json.rb | 2 | ||||
| -rw-r--r-- | activemodel/lib/active_model/serializers/xml.rb | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/activemodel/lib/active_model/serializers/json.rb b/activemodel/lib/active_model/serializers/json.rb index c845440120..4060425725 100644 --- a/activemodel/lib/active_model/serializers/json.rb +++ b/activemodel/lib/active_model/serializers/json.rb @@ -2,8 +2,8 @@ require 'active_support/json' require 'active_support/core_ext/class/attribute' module ActiveModel - # == Active Model JSON Serializer module Serializers + # == Active Model JSON Serializer module JSON extend ActiveSupport::Concern include ActiveModel::Serialization diff --git a/activemodel/lib/active_model/serializers/xml.rb b/activemodel/lib/active_model/serializers/xml.rb index d61d9d7119..2dc7d00f52 100644 --- a/activemodel/lib/active_model/serializers/xml.rb +++ b/activemodel/lib/active_model/serializers/xml.rb @@ -5,12 +5,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 |