From e3d6d10e1ff669430c3d8678c196c52397c850ea Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Sun, 28 Jun 2009 20:16:06 -0500
Subject: Ensure JSON serializer includes model naming

---
 activemodel/lib/active_model/serializers/json.rb  | 2 ++
 activemodel/test/cases/json_serialization_test.rb | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'activemodel')

diff --git a/activemodel/lib/active_model/serializers/json.rb b/activemodel/lib/active_model/serializers/json.rb
index 60b5cbe948..440fe47e34 100644
--- a/activemodel/lib/active_model/serializers/json.rb
+++ b/activemodel/lib/active_model/serializers/json.rb
@@ -10,6 +10,8 @@ module ActiveModel
       include ActiveModel::Attributes
 
       included do
+        extend ActiveModel::Naming
+
         cattr_accessor :include_root_in_json, :instance_writer => false
       end
 
diff --git a/activemodel/test/cases/json_serialization_test.rb b/activemodel/test/cases/json_serialization_test.rb
index abcec67a85..e50922493d 100644
--- a/activemodel/test/cases/json_serialization_test.rb
+++ b/activemodel/test/cases/json_serialization_test.rb
@@ -2,7 +2,6 @@ require 'cases/helper'
 
 class JsonSerializationTest < ActiveModel::TestCase
   class Contact
-    extend ActiveModel::Naming
     include ActiveModel::Serializers::JSON
     attr_accessor :name, :age, :created_at, :awesome, :preferences
   end
-- 
cgit v1.2.3