Skip to content

Commit

Permalink
allow trailing slashes at the end of all pages
Browse files Browse the repository at this point in the history
  • Loading branch information
Elise Huard committed Nov 8, 2011
1 parent 7bc421a commit 8031b71
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 11 deletions.
22 changes: 11 additions & 11 deletions lib/resque/server.rb
Expand Up @@ -149,21 +149,21 @@ def show_for_polling(page)
end

%w( overview workers ).each do |page|
get "/#{page}.poll" do
get "/#{page}.poll/?" do
show_for_polling(page)
end

get "/#{page}/:id.poll" do
get "/#{page}/:id.poll/?" do
show_for_polling(page)
end
end

%w( overview queues working workers key ).each do |page|
get "/#{page}" do
get "/#{page}/?" do
show page
end

get "/#{page}/:id" do
get "/#{page}/:id/?" do
show page
end
end
Expand All @@ -173,7 +173,7 @@ def show_for_polling(page)
redirect u('queues')
end

get "/failed" do
get "/failed/?" do
if Resque::Failure.url
redirect Resque::Failure.url
else
Expand All @@ -193,7 +193,7 @@ def show_for_polling(page)
redirect u('failed')
end

get "/failed/requeue/:index" do
get "/failed/requeue/:index/?" do
Resque::Failure.requeue(params[:index])
if request.xhr?
return Resque::Failure.all(params[:index])['retried_at']
Expand All @@ -202,24 +202,24 @@ def show_for_polling(page)
end
end

get "/failed/remove/:index" do
get "/failed/remove/:index/?" do
Resque::Failure.remove(params[:index])
redirect u('failed')
end

get "/stats" do
get "/stats/?" do
redirect url_path("/stats/resque")
end

get "/stats/:id" do
get "/stats/:id/?" do
show :stats
end

get "/stats/keys/:key" do
get "/stats/keys/:key/?" do
show :stats
end

get "/stats.txt" do
get "/stats.txt/?" do
info = Resque.info

stats = []
Expand Down
6 changes: 6 additions & 0 deletions test/resque-web_test.rb
Expand Up @@ -51,3 +51,9 @@

should_respond_with_success
end

context "also works with slash at the end" do
setup { get "/working/" }

should_respond_with_success
end

0 comments on commit 8031b71

Please sign in to comment.