@@ -322,6 +322,42 @@ sub id_by_path {

   return $id;

 }

+sub root_ns {

+  my ($self, $root) = @_;

+

+  $root =~ s/^\///;

+  

+  return $root;

+}

+

+sub parse_object {

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

+  

+  # Parse id and path

+  my $refs = $self->references($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 = shift;

   my $project = shift;

@@ -53,8 +53,7 @@

             </td>

           % } else {

             <td>

-              <a class="list ubar" href="<%= url_for('blob', project => $project_ns,

-                  id_file => "$id/$file") %>">

+              <a class="list ubar" href="<%= url_for("/$user/$project/blob/$id/$file") %>">

                 <%= $file %>

               </a>

             </td>

@@ -10,12 +10,12 @@

   my $rep = "/$rep_ns";

   my $object = param('object');

-  # Revision and blob

-  my ($rev, $blob) = $api->parse_id_path($rep, $object);

-

   # Git

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

+  # Revision and blob

+  my ($rev, $blob) = $git->parse_object($rep, $object);

+

   # Commit log

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

@@ -185,7 +185,7 @@

             % if (defined $blob) {

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

             % }

-            src="<%= url_for('blob_plain', project => $rep_ns, id_file => "$rev/$blob") %>"

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

           />

         % } else {

           % my $nr = 1;

@@ -1,5 +1,8 @@

 <%

   use Gitprep::API;

+

+  # API

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

   # Default revision

   my $rev = 'master';

@@ -8,9 +11,6 @@

   my $user = param('user');

   my $project = param('project');

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

-

-  # API

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

   # Parameters

   my $root_ns = $api->root_ns(config->{root});

@@ -20,11 +20,11 @@

   my $home_ns = $api->dirname($rep_ns);

   my $home = "/$home_ns";

-  # Id and directory

-  my ($id, $dir) = $api->parse_id_path($rep, $object);

-

   # Git

   my $git = app->git;

+

+  # Id and directory

+  my ($id, $dir) = $git->parse_object($rep, $object);

   # Tree id

   my $tid;

@@ -11,14 +11,14 @@

   my $rep = "/$rep_ns";

   my $home_ns = $api->dirname($rep_ns);

   my $home = "/$home_ns";

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

-

-  # Id and file

-  my ($id, $file) = $api->parse_id_path($rep, $id_file);

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

   # Git

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

+  # Id and file

+  my ($id, $file) = $git->parse_object($rep, $object);

+

   # Commit

   my $commit_log = $git->latest_commit_log($rep, $id, $file);

@@ -12,48 +12,44 @@

   my $rep_ns = "$root_ns/$user/$project.git";

   my $rep = "/$rep_ns";

-  # Id and directory

-  my ($id, $dir) = $api->parse_id_path($rep, $object);

-

   # Git

   my $git = app->git;

+

+  # Id and directory

+  my ($rev, $dir) = $git->parse_object($rep, $object);

   # Tree id

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

   my $tid;

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

-  unless (defined $tid) {

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

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

-    }

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

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

+    $tid = $git->id_by_path($rep, $rev, $dir, 'tree');

   }

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

   $self->render_not_found unless defined $tid;

   # Commit log

-  my $latest_commit_log = $git->latest_commit_log($rep, $id);

+  my $latest_commit_log = $git->latest_commit_log($rep, $rev);

   # Tree

-  my $trees = $api->trees($rep, $tid, $id, $dir);

+  my $trees = $api->trees($rep, $tid, $rev, $dir);

   # Repository description

   my $desc = $git->project_description($rep);

   # Commits number

-  my $commits_number = $git->commits_number($rep, $id);

+  my $commits_number = $git->commits_number($rep, $rev);

   # README

-  my $readme = $git->blob_plain($rep, $id, 'README');

+  my $readme = $git->blob_plain($rep, $rev, 'README');

-  # Global variable

+  # Variable for included templates

   stash(

-    user => $user,

-    id => $id,

-    rev => $id,

+    rev => $rev,

     commit => $commit,

     latest_commit_log => $latest_commit_log,

     trees => $trees,

     dir => $dir,

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

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

   );

 %>