Skip to content
Browse files

Fixed that hashes was not working properly when passed by GET to ligh…

…ttpd #849 [Nicholas Seckar]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1677 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 9e4f5f3 commit 128e35261401a93a4b280ca32d2d4d9040b2f4a7 @dhh dhh committed Jul 4, 2005
View
2 actionpack/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Fixed that hashes was not working properly when passed by GET to lighttpd #849 [Nicholas Seckar]
+
* Fixed assert_template nil will be true when no template was rendered #1565 [maceywj@telus.net]
* Added :prompt option to FormOptions#select (and the users of it, like FormOptions#select_country etc) to create "Please select" style descriptors #1181 [Michael Schuerig]
View
34 actionpack/lib/action_controller/cgi_ext/cgi_methods.rb
@@ -17,20 +17,19 @@ def CGIMethods.parse_query_parameters(query_string)
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 @@ def self.parse_formatted_request_parameters(format, raw_post_data)
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
View
15 actionpack/test/controller/cgi_test.rb
@@ -32,7 +32,16 @@ def test_query_string
CGIMethods.parse_query_parameters(@query_string)
)
end
-
+
+ def test_deep_query_string
+ assert_equal({'x' => {'y' => {'z' => '10'}}}, CGIMethods.parse_query_parameters('x[y][z]=10'))
+ end
+
+ def test_deep_query_string_with_array
+ assert_equal({'x' => {'y' => {'z' => ['10']}}}, CGIMethods.parse_query_parameters('x[y][z][]=10'))
+ assert_equal({'x' => {'y' => {'z' => ['10', '5']}}}, CGIMethods.parse_query_parameters('x[y][z][]=10&x[y][z][]=5'))
+ end
+
def test_query_string_with_nil
assert_equal(
{ "action" => "create_customer", "full_name" => nil},
@@ -41,10 +50,10 @@ def test_query_string_with_nil
end
def test_query_string_with_array
- assert_equal(
+ assert_equal(
{ "action" => "create_customer", "selected" => ["1", "2", "3"]},
CGIMethods.parse_query_parameters(@query_string_with_array)
- )
+ )
end
def test_query_string_with_amps

0 comments on commit 128e352

Please sign in to comment.
Something went wrong with that request. Please try again.