Underscore dasherized keys in formatted requests

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3878 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

2 files changed, 14 insertions, 2 deletions

diff --git a/actionpack/lib/action_controller/cgi_ext/cgi_methods.rb b/actionpack/lib/action_controller/cgi_ext/cgi_methods.rb
index f092a41d47..cd70836c6e 100755
--- a/actionpack/lib/action_controller/cgi_ext/cgi_methods.rb
+++ b/actionpack/lib/action_controller/cgi_ext/cgi_methods.rb
@@ -71,7 +71,7 @@ class CGIMethods #:nodoc:
           { node.node_name => node }
       end
       
-      params || {}
+      dasherize_keys(params || {})
     rescue Object => e
       { "exception" => "#{e.message} (#{e.class})", "backtrace" => e.backtrace, 
         "raw_post_data" => raw_post_data, "format" => mime_type }
@@ -79,6 +79,18 @@ class CGIMethods #:nodoc:
 
   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]',
     # 'person[name][first]', and 'people[]'. In each instance, an Array instance is returned.
     # 'person[name][first]' produces ['person', 'name', 'first']; 'people[]' produces ['people', '']
diff --git a/actionpack/lib/action_controller/mime_responds.rb b/actionpack/lib/action_controller/mime_responds.rb
index 04ec1e5dd8..140209a225 100644
--- a/actionpack/lib/action_controller/mime_responds.rb
+++ b/actionpack/lib/action_controller/mime_responds.rb
@@ -36,7 +36,7 @@ module ActionController #:nodoc:
           @responses[mime_type] = block
         else
           if argument = args.first
-            eval("__mime_responder_arg__ = " + (argument.is_a?(String) ? "'" + argument + "'" : argument), @block_binding)
+            eval("__mime_responder_arg__ = #{argument.is_a?(String) ? argument.inspect : argument}", @block_binding)
             @responses[mime_type] = eval(DEFAULT_BLOCKS[(mime_type.to_sym.to_s + "_arg").to_sym], @block_binding)
           else
             @responses[mime_type] = eval(DEFAULT_BLOCKS[mime_type.to_sym], @block_binding)