--- a/app/helpers/browse_helper.rb
+++ b/app/helpers/browse_helper.rb
@@ -8,25 +8,45 @@ module BrowseHelper
     project_repository_log_path(@project, @repository, args)
   end
   
-  def tree_path(sha1=nil)
-    project_repository_tree_path(@project, @repository, sha1)    
+  def tree_path(sha1=nil, path=[])
+    project_repository_tree_path(@project, @repository, sha1, path)    
   end
   
   def commit_path(sha1)
     project_repository_commit_path(@project, @repository, sha1)    
   end
   
-  def blob_path(sha1, filename)
-    project_repository_blob_path(@project, @repository, sha1, filename)    
+  def blob_path(sha1, path)
+    project_repository_blob_path(@project, @repository, sha1, path)    
   end
   
-  def raw_blob_path(sha1, filename)
-    project_repository_raw_blob_path(@project, @repository, sha1, filename)    
+  def raw_blob_path(sha1, path)
+    project_repository_raw_blob_path(@project, @repository, sha1, path)
   end
   
   def diff_path(sha1, other_sha1)
     project_repository_diff_path(@project, @repository, sha1, other_sha1)    
   end
+  
+  def current_path
+    params[:path].dup
+  end
+  
+  def build_tree_path(path)
+    current_path << path
+  end
+  
+  # def breadcrumb_path
+  #   out = %Q{<ul class="path_breadcrumbs">\n}
+  #   visited_path = []
+  #   out <<  %Q{  <li>/ #{link_to("root", tree_path(params[:sha], []))}</li>\n}
+  #   current_path.each_with_index do |path, index|
+  #     visited_path << path
+  #     out << %Q{  <li>/ #{link_to(path, tree_path(params[:sha], path))}</li>\n}
+  #   end
+  #   out << "</ul>"
+  #   out
+  # end
     
   def render_tag_box_if_match(sha, tags_per_sha)
     tags = tags_per_sha[sha]

--- a/app/views/browse/blob.html.erb
+++ b/app/views/browse/blob.html.erb
@@ -1,6 +1,6 @@
 <h1>
-  Blob of <code><%= params[:filename] -%></code> 
-  <small>(<%= link_to "raw blob data", raw_blob_path(@blob.sha, params[:filename]) -%>)</small>
+  Blob of <code><%= current_path.join("/") -%></code> 
+  <small>(<%= link_to "raw blob data", raw_blob_path(@blob.sha, current_path) -%>)</small>
 </h1>
 <pre><%=h @blob.contents -%></pre>
 

--- a/app/views/browse/tree.html.erb
+++ b/app/views/browse/tree.html.erb
@@ -8,12 +8,12 @@
   <tr class="<%= cycle("odd", "even") -%>">
     <!-- <td><%#= h(node.mode) -%></td> -->
     <% if node.type == "tree" -%>
-      <td class="node tree"><%= link_to h(file + "/"), tree_path(node.sha) -%></td>
-      <td class="link"><%= link_to node.type, tree_path(node.sha) -%></td>
+      <td class="node tree"><%= link_to h(file + "/"), tree_path(node.sha, build_tree_path(file)) -%></td>
+      <td class="link"><%= link_to node.type, tree_path(node.sha, build_tree_path(file)) -%></td>
     <!-- TODO: archive -->
     <% else -%>
-      <td class="node file"><%= link_to h(file), blob_path(node.sha, file) -%></td>
-      <td class="link"><%= link_to node.type, blob_path(node.sha, file) -%></td>
+      <td class="node file"><%= link_to h(file), blob_path(node.sha, build_tree_path(file)) -%></td>
+      <td class="link"><%= link_to node.type, blob_path(node.sha, build_tree_path(file)) -%></td>
     <% end -%>
     <td class="sha1"><%= h(node.sha[0..16]) -%></td>
   </tr>

--- a/public/stylesheets/base.css
+++ b/public/stylesheets/base.css
@@ -445,6 +445,11 @@ ul.bullet_list li {
   margin-bottom: 3em;
 }
 
+ul.path_breadcrumbs li {
+  display: inline;
+  margin:0;
+}
+
 /* tags */
 
 ul.tag_list li {

--- a/spec/helpers/browse_helper_spec.rb
+++ b/spec/helpers/browse_helper_spec.rb
@@ -2,10 +2,72 @@ require File.dirname(__FILE__) + '/../spec_helper'
 
 describe BrowseHelper do
   
-  #Delete this example and add some real ones or delete this file
-  it "should include the BrowseHelper" do
-    included_modules = self.metaclass.send :included_modules
-    included_modules.should include(BrowseHelper)
+  before(:each) do
+    @project = projects(:johans)
+    @repository = @project.repositories.first
+  end
+  
+  it "has a browse_path shortcut" do
+    browse_path.should == project_repository_browse_path(@project, @repository)
+  end
+  
+  it "has a log_path shortcut" do
+    log_path.should == project_repository_log_path(@project, @repository)
+  end
+  
+  it "has a log_path shortcut that takes args" do
+    log_path(:page => 2).should == project_repository_log_path(@project, 
+      @repository, {:page => 2})
+  end
+
+  it "has a tree_path shortcut" do
+    tree_path.should == project_repository_tree_path(@project, @repository)
+  end
+  
+  it "has a tree_path shortcut that takes an sha1" do
+    tree_path("abc123").should == project_repository_tree_path(@project, 
+      @repository, "abc123")
+  end
+  
+  it "has a tree_path shortcut that takes an sha1 and a path glob" do
+    tree_path("abc123", ["a", "b"]).should == project_repository_tree_path(@project, 
+      @repository, "abc123", ["a", "b"])
+  end
+  
+  it "has a commit_path shortcut" do
+    commit_path("abc123").should == project_repository_commit_path(@project, 
+      @repository, "abc123")
+  end
+
+  it "has a blob_path shortcut" do
+    blob_path("sha", ["a","b"]).should == project_repository_blob_path(@project, 
+      @repository, "sha", ["a","b"])
+  end
+  
+  it "has a raw_blob_path shortcut" do
+    raw_blob_path("sha", ["a","b"]).should == project_repository_raw_blob_path(
+      @project, @repository, "sha", ["a","b"])
+  end
+
+  it "has a diff_path shortcut" do
+    diff_path("old", "new").should == project_repository_diff_path(@project, 
+      @repository, "old", "new")    
+  end
+  
+  it "has a current_path based on the *path glob" do
+    params[:path] = ["one", "two"]
+    current_path.should == ["one", "two"]
+  end
+  
+  it "builds a tree from current_path" do
+    params[:path] = ["one", "two"]
+    build_tree_path("three").should == ["one", "two", "three"]
+  end
+  
+  it "builds breadcrumbs of the current_path" do
+    stub!(:current_path).and_return(["one", "two", "tree"])
+    breadcrumb_path.should include(%Q{<ul class="path_breadcrumbs">})
+    breadcrumb_path.should include("<li> / ")
   end
   
 end