Merge pull request #62 from lgierth/fix-trace-uri

Use absolute URIs for traces
webmachine · Jul 25, 2012 · c89fe90 · c89fe90
2 parents 16ef119 + c6c654d
commit c89fe90
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/lib/webmachine/trace/static/tracelist.erb b/lib/webmachine/trace/static/tracelist.erb
@@ -6,8 +6,8 @@
   <body>
     <h1>Traces</h1>
     <ul>
-      <% traces.each do |trace| %>
-      <li><a href="<%= trace %>"><%= trace %></a></li>
+      <% traces.each do |(trace, uri)| %>
+      <li><a href="<%= uri %>"><%= trace %></a></li>
       <% end %>
     </ul>
   </body>

diff --git a/lib/webmachine/trace/trace_resource.rb b/lib/webmachine/trace/trace_resource.rb
@@ -77,7 +77,8 @@ def produce_file
       end
 
       def produce_list
-        traces = Trace.traces
+        base   = request.uri.path.chomp("/")
+        traces = Trace.traces.map {|t| [ t, "#{base}/#{t}" ] }
         self.class.tracelist.result(binding)
       end