@@ -1,4 +1,5 @@ require "rack" +require "uri" module Rack # Rack::Router is a simple class that includes Rack::Router::Routable. lib/rack/router.rb @@ -51,7 +51,7 @@ class Rack::Router url << ":#{parts[2]}" if parts[2] && parts[2] != 80 end - url << parts[3] + url << URI.escape(parts[3]) query_params.delete_if { |k, v| v.nil? } lib/rack/router/routable.rb @@ -66,6 +66,10 @@ describe "When generating URLs" do @app.url(:foobar, :foo => "omg", :bar => "hi2u").should == "/omg/hi2u" end + it "generates a URL with parameters passed for both variables that need escaping" do + @app.url(:foobar, :foo => "om#g", :bar => "hi 2u").should == "/om%23g/hi%202u" + end + it "appends any extra parameters to the query string" do @app.url(:foobar, :foo => "omg", :bar => "hi2u", :fiz => "what", :biz => "bat").should =~ %r[\?(fiz=what&biz=bat|biz=bat&fiz=what)$] end spec/generation/string_spec.rb 84fe35d47a02dadc00a605bbbd985339ea5f9f5d Joshua Hull joshbuddy@gmail.com http://github.com/carllerche/rack-router/commit/4d1f44153a1652aa0d2cde89bdb3952de58dad5a 4d1f44153a1652aa0d2cde89bdb3952de58dad5a 2009-05-29T06:13:35-07:00 2009-05-29T06:13:35-07:00 added URI escaping for path parts in generation c0c87038de84629884d521c647c05dad5f76eac5 Joshua Hull joshbuddy@gmail.com