@@ -21,7 +21,7 @@ module Trample def url proc_params? ? interpolated_url : @url end - + protected def proc_params? @parameters.is_a?(Proc) @@ -30,7 +30,7 @@ module Trample def interpolated_url params = parameters # cache called proc url = @url.dup - url.scan(/\:\w+/).each do |m| + url.scan(/\:[A-Za-z_]\w+/).each do |m| url.gsub!(m, params[m.gsub(/:/, '').to_sym].to_s) end url lib/trample/page.rb @@ -39,6 +39,11 @@ class PageTest < Test::Unit::TestCase should "interpolate parameters into the url" do assert_equal "http://google.com/1", @page.url end + + should "not interpolate the port number if there is one" do + page = Trample::Page.new(:post, "http://localhost:3000/:id", lambda { { :id => 1, :username => "joetheuser" } }) + assert_equal "http://localhost:3000/1", page.url + end end context "Block based parameters for GET requests" do @@ -54,6 +59,11 @@ class PageTest < Test::Unit::TestCase page = Trample::Page.new(:get, "http://mysite.com/somethings/:id", lambda { {:id => rand(10)} }) assert_not_equal page.url, page.url end + + should "not interpolate the port number if there is one" do + page = Trample::Page.new(:get, "http://mysite.com:8080/somethings/:id", lambda { {:id => 5} }) + assert_equal "http://mysite.com:8080/somethings/5", page.url + end end end test/page_test.rb 7d19ad88990b46342a365b555c5de04604714070 Wes Gibbs wes@hashrocket.com http://github.com/wgibbs/trample/commit/3ee9a8f07dc5ef26dc5adc66c6aea7b22a8f6194 3ee9a8f07dc5ef26dc5adc66c6aea7b22a8f6194 2009-10-03T11:16:27-07:00 2009-10-03T11:16:27-07:00 Do not interpolate port numbers out of the URL 443d76d107476b25a8cb8ee193fa31027eed4fe3 Wes Gibbs wes@hashrocket.com