Changeset 9242 for trunk/actionpack/lib/action_controller/request.rb

Timestamp:

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

Author:

rick

Message:

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

Files:

• trunk/actionpack/lib/action_controller/request.rb (modified) (3 diffs)

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