@@ -156,8 +156,10 @@ sub startup {

     # Custom routes

     {

+      my $id_re = qr/[a-zA-Z0-9_-]+/;

+      

       # User

-      my $r = $r->route('/:user');

+      my $r = $r->route('/:user', user => $id_re);

       {

         # Home

         $r->get('/' => template '/user');

@@ -168,7 +170,7 @@ sub startup {

       # Project

       {

-        my $r = $r->route('/:project');

+        my $r = $r->route('/:project', project => $id_re);

         # Home

         $r->get('/' => template '/project');

@@ -52,16 +52,16 @@ sub branch_status {

   return $status;

 }

-sub branches {

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

+sub no_merged_branch_h {

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

   # No merged branches

   my $no_merged_branches_h = {};

   {

-    my @cmd = $self->cmd($user, $project, 'branch');

-    push @cmd, , '--no-merged';

-    open my $fh, '-|', @cmd or return;

+    my $rep = $self->rep($user, $project);

+    my @cmd = $self->cmd($user, $project, 'branch', '--no-merged');

+    open my $fh, '-|', @cmd or return;

     while (my $branch_name = $self->_dec(scalar <$fh>)) {

       $branch_name =~ s/^\*//;

       $branch_name =~ s/^\s*//;

@@ -70,12 +70,24 @@ sub branches {

     }

   }

+  return $no_merged_branches_h;

+}

+

+sub branches {

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

+  

   # Branches

   my @cmd = $self->cmd($user, $project, 'branch');

   open my $fh, '-|', @cmd or return;

   my $branches = [];

+  my $start;

+  my $no_merged_branches_h;

   while (my $branch_name = $self->_dec(scalar <$fh>)) {

+    # No merged branch

+    $no_merged_branches_h = $self->no_merged_branch_h($user, $project)

+      unless $start++;

+    

     # Branch

     my $branch = $self->branch($user, $project, $branch_name);

     $branch->{no_merged} = 1 if $no_merged_branches_h->{$branch_name};

@@ -555,6 +555,15 @@ sub exists_project {

   return $row ? 1 : 0;

 }

+sub exists_user {

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

+  

+  # Exists project

+  my $row = $self->app->dbi->model('user')->select(id => $user)->one;

+  

+  return $row ? 1 : 0;

+}

+

 sub _exists_rep {

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

@@ -587,7 +596,7 @@ sub _rename_project {

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

   # Check arguments

-  croak "Invalid parameters"

+  croak "Invalid parameters(_rename_project)"

     unless defined $user && defined $project && defined $renamed_project;

   # Rename project

@@ -11,6 +11,12 @@

   my $user = param('user');

   my $project = param('project');

   my $rev = app->manager->default_branch($user, $project);

+  

+  unless (app->manager->exists_project($user, $project)) {

+    $self->render_not_found;

+    $self->finish_rendering;

+    return;

+  }

   # Repository description

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

@@ -22,14 +22,9 @@

     # Validation

     my $params = $api->params;

     my $rule = [

-      user => [

-        'user_name'

-      ],

-      project => [

-        'project_name'

-      ],

       'to-project' => [

-        'project_name'

+        ['not_blank' => 'Repository name is empty.'],

+        ['project_name' => 'Repository name contains invalid charactor.']

       ]

     ];

     my $vresult = app->validator->validate($params, $rule);

@@ -37,8 +32,6 @@

     if ($vresult->is_ok) {

       # Valida parameters

       my $data = $vresult->data;

-      my $user = $data->{user};

-      my $project = $data->{project};

       my $to_project = $data->{'to-project'};

       # Rename

@@ -48,6 +41,7 @@

       else {

         eval { app->manager->rename_project($user, $project, $to_project) };

         if ($@) {

+          app->log->error($@);

           $errors = ['Internal Error'];

         }

         else {

@@ -10,6 +10,11 @@

   my $user = param('user');

   # Projects

+  unless (app->manager->exists_user($user)) {

+    $self->render_not_found;

+    $self->finish_rendering;

+    return;

+  }

   my $projects = app->manager->projects($user);

   my $reps = [];

   for my $project (@$projects) {

@@ -309,15 +309,31 @@ note 'User Account Settings';

     $t->content_like(qr/first commit/);

     $t->content_like(qr/t2\.git/);

     $t->content_like(qr/README/);

-    

+

     # Settings page(don't has README)

     $t->get_ok('/kimoto1/t1/settings');

     $t->content_like(qr/Settings/);

-    

+

     # Settings page(has README)

     $t->get_ok('/kimoto1/t2/settings');

     $t->content_like(qr/Settings/);

   }

   note 'Project settings';

+  {

+    note 'Rename project';

+    {

+      # Empty

+      $t->post_ok('/kimoto1/t2/settings?op=rename-project', form => {});

+      $t->content_like(qr/Repository name is empty/);

+      

+      # Invalid character

+      $t->post_ok('/kimoto1/t2/settings?op=rename-project', form => {'to-project' => '&'});

+      $t->content_like(qr/Repository name contains invalid charactor/);

+      

+      # Rename project

+      $t->post_ok('/kimoto1/t2/settings?op=rename-project', form => {'to-project' => 't3'});

+      $t->content_like(qr/Repository name is renamed to t3/);

+    }

+  }

 }