From 2daac47d585c5b8f37e4749d6a9a3aea4b989bd0 Mon Sep 17 00:00:00 2001
From: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>
Date: Thu, 21 May 2009 14:34:42 -0700
Subject: [PATCH] Added the ability to register methods to handle specific
 render option keys and render :json

---
 actionpack/Rakefile                           |  5 ++-
 actionpack/lib/action_controller/new_base.rb  |  2 +
 .../lib/action_controller/new_base/base.rb    |  2 +
 .../new_base/render_options.rb                | 39 +++++++++++++++++++
 4 files changed, 46 insertions(+), 2 deletions(-)
 create mode 100644 actionpack/lib/action_controller/new_base/render_options.rb

diff --git a/actionpack/Rakefile b/actionpack/Rakefile
index 5968317c60..2041f5a844 100644
--- a/actionpack/Rakefile
+++ b/actionpack/Rakefile
@@ -62,8 +62,9 @@ Rake::TestTask.new(:test_new_base_on_old_tests) do |t|
   # Dir.glob( "test/{dispatch,template}/**/*_test.rb" ).sort +
   t.test_files = %w(
     addresses_render base benchmark caching capture content_type dispatcher
-    flash mime_responds record_identifier redirect render rescue url_rewriter
-    webservice verification request_forgery_protection send_file
+    flash mime_responds record_identifier redirect
+    render render_json
+    send_file request_forgery_protection rescue url_rewriter verification webservice
   ).map { |name| "test/controller/#{name}_test.rb" }
 end
 
diff --git a/actionpack/lib/action_controller/new_base.rb b/actionpack/lib/action_controller/new_base.rb
index 58c7382661..95808decd5 100644
--- a/actionpack/lib/action_controller/new_base.rb
+++ b/actionpack/lib/action_controller/new_base.rb
@@ -7,6 +7,8 @@ module ActionController
   autoload :Rails2Compatibility,  "action_controller/new_base/compatibility"
   autoload :Redirector,           "action_controller/new_base/redirector"
   autoload :Renderer,             "action_controller/new_base/renderer"
+  autoload :RenderOptions,        "action_controller/new_base/render_options"
+  autoload :Renderers,            "action_controller/new_base/render_options"
   autoload :Rescue,               "action_controller/new_base/rescuable"
   autoload :Testing,              "action_controller/new_base/testing"
   autoload :UrlFor,               "action_controller/new_base/url_for"
diff --git a/actionpack/lib/action_controller/new_base/base.rb b/actionpack/lib/action_controller/new_base/base.rb
index b8674d5099..6e1f92c45d 100644
--- a/actionpack/lib/action_controller/new_base/base.rb
+++ b/actionpack/lib/action_controller/new_base/base.rb
@@ -11,6 +11,8 @@ module ActionController
     include ActionController::UrlFor
     include ActionController::Redirector
     include ActionController::Renderer
+    include ActionController::RenderOptions
+    include ActionController::Renderers::Json
     include ActionController::Layouts
     include ActionController::ConditionalGet
 
diff --git a/actionpack/lib/action_controller/new_base/render_options.rb b/actionpack/lib/action_controller/new_base/render_options.rb
new file mode 100644
index 0000000000..e7ed2bd278
--- /dev/null
+++ b/actionpack/lib/action_controller/new_base/render_options.rb
@@ -0,0 +1,39 @@
+module ActionController
+  module RenderOptions
+    extend ActiveSupport::DependencyModule
+    
+    included do
+      extlib_inheritable_accessor :_renderers
+      self._renderers = []
+    end
+    
+    def render_to_body(options)
+      _renderers.each do |renderer|
+        if options.key?(renderer)
+          _process_options(options)
+          return send("_render_#{renderer}", options[renderer], options)
+        end
+      end
+      super
+    end
+  end
+  
+  module Renderers
+    module Json
+      extend ActiveSupport::DependencyModule
+      
+      depends_on RenderOptions
+      
+      included do
+        _renderers << :json
+      end
+      
+      def _render_json(json, options)
+        json = ActiveSupport::JSON.encode(json) unless json.respond_to?(:to_str)
+        json = "#{options[:callback]}(#{json})" unless options[:callback].blank?
+        response.content_type ||= Mime::JSON
+        self.response_body = json
+      end      
+    end
+  end
+end
\ No newline at end of file