From 128e35261401a93a4b280ca32d2d4d9040b2f4a7 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Mon, 4 Jul 2005 19:21:48 +0000
Subject: Fixed that hashes was not working properly when passed by GET to
 lighttpd #849 [Nicholas Seckar]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1677 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
---
 .../lib/action_controller/cgi_ext/cgi_methods.rb   | 34 ++++++++++++++++------
 1 file changed, 25 insertions(+), 9 deletions(-)

(limited to 'actionpack/lib/action_controller/cgi_ext')

diff --git a/actionpack/lib/action_controller/cgi_ext/cgi_methods.rb b/actionpack/lib/action_controller/cgi_ext/cgi_methods.rb
index 81bc4867de..c8ed3fb385 100755
--- a/actionpack/lib/action_controller/cgi_ext/cgi_methods.rb
+++ b/actionpack/lib/action_controller/cgi_ext/cgi_methods.rb
@@ -17,20 +17,19 @@ class CGIMethods #:nodoc:
         k = CGI.unescape(k) unless k.nil?
         v = CGI.unescape(v) unless v.nil?
 
-        if k =~ /(.*)\[\]$/
-          if parsed_params.has_key? $1
-            parsed_params[$1] << v
-          else
-            parsed_params[$1] = [v]
-          end
-        else
-          parsed_params[k] = v.nil? ? nil : v
+        keys = split_key(k)
+        last_key = keys.pop
+        last_key = keys.pop if (use_array = last_key.empty?)
+        parent = keys.inject(parsed_params) {|h, k| h[k] ||= {}}
+        
+        if use_array then (parent[last_key] ||= []) << v
+        else parent[last_key] = v
         end
       }
   
       return parsed_params
     end
-  
+
     # Returns the request (POST/GET) parameters in a parsed form where pairs such as "customer[address][street]" / 
     # "Somewhere cool!" are translated into a full hash hierarchy, like
     # { "customer" => { "address" => { "street" => "Somewhere cool!" } } }
@@ -62,6 +61,23 @@ class CGIMethods #:nodoc:
     end
 
   private
+
+    # 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', '']
+    def CGIMethods.split_key(key)
+      if /^([^\[]+)((?:\[[^\]]*\])+)$/ =~ key
+        keys = [$1]
+        
+        keys.concat($2[1..-2].split(']['))
+        keys << '' if key[-2..-1] == '[]' # Have to add it since split will drop empty strings
+        
+        return keys
+      else
+        return [key]
+      end
+    end
+    
     def CGIMethods.get_typed_value(value)
       if value.respond_to?(:content_type) && !value.content_type.empty?
         # Uploaded file
-- 
cgit v1.2.3