From 96d15839b12e5d811b01cc51ef8909ca546e0646 Mon Sep 17 00:00:00 2001
From: Diego Carrion <dc.rec1@gmail.com>
Date: Sat, 18 Sep 2010 11:00:23 -0300
Subject: [PATCH] renderer calls object.to_json when rendering :json => object

---
 .../lib/action_controller/metal/renderers.rb       |    2 +-
 actionpack/test/controller/render_json_test.rb     |   13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/actionpack/lib/action_controller/metal/renderers.rb b/actionpack/lib/action_controller/metal/renderers.rb
index 0be07cd..f9b226b 100644
--- a/actionpack/lib/action_controller/metal/renderers.rb
+++ b/actionpack/lib/action_controller/metal/renderers.rb
@@ -71,7 +71,7 @@ module ActionController
     end
 
     add :json do |json, options|
-      json = ActiveSupport::JSON.encode(json, options) unless json.respond_to?(:to_str)
+      json = json.to_json(options) unless json.respond_to?(:to_str)
       json = "#{options[:callback]}(#{json})" unless options[:callback].blank?
       self.content_type ||= Mime::JSON
       self.response_body  = json
diff --git a/actionpack/test/controller/render_json_test.rb b/actionpack/test/controller/render_json_test.rb
index 5958b18..6dd2a9f 100644
--- a/actionpack/test/controller/render_json_test.rb
+++ b/actionpack/test/controller/render_json_test.rb
@@ -9,6 +9,10 @@ class RenderJsonTest < ActionController::TestCase
       hash.except!(*options[:except]) if options[:except]
       hash
     end
+
+    def to_json(options = {})
+      super :except => [:c, :e]
+    end
   end
 
   class TestController < ActionController::Base
@@ -49,6 +53,10 @@ class RenderJsonTest < ActionController::TestCase
     def render_json_with_extra_options
       render :json => JsonRenderable.new, :except => [:c, :e]
     end
+
+    def render_json_without_options
+      render :json => JsonRenderable.new
+    end
   end
 
   tests TestController
@@ -109,4 +117,9 @@ class RenderJsonTest < ActionController::TestCase
     assert_equal '{"a":"b"}', @response.body
     assert_equal 'application/json', @response.content_type
   end
+
+  def test_render_json_calls_to_json_from_object
+    get :render_json_without_options
+    assert_equal '{"a":"b"}', @response.body
+  end
 end
-- 
1.6.5.2