Changeset 9242

Timestamp:

04/08/08 05:05:54 (3 months ago)

Author:

rick

Message:

Automatically parse posted JSON content for Mime::JSON requests. [rick]

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_controller/base.rb (modified) (1 diff)
• trunk/actionpack/lib/action_controller/request.rb (modified) (3 diffs)
• trunk/actionpack/lib/action_view/template_handlers/erb.rb (modified) (1 diff)
• trunk/actionpack/test/controller/request_test.rb (modified) (2 diffs)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Automatically parse posted JSON content for Mime::JSON requests.  [rick]
+
+  POST /posts
+  {"post": {"title": "Breaking News"}}
+
+  def create
+    @post = Post.create params[:post]
+    # ...
+  end
-
-* add json_escape ERB util to escape html entities in json strings that are output in HTML pages. [rick]

trunk/actionpack/lib/action_controller/base.rb

@@ -317 +317 @@
-    #
-    #   ActionController::Base.param_parsers[Mime::YAML] = :yaml
-
+  
-                        Mime::URL_ENCODED_FORM => :url_encoded_form,
-
+
+
-    cattr_accessor :param_parsers
-

trunk/actionpack/lib/action_controller/request.rb

@@ -403 +403 @@
-          when :yaml
-            YAML.load(body)
+          when :json
+            if body.blank?
+              {}
+            else
+              data = ActiveSupport::JSON.decode(body)
+              data = {:_json => data} unless data.is_a?(Hash)
+              data.with_indifferent_access
+            end
-          else
-            {}
@@ -508 +516 @@
-        end
-
-
-        MULTIPART_BOUNDARY = %r|\Amultipart/form-data.*boundary=\"?([^\";,]+)\"?|n
-
@@ -605 +612 @@
-          raise EOFError, "bad boundary end of body part" unless boundary_end=~/--/
-
-       
+        
-            body.rewind if body.respond_to?(:rewind)
-       
+        
-            # Handles exceptions raised by input streams that cannot be rewound
-            # such as when using plain CGI under Apache
-       
+        
-
-          params

trunk/actionpack/lib/action_view/template_handlers/erb.rb

@@ -4 +4 @@
-  module Util
-    HTML_ESCAPE = { '&' => '&amp;',  '>' => '&gt;',   '<' => '&lt;', '"' => '&quot;' }
-
+ 
-
-    # A utility method for escaping HTML tag characters.

trunk/actionpack/test/controller/request_test.rb

@@ -852 +852 @@
-end
-
-
-class XmlParamsParsingTest < Test::Unit::TestCase
+  def test_hash_params
+    person = parse_body("<person><name>David</name></person>")[:person]
+    assert_kind_of Hash, person
+    assert_equal 'David', person['name']
+  end
+
-  def test_single_file
-    person = parse_body("<person><name>David</name><avatar type='file' name='me.jpg' content_type='image/jpg'>#{ActiveSupport::Base64.encode64('ABC')}</avatar></person>")
@@ -900 +905 @@
-    end
-end
+
+class JsonParamsParsingTest < Test::Unit::TestCase
+  def test_hash_params
+    person = parse_body({:person => {:name => "David"}}.to_json)[:person]
+    assert_kind_of Hash, person
+    assert_equal 'David', person['name']
+  end
+
+  private
+    def parse_body(body)
+      env = { 'CONTENT_TYPE'   => 'application/json',
+              'CONTENT_LENGTH' => body.size.to_s }
+      cgi = ActionController::Integration::Session::StubCGI.new(env, body)
+      ActionController::CgiRequest.new(cgi).request_parameters
+    end
+end