From 4b1a7bcc4ceefeebaa14dbc2571a2e6cd593556d Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Fri, 26 Oct 2012 19:53:32 -0700
Subject: Merge pull request #8038 from
 frodsan/fix_am_serializers_xml_dependency

Fix AM::Serializers::Xml dependency
---
 activemodel/lib/active_model/serializers/json.rb              | 2 +-
 activemodel/lib/active_model/serializers/xml.rb               | 6 +++++-
 activemodel/test/cases/serializers/json_serialization_test.rb | 1 -
 activemodel/test/cases/serializers/xml_serialization_test.rb  | 2 --
 4 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'activemodel')

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
diff --git a/activemodel/test/cases/serializers/json_serialization_test.rb b/activemodel/test/cases/serializers/json_serialization_test.rb
index 4ac5fb1779..4eabe82153 100644
--- a/activemodel/test/cases/serializers/json_serialization_test.rb
+++ b/activemodel/test/cases/serializers/json_serialization_test.rb
@@ -4,7 +4,6 @@ require 'models/automobile'
 require 'active_support/core_ext/object/instance_variables'
 
 class Contact
-  extend ActiveModel::Naming
   include ActiveModel::Serializers::JSON
   include ActiveModel::Validations
 
diff --git a/activemodel/test/cases/serializers/xml_serialization_test.rb b/activemodel/test/cases/serializers/xml_serialization_test.rb
index 7f14b21cf4..83db8d21f4 100644
--- a/activemodel/test/cases/serializers/xml_serialization_test.rb
+++ b/activemodel/test/cases/serializers/xml_serialization_test.rb
@@ -4,7 +4,6 @@ require 'active_support/core_ext/object/instance_variables'
 require 'ostruct'
 
 class Contact
-  extend ActiveModel::Naming
   include ActiveModel::Serializers::Xml
 
   attr_accessor :address, :friends
@@ -25,7 +24,6 @@ class Customer < Struct.new(:name)
 end
 
 class Address
-  extend ActiveModel::Naming
   include ActiveModel::Serializers::Xml
 
   attr_accessor :street, :city, :state, :zip
-- 
cgit v1.2.3