@@ -183,16 +183,16 @@ sub startup {

       $r->get('/tags')->name('tags');

       # Tree

-      $r->get('/tree/(*object)')->name('tree');

+      $r->get('/tree/:rev/(*dir)', {dir => undef})->name('tree');

       # Blob

-      $r->get('/blob/(*object)')->name('blob');

+      $r->get('/blob/:rev/(*file)', {file => undef})->name('blob');

       # Blob diff

       $r->get('/blobdiff/(#diff)/(*file)')->name('blobdiff');

       # Raw

-      $r->get('/raw/(*object)')->name('raw');

+      $r->get('/raw/:rev/(*file)', {file => undef})->name('raw');

       # Archive

       $r->get('/archive/(#rev).tar.gz')->name('archive')->to(archive_type => 'tar');

@@ -36,7 +36,7 @@ sub dec {

 }

 sub authors {

-  my ($self, $user, $project, $ref, $file) = @_;

+  my ($self, $user, $project, $rev, $file) = @_;

   # Command "git log FILE"

   my @cmd = $self->cmd(

@@ -44,7 +44,7 @@ sub authors {

     $project,

     'log',

     '--format=%an',

-    $ref,

+    $rev,

     '--',

     $file

   );

@@ -132,10 +132,10 @@ sub blobdiffs {

 }

 sub blob_plain {

-  my ($self, $user, $project, $ref, $path) = @_;

+  my ($self, $user, $project, $rev, $path) = @_;

   # Get blob

-  my @cmd = $self->cmd($user, $project, 'cat-file', 'blob', "$ref:$path");

+  my @cmd = $self->cmd($user, $project, 'cat-file', 'blob', "$rev:$path");

   open my $fh, "-|", @cmd

     or croak 500, "Open git-cat-file failed";

   local $/;

@@ -466,7 +466,7 @@ sub branches {

 }

 sub id_by_path {

-  my ($self, $user, $project, $commit_id, $path, $type) = @_;

+  my ($self, $user, $project, $rev, $path, $type) = @_;

   # Get blob id or tree id (command "git ls-tree")

   $path =~ s#/+$##;

@@ -474,7 +474,7 @@ sub id_by_path {

     $user,

     $project,

     'ls-tree',

-    $commit_id,

+    $rev,

     '--',

     $path

   );

@@ -531,34 +531,6 @@ sub root_ns {

   return $root;

 }

-sub parse_object {

-  my ($self, $user, $project, $id_path) = @_;

-  

-  # Parse id and path

-  my $refs = $self->references($user, $project);

-  my $id;

-  my $path;

-  for my $rs (values %$refs) {

-    for my $ref (@$rs) {

-      $ref =~ s#^heads/##;

-      $ref =~ s#^tags/##;

-      if ($id_path =~ s#^\Q$ref(/|$)##) {

-        $id = $ref;

-        $path = $id_path;

-        last;

-      }      

-    }

-  }

-  unless (defined $id) {

-    if ($id_path =~ s#(^[^/]+)(/|$)##) {

-      $id = $1;

-      $path = $id_path;

-    }

-  }

-  

-  return [$id, $path];

-}

-

 sub path_by_id {

   my ($self, $user, $project, $base, $hash) = @_;

@@ -791,7 +763,7 @@ sub id_set_multi {

 }

 sub latest_commit_log {

-  my ($self, $user, $project, $ref, $file) = @_;

+  my ($self, $user, $project, $rev, $file) = @_;

   my $commit_log = {};

   $file = '' unless defined $file;

@@ -804,7 +776,7 @@ sub latest_commit_log {

     '-n',

     '1',

     '--pretty=format:%H - %an - %ar : %s', 

-    $ref,

+    $rev,

     '--',

     $file

   );

@@ -1313,9 +1285,18 @@ sub timestamp {

 }

 sub trees {

-  my ($self, $user, $project, $tid, $ref, $dir) = @_;

+  my ($self, $user, $project, $rev, $dir) = @_;

+  $dir = '' unless defined $dir;

   # Get tree

+  my $tid;

+  if (defined $dir && $dir ne '') {

+    $tid = $self->id_by_path($user, $project, $rev, $dir, 'tree');

+  }

+  else {

+    my $commit = $self->parse_commit($user, $project, $rev);

+    $tid = $commit->{tree};

+  }

   my @entries = ();

   my $show_sizes = 0;

   my @cmd = $self->cmd(

@@ -1343,7 +1324,7 @@ sub trees {

     # Commit log

     my $name = defined $dir && $dir ne '' ? "$dir/$tree->{name}" : $tree->{name};

-    my $commit_log = $self->latest_commit_log($user, $project, $ref, $name);

+    my $commit_log = $self->latest_commit_log($user, $project, $rev, $name);

     $tree = {%$tree, %$commit_log};

     push @$trees, $tree;

@@ -1,29 +1,27 @@

 <%

   # API

-  my $api = Gitprep::API->new($self);

+  my $api = gitprep_api;

   # Parameters

   my $user = param('user');

   my $project = param('project');

-  my $object = param('object');

+  my $rev = param('rev');

+  my $file = param('file');

   # Git

   my $git = $self->app->git;

-  

-  # Revision and blob

-  my ($rev, $blob) = @{$git->parse_object($user, $project, $object)};

   # Commit log

-  my $commit_log = $git->latest_commit_log($user, $project, $rev, $blob);

+  my $commit_log = $git->latest_commit_log($user, $project, $rev, $file);

   # Commit

   my $commit = $git->parse_commit($user, $project, $rev);

   # Authors

-  my $authors = $git->authors($user, $project, $rev, $blob);

+  my $authors = $git->authors($user, $project, $rev, $file);

   # Blob content

-  my $bid = $git->id_by_path($user, $project, $rev, $blob, 'blob')

+  my $bid = $git->id_by_path($user, $project, $rev, $file, 'blob')

     or $api->croak('Cannot find file');

   my @cmd = $git->cmd(

     $user,

@@ -33,11 +31,11 @@

     $bid

   );

   open my $fh, '-|', @cmd

-    or $api->croak(qq/Couldn't cat "$blob", "$bid"/);

+    or $api->croak(qq/Couldn't cat "$file", "$bid"/);

   # Blob info

-  my $blob_size = $git->blob_size_kb($user, $project, $rev, $blob);

-  my $mimetype = $git->blob_mimetype($fh, $blob);

+  my $file_size = $git->blob_size_kb($user, $project, $rev, $file);

+  my $mimetype = $git->blob_mimetype($fh, $file);

   # Parse line

   my $lines =[];

@@ -58,7 +56,7 @@

   <div class="container">

     %= include '/include/project_header';

     %= include '/include/code_menu', display => 'files';

-    %= include '/include/page_path', type => 'blob', Path => $blob;

+    %= include '/include/page_path', type => 'blob', Path => $file;

     <div class="border-gray" style="margin-bottom:20px">

       <div class="bk-blue-light padding5">

@@ -80,20 +78,20 @@

           <span style="color:gray">|</span>

           <%= @$lines %> lines

           <span style="color:gray">|</span>

-          <%= $blob_size %>kb

+          <%= $file_size %>kb

         </div>

         <div class="span4 offset1-mini text-right">

-          <a class="btn" href="<%= url_for("/$user/$project/raw/$rev/$blob") %>">Raw</a><a class="btn" href="<%= url_for("/$user/$project/commits/$rev/$blob") %>">History</a>

+          <a class="btn" href="<%= url_for("/$user/$project/raw/$rev/$file") %>">Raw</a><a class="btn" href="<%= url_for("/$user/$project/commits/$rev/$file") %>">History</a>

         </div>

       </div>

     </div>

     % if ($mimetype =~ m#^image/#) {

       <div>

         <img type="<%= $mimetype %>

-          % if (defined $blob) {

-            alt="<%= $blob %>" title="<%= $blob %>"

+          % if (defined $file) {

+            alt="<%= $file %>" title="<%= $file %>"

           % }

-          src="<%= url_for("/$user/$project/raw/$rev/$blob") %>"

+          src="<%= url_for("/$user/$project/raw/$rev/$file") %>"

         />

       </div>

     % } else {

@@ -31,7 +31,7 @@

   # End commit

   my $end_commit = $git->parse_commit($user, $project, $rev2)

-    or $api->croak('Unknown commit object');

+    or $api->croak('Unknown commit revision');

   # Diff tree

   my $difftrees = $git->difftree(

@@ -1,3 +1,7 @@

+<%

+  my $dir = stash('dir');

+%>

+

 %= stylesheet begin

   /* Source tree */

   .tree {

@@ -96,9 +100,9 @@

   <div class="padding5 border-bottom-gray">

     <div class="row">

       <div class="span8">

-        <b><%= $latest_commit_log->{author} %></b>

+        <b><%= $commit->{author} %></b>

         <span class="muted">

-          authored <%= $latest_commit_log->{author_date} %>

+          authored <%= $commit->{author_date} %>

         </span>

       </div>

       <div class="span3 offset1-mini text-right">

@@ -19,23 +19,13 @@

   my $commits_number;

   my $readme;

   if ($git->branch_exists($user, $project)) {

-    # Id and directory

-    my ($id, $dir) = @{$git->parse_object($user, $project, "$rev/")};

+    # Directory

-    # Tree id

-    my $tid;

-    my $commit = $git->parse_commit($user, $project, $id);

-    if (defined $dir && $dir ne '') {

-      $tid = $git->id_by_path($user, $project, $id, $dir, 'tree');

-    }

-    else { $tid = $commit->{tree} }

-    $self->render_not_found unless defined $tid;

-

-    # Commit log

-    my $latest_commit_log = $git->latest_commit_log($user, $project, $rev);

+    # Commit

+    my $commit = $git->parse_commit($user, $project, $rev);

     # Tree

-    my $trees = $git->trees($user, $project, $tid, $rev);

+    my $trees = $git->trees($user, $project, $rev);

     # Commits number

     $commits_number = $git->commits_number($user, $project, $rev);

@@ -47,9 +37,7 @@

     # Variable for included template

     stash(

       commit => $commit,

-      latest_commit_log => $latest_commit_log,

       trees => $trees,

-      dir => $dir,

       rev => $rev,

       title => "$user/$project"

     );

@@ -5,19 +5,17 @@

   # Parameters

   my $user = param('user');

   my $project = param('project');

-  my $object = param('object');

+  my $rev = param('rev');

+  my $file = param('file');

   # Git

   my $git = $self->app->git;

-  

-  # Id and file

-  my ($rev, $blob) = @{$git->parse_object($user, $project, $object)};

   # Commit

-  my $commit_log = $git->latest_commit_log($user, $project, $rev, $blob);

+  my $commit_log = $git->latest_commit_log($user, $project, $rev, $file);

   # Blob content

-  my $bid = $git->id_by_path($user, $project, $rev, $blob, 'blob')

+  my $bid = $git->id_by_path($user, $project, $rev, $file, 'blob')

     or $api->croak('Cannot find file');

   my @cmd = $git->cmd(

     $user,

@@ -27,7 +25,7 @@

     $bid

   );

   open my $fh, '-|', @cmd

-    or $api->croak(qq/Couldn't cat "$blob", "$bid"/);

+    or $api->croak(qq/Couldn't cat "$file", "$bid"/);

   # Blob plain

   my $commit;

@@ -35,7 +33,7 @@

   my $lines =[];

   # Content type

-  my $type = $git->blob_contenttype($fh, $blob);

+  my $type = $git->blob_contenttype($fh, $file);

   # Convert text/* content type to text/plain

   if ($self->config('prevent_xss') &&

@@ -48,16 +46,16 @@

   }

   # File name

-  my $blob_name = $rev;

-  if (defined $blob) { $blob_name = $blob }

-  elsif ($type =~ m/^text\//) { $blob_name .= '.txt' }

+  my $file_name = $rev;

+  if (defined $file) { $file_name = $file }

+  elsif ($type =~ m/^text\//) { $file_name .= '.txt' }

   # Content

   my $content = do { local $/; <$fh> };

   my $sandbox = $self->config('prevent_xss') &&

     $type !~ m#^(?:text/[a-z]+|image/(?:gif|png|jpeg))(?:[ ;]|$)#;

   my $content_disposition = $sandbox ? 'attachment' : 'inline';

-  $content_disposition .= "; filename=$blob_name";

+  $content_disposition .= "; filename=$file_name";

   # Render

   $self->res->headers->content_disposition($content_disposition);

@@ -5,35 +5,19 @@

   # Parameters

   my $user = param('user');

   my $project = param('project');

-  my $object ||= param('object') || 'master';

+  my $rev = param('rev');

+  my $dir = param('dir');

   # Git

   my $git = app->git;

-

-  # Id and directory

-  my ($rev, $dir) = @{$git->parse_object($user, $project, $object)};

   # Tree id

   my $commit = $git->parse_commit($user, $project, $rev);

-  my $tid;

   my $top;

-  if (defined $dir && $dir ne '') {

-    $tid = $git->id_by_path($user, $project, $rev, $dir, 'tree');

-  }

-  else {

-    $top = 1;

-    $tid = $commit->{tree};

-  }

-  $self->render_not_found unless defined $tid;

-  

-  # Commit log

-  my $latest_commit_log = $git->latest_commit_log($user, $project, $rev);

+  $top = 1 unless defined $dir && $dir ne '';

   # Tree

-  my $trees = $git->trees($user, $project, $tid, $rev, $dir);

-  

-  # Repository description

-  my $desc = $git->description($user, $project);

+  my $trees = $git->trees($user, $project, $rev, $dir);

   # Commits number

   my $commits_number = $git->commits_number($user, $project, $rev);

@@ -47,7 +31,6 @@

   stash(

     rev => $rev,

     commit => $commit,

-    latest_commit_log => $latest_commit_log,

     trees => $trees,

     dir => $dir,

     title => "$project/$dir at $rev - $user/$project"