Changeset 3878

Timestamp:

03/15/06 21:46:41 (2 years ago)

Author:

minam

Message:

Underscore dasherized keys in formatted requests

Files:

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

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Underscore dasherized keys in formatted requests [Jamis Buck]
-
-* Add MimeResponds::Responder#any for managing multiple types with identical responses [Jamis Buck]

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

@@ -72 +72 @@
-      end
-      
-params || {}
+dasherize_keys(params || {})
-    rescue Object => e
-      { "exception" => "#{e.message} (#{e.class})", "backtrace" => e.backtrace, 
@@ -79 +79 @@
-
-  private
+
+    def self.dasherize_keys(params)
+       case params.class.to_s
+       when "Hash"
+         params.inject({}) do |h,(k,v)|
+           h[k.tr("-", "_")] = dasherize_keys(v)
+           h
+         end
+       else
+         params
+       end
+    end
-
-    # Splits the given key into several pieces. Example keys are 'name', 'person[name]',

trunk/actionpack/lib/action_controller/mime_responds.rb

@@ -37 +37 @@
-        else
-          if argument = args.first
-" + (argument.is_a?(String) ? "'" + argument + "'" : argument)
+#{argument.is_a?(String) ? argument.inspect : argument}"
-            @responses[mime_type] = eval(DEFAULT_BLOCKS[(mime_type.to_sym.to_s + "_arg").to_sym], @block_binding)
-          else

trunk/actionpack/test/controller/webservice_test.rb

@@ -20 +20 @@
-
-    def assign_parameters
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    end
-
@@ -89 +102 @@
-    assert_equal false, @controller.request.xml_post?    
-  end
+
+  def test_dasherized_keys_as_xml
+    ActionController::Base.param_parsers[Mime::XML] = :xml_simple
+    process('POST', 'application/xml', "<first-key>\n<sub-key>...</sub-key>\n</first-key>", true)
+    assert_equal 'action, controller, first_key(sub_key), full', @controller.response.body
+  end
+
+  def test_dasherized_keys_as_yaml
+    ActionController::Base.param_parsers[Mime::YAML] = :yaml
+    process('POST', 'application/x-yaml', "---\nfirst-key:\n  sub-key: ...\n", true)
+    assert_equal 'action, controller, first_key(sub_key), full', @controller.response.body
+  end
-  
-  
-  private  
-  
-
+, full=false
-    
-    cgi = MockCGI.new({
-      'REQUEST_METHOD' => verb,
-      'CONTENT_TYPE'   => content_type,
-
+#{"&full=1" if full}
-      "REQUEST_URI"    => "/",
-      "HTTP_HOST"      => 'testdomain.com',