@@ -108,7 +108,7 @@ module Rack else @env["rack.request.query_string"] = query_string @env["rack.request.query_hash"] = - Utils.parse_query(query_string) + Utils.parse_nested_query(query_string) end end @@ -129,7 +129,7 @@ module Rack form_vars.sub!(/\0\z/, '') @env["rack.request.form_vars"] = form_vars - @env["rack.request.form_hash"] = Utils.parse_query(form_vars) + @env["rack.request.form_hash"] = Utils.parse_nested_query(form_vars) begin @env["rack.input"].rewind if @env["rack.input"].respond_to?(:rewind) lib/rack/request.rb @@ -29,19 +29,39 @@ module Rack # and ';' characters. You can also use this to parse # cookies by changing the characters used in the second # parameter (which defaults to '&;'). - def parse_query(qs, d = '&;') params = {} (qs || '').split(/[#{d}] */n).each do |p| k, v = unescape(p).split('=', 2) - normalize_params(params, k, v) + + if cur = params[k] + if cur.class == Array + params[k] << v + else + params[k] = [cur, v] + end + else + params[k] = v + end end return params end module_function :parse_query + def parse_nested_query(qs, d = '&;') + params = {} + + (qs || '').split(/[#{d}] */n).each do |p| + k, v = unescape(p).split('=', 2) + normalize_params(params, k, v) + end + + return params + end + module_function :parse_nested_query + def normalize_params(params, name, v = nil) name =~ %r([\[\]]*([^\[\]]+)\]*) k = $1 || '' @@ -50,15 +70,7 @@ module Rack return if k.empty? if after == "" - if cur = params[k] - if cur.is_a?(Array) - params[k] << v - else - params[k] = [cur, v] - end - else - params[k] = v - end + params[k] = v elsif after == "[]" params[k] ||= [] raise TypeError unless params[k].is_a?(Array) lib/rack/utils.rb @@ -21,69 +21,79 @@ context "Rack::Utils" do end specify "should parse query strings correctly" do - Rack::Utils.parse_query("foo"). + Rack::Utils.parse_query("foo=bar").should.equal "foo" => "bar" + Rack::Utils.parse_query("foo=bar&foo=quux"). + should.equal "foo" => ["bar", "quux"] + Rack::Utils.parse_query("foo=1&bar=2"). + should.equal "foo" => "1", "bar" => "2" + Rack::Utils.parse_query("my+weird+field=q1%212%22%27w%245%267%2Fz8%29%3F"). + should.equal "my weird field" => "q1!2\"'w$5&7/z8)?" + end + + specify "should parse nested query strings correctly" do + Rack::Utils.parse_nested_query("foo"). should.equal "foo" => nil - Rack::Utils.parse_query("foo="). + Rack::Utils.parse_nested_query("foo="). should.equal "foo" => "" - Rack::Utils.parse_query("foo=bar"). + Rack::Utils.parse_nested_query("foo=bar"). should.equal "foo" => "bar" - Rack::Utils.parse_query("foo=bar&foo=quux"). - should.equal "foo" => ["bar", "quux"] - Rack::Utils.parse_query("foo&foo="). + Rack::Utils.parse_nested_query("foo=bar&foo=quux"). + should.equal "foo" => "quux" + Rack::Utils.parse_nested_query("foo&foo="). should.equal "foo" => "" - Rack::Utils.parse_query("foo=1&bar=2"). + Rack::Utils.parse_nested_query("foo=1&bar=2"). should.equal "foo" => "1", "bar" => "2" - Rack::Utils.parse_query("&foo=1&&bar=2"). + Rack::Utils.parse_nested_query("&foo=1&&bar=2"). should.equal "foo" => "1", "bar" => "2" - Rack::Utils.parse_query("foo&bar="). + Rack::Utils.parse_nested_query("foo&bar="). should.equal "foo" => nil, "bar" => "" - Rack::Utils.parse_query("foo=bar&baz="). + Rack::Utils.parse_nested_query("foo=bar&baz="). should.equal "foo" => "bar", "baz" => "" - Rack::Utils.parse_query("my+weird+field=q1%212%22%27w%245%267%2Fz8%29%3F"). + Rack::Utils.parse_nested_query("my+weird+field=q1%212%22%27w%245%267%2Fz8%29%3F"). should.equal "my weird field" => "q1!2\"'w$5&7/z8)?" - Rack::Utils.parse_query("foo[]"). + Rack::Utils.parse_nested_query("foo[]"). should.equal "foo" => [nil] - Rack::Utils.parse_query("foo[]="). + Rack::Utils.parse_nested_query("foo[]="). should.equal "foo" => [""] - Rack::Utils.parse_query("foo[]=bar"). + Rack::Utils.parse_nested_query("foo[]=bar"). should.equal "foo" => ["bar"] - Rack::Utils.parse_query("foo[]=1&foo[]=2"). + Rack::Utils.parse_nested_query("foo[]=1&foo[]=2"). should.equal "foo" => ["1", "2"] - Rack::Utils.parse_query("foo=bar&baz[]=1&baz[]=2&baz[]=3"). + Rack::Utils.parse_nested_query("foo=bar&baz[]=1&baz[]=2&baz[]=3"). should.equal "foo" => "bar", "baz" => ["1", "2", "3"] - Rack::Utils.parse_query("foo[]=bar&baz[]=1&baz[]=2&baz[]=3"). + Rack::Utils.parse_nested_query("foo[]=bar&baz[]=1&baz[]=2&baz[]=3"). should.equal "foo" => ["bar"], "baz" => ["1", "2", "3"] - Rack::Utils.parse_query("x[y][z]=1"). + Rack::Utils.parse_nested_query("x[y][z]=1"). should.equal "x" => {"y" => {"z" => "1"}} - Rack::Utils.parse_query("x[y][z][]=1"). + Rack::Utils.parse_nested_query("x[y][z][]=1"). should.equal "x" => {"y" => {"z" => ["1"]}} - Rack::Utils.parse_query("x[y][z]=1&x[y][z]=2"). - should.equal "x" => {"y" => {"z" => ["1", "2"]}} - Rack::Utils.parse_query("x[y][z][]=1&x[y][z][]=2"). + Rack::Utils.parse_nested_query("x[y][z]=1&x[y][z]=2"). + should.equal "x" => {"y" => {"z" => "2"}} + Rack::Utils.parse_nested_query("x[y][z][]=1&x[y][z][]=2"). should.equal "x" => {"y" => {"z" => ["1", "2"]}} - Rack::Utils.parse_query("x[y][][z]=1"). + Rack::Utils.parse_nested_query("x[y][][z]=1"). should.equal "x" => {"y" => [{"z" => "1"}]} - Rack::Utils.parse_query("x[y][][z][]=1"). + Rack::Utils.parse_nested_query("x[y][][z][]=1"). should.equal "x" => {"y" => [{"z" => ["1"]}]} - Rack::Utils.parse_query("x[y][][z]=1&x[y][][w]=2"). + Rack::Utils.parse_nested_query("x[y][][z]=1&x[y][][w]=2"). should.equal "x" => {"y" => [{"z" => "1", "w" => "2"}]} - Rack::Utils.parse_query("x[y][][v][w]=1"). + Rack::Utils.parse_nested_query("x[y][][v][w]=1"). should.equal "x" => {"y" => [{"v" => {"w" => "1"}}]} - Rack::Utils.parse_query("x[y][][z]=1&x[y][][v][w]=2"). + Rack::Utils.parse_nested_query("x[y][][z]=1&x[y][][v][w]=2"). should.equal "x" => {"y" => [{"z" => "1", "v" => {"w" => "2"}}]} - Rack::Utils.parse_query("x[y][][z]=1&x[y][][z]=2"). + Rack::Utils.parse_nested_query("x[y][][z]=1&x[y][][z]=2"). should.equal "x" => {"y" => [{"z" => "1"}, {"z" => "2"}]} - Rack::Utils.parse_query("x[y][][z]=1&x[y][][w]=a&x[y][][z]=2&x[y][][w]=3"). + Rack::Utils.parse_nested_query("x[y][][z]=1&x[y][][w]=a&x[y][][z]=2&x[y][][w]=3"). should.equal "x" => {"y" => [{"z" => "1", "w" => "a"}, {"z" => "2", "w" => "3"}]} - lambda { Rack::Utils.parse_query("foo[bar]=1&foo[]=1") }. + lambda { Rack::Utils.parse_nested_query("foo[bar]=1&foo[]=1") }. should.raise TypeError end test/spec_rack_utils.rb c9b4159e66860188c1abeebb90b1efc9d8fe53de Joshua Peek josh@joshpeek.com http://github.com/scytrin/rack/commit/5c00dd698edb953b4bee432fa12a20ba69a067c1 5c00dd698edb953b4bee432fa12a20ba69a067c1 2009-02-14T16:10:38-08:00 2009-02-14T16:10:38-08:00 Split parse_query utility into parse_query and parse_nested_query. parse_nested_query now chooses the last value instead of returning an array of all of them. 43b633d9d080493c5292ac071d801141100493a2 Joshua Peek josh@joshpeek.com