@@ -1 +1 @@ -Subproject commit d221938a6401d956ac6cfdc892f9b1c11b1fa31a +Subproject commit 08d709f78b8c5b0fbeb7821e37fa53e69afcf433 rack @@ -144,7 +144,7 @@ module Tap # Returns a uri to the specified action on self. def uri(action=nil, params={}) - server.uri("#{name}#{action ? '/' : ''}#{action}", params) + server.uri("#{name}#{name && action ? '/' : ''}#{action}", params) end def template_path(path) tap-server/lib/tap/controller.rb @@ -31,7 +31,7 @@ module Tap if request.get? render 'access.erb', :locals => {:secret => request['secret']}, :layout => true else - redirect uri("admin/#{request['secret']}") + redirect uri("admin", :secret => request['secret']) end end @@ -103,7 +103,11 @@ module Tap # Returns a controller uri, attaching the secret to the action, if specified. def uri(action=nil, params={}) secret = params.delete(:secret) - action = "#{action}/#{secret}" if secret + + if secret + action = action ? "#{action}/#{secret}" : secret + end + super(action, params) end tap-server/lib/tap/controllers/server.rb @@ -11,7 +11,7 @@ module Tap config :controllers, {} def controller_uri(env, controller, action=nil, params={}) - uri "/#{escape("#{env}:#{controller}")}#{action ? '/' : ''}#{action}", params + uri "#{escape("#{env}:#{controller}")}#{action ? '/' : ''}#{action}", params end # a helper method for routing a key to a controller @@ -55,7 +55,8 @@ module Tap else # use main controller controller = self.controller - + path = nil + unless controller raise ServerError.new("404 Error: could not route to controller", 404) end @@ -63,7 +64,7 @@ module Tap # handle the request rack_env['tap.server'] = self - rack_env['tap.path'] = "/#{path}" + rack_env['tap.path'] = path controller.call(rack_env) rescue ServerError $!.response tap-server/lib/tap/router.rb @@ -122,9 +122,10 @@ module Tap initialize_config(config) end + # path should not start with "/" def uri(path=nil, params={}) query = build_query(params) - "http://#{host}:#{port}#{path}#{query.empty? ? '' : '?'}#{query}" + "http://#{host}:#{port}/#{path}#{query.empty? ? '' : '?'}#{query}" end def path(dir, path) tap-server/lib/tap/server.rb @@ -10,4 +10,10 @@ form.run, form.rename, form.duplicate, form.delete { li.task, li.join, li.queue { border-top: thin solid black; padding: 0.5em; +} + +pre.yaml { + padding: 1em; + background-color: 99FFCC; + overflow: hidden; } \ No newline at end of file tap-server/public/stylesheets/tap.css @@ -2,8 +2,9 @@ <div>Tap <%= Tap::VERSION %></div> <div> Server: -<pre><%= YAML.dump(server.config.to_hash) %></pre> +<pre class="yaml"><%= YAML.dump(server.config.to_hash) %></pre> </div> +<% if Object.const_defined?(:Gem) %> <div> Active Gems: <ul> @@ -12,6 +13,7 @@ Active Gems: <% end %> </ul> </div> +<% end %> <form action="<%= uri :shutdown, :secret => secret %>" method="post"> <input type="submit" value="shutdown" /> </form> tap-server/views/tap/controllers/server/admin.erb d6f5af3b0e73313517f7599cd0d78ece6b170627 Simon Chiang simon.a.chiang@gmail.com http://github.com/bahuvrihi/tap/commit/118b8773556adfb092178332afb123bb99ef1338 118b8773556adfb092178332afb123bb99ef1338 2009-05-12T11:06:56-07:00 2009-05-12T11:06:56-07:00 fixed some particulars of uri generation eb48ac09c19da857d966bafa678834cfa33c8ea6 Simon Chiang simon.a.chiang@gmail.com