Changeset 3778

Timestamp:

03/05/06 19:16:55 (3 years ago)

Author:

xal

Message:

ActionController::Base.param_parsers now accept symbols. currently supported are :xml_node, :xml_simple and :yaml

Files:

• trunk/actionpack/lib/action_controller/base.rb (modified) (1 diff)
• trunk/actionpack/lib/action_controller/cgi_ext/cgi_methods.rb (modified) (1 diff)
• trunk/actionpack/test/controller/webservice_test.rb (modified) (2 diffs)

trunk/actionpack/lib/action_controller/base.rb

@@ -279 +279 @@
-    # this:
-    #
-
-
-
-
-
-
-
+
+
-    #
-    @@param_parsers = {
-Proc.new { |post| node = XmlNode.from_xml(post); { node.node_name => node } },
+:xml_node
-    }
-    cattr_accessor :param_parsers 

trunk/actionpack/lib/action_controller/cgi_ext/cgi_methods.rb

@@ -60 +60 @@
-
-    def self.parse_formatted_request_parameters(format, raw_post_data)
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-    rescue Object => e
-      { "exception" => "#{e.message} (#{e.class})", "backtrace" => e.backtrace, 

trunk/actionpack/test/controller/webservice_test.rb

@@ -28 +28 @@
-  def setup
-    @controller = TestController.new
+    ActionController::Base.param_parsers.clear
+    ActionController::Base.param_parsers['application/xml'] = :xml_node
-  end
-  
@@ -56 +58 @@
-    ActionController::Base.param_parsers['application/x-yaml'] = Proc.new { |d| YAML.load(d) }
-    process('POST', 'application/x-yaml', {"entry" => "loaded from yaml"}.to_yaml)
+    assert_equal 'entry', @controller.response.body
-    assert @controller.params.has_key?(:entry)
-    assert_equal 'loaded from yaml', @controller.params["entry"]
-  ensure
-    ActionController::Base.param_parsers['application/x-yaml'] = nil
-  end
-  
+  def test_register_and_use_yaml_as_symbol
+    ActionController::Base.param_parsers['application/x-yaml'] = :yaml
+    process('POST', 'application/x-yaml', {"entry" => "loaded from yaml"}.to_yaml)
+    assert_equal 'entry', @controller.response.body
+    assert @controller.params.has_key?(:entry)
+    assert_equal 'loaded from yaml', @controller.params["entry"]
+  end
+
+  def test_register_and_use_xml_simple
+    ActionController::Base.param_parsers['application/xml'] = :xml_simple
+    process('POST', 'application/xml', '<request><summary>content...</summary><title>SimpleXml</title></request>' )
+    assert_equal 'summary, title', @controller.response.body
+    assert @controller.params.has_key?(:summary)
+    assert @controller.params.has_key?(:title)
+    assert_equal 'content...', @controller.params["summary"]
+    assert_equal 'SimpleXml', @controller.params["title"]
+  end
-  
-  def test_deprecated_request_methods