github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Stop escaping "[]" in query string

Browse Source
This commit is contained in:
Joshua Peek
2009-12-02 12:46:14 -06:00
parent c0949cc8f6
commit 4dee277a9b
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
actionpack/lib/action_dispatch/routing/route_set.rb
View File

@@ -486,9 +486,7 @@ module ActionDispatch
}.join("&")
when String
raise ArgumentError, "value must be a Hash" if prefix.nil?
"#{Rack::Utils.escape(prefix)}=#{Rack::Utils.escape(value)}"
when NilClass
Rack::Utils.escape(prefix)
"#{prefix}=#{Rack::Utils.escape(value)}"
else
if value.respond_to?(:to_param)
build_nested_query(value.to_param.to_s, prefix)

6
actionpack/test/controller/routing_test.rb
View File

@@ -1621,7 +1621,7 @@ class RouteSetTest < ActiveSupport::TestCase
end
def test_expand_array_build_query_string
assert_uri_equal '/foo?x%5B%5D=1&x%5B%5D=2', default_route_set.generate({:controller => 'foo', :x => [1, 2]})
assert_uri_equal '/foo?x[]=1&x[]=2', default_route_set.generate({:controller => 'foo', :x => [1, 2]})
end
def test_escape_spaces_build_query_string_selected_keys
@@ -2012,9 +2012,9 @@ class RackMountIntegrationTests < ActiveSupport::TestCase
assert_equal '/posts', @routes.generate({:controller => 'posts'}, {:controller => 'posts', :action => 'index'})
assert_equal '/posts/create', @routes.generate({:action => 'create'}, {:controller => 'posts'})
assert_equal '/posts?foo=bar', @routes.generate(:controller => 'posts', :foo => 'bar')
assert_equal '/posts?foo%5B%5D=bar&foo%5B%5D=baz', @routes.generate(:controller => 'posts', :foo => ['bar', 'baz'])
assert_equal '/posts?foo[]=bar&foo[]=baz', @routes.generate(:controller => 'posts', :foo => ['bar', 'baz'])
assert_equal '/posts?page=2', @routes.generate(:controller => 'posts', :page => 2)
assert_equal '/posts?q%5Bfoo%5D%5Ba%5D=b', @routes.generate(:controller => 'posts', :q => { :foo => { :a => 'b'}})
assert_equal '/posts?q[foo][a]=b', @routes.generate(:controller => 'posts', :q => { :foo => { :a => 'b'}})
assert_equal '/', @routes.generate(:controller => 'news', :action => 'index')
assert_equal '/', @routes.generate(:controller => 'news', :action => 'index', :format => nil)