@@ -11,10 +11,13 @@ use Encode qw/encode decode/;

 use Mojo::JSON;

 use Gitprep::API;

 use Carp 'croak';

+use Gitprep::RepManager;

+use Scalar::Util 'weaken';

 has 'git';

 has 'dbi';

 has 'validator';

+has 'manager';

 sub startup {

   my $self = shift;

@@ -144,6 +147,11 @@ EOS

       );

     };

   }

+  

+  # Repository Manager

+  my $manager = Gitprep::RepManager->new(app => $self);

+  weaken $manager->{app};

+  $self->manager($manager);

   # Home

   $r->get('/')->to('#home');

@@ -102,27 +102,5 @@ sub delete_project {

   $dbi->model('project')->delete(id => [$user, $project]);

 }

-sub exists_project {

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

-

-  my $c = $self->cntl;

-  my $dbi = $c->app->dbi;

-  my $row = $dbi->model('project')->select(id => [$user, $project])->one;

-  

-  return $row ? 1 : 0;

-}

-

-sub rename_project {

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

-  

-  my $c = $self->cntl;

-  my $dbi = $c->app->dbi;

-  

-  croak "Invalid parameters"

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

-  

-  $dbi->model('project')->update({name => $renamed_project}, id => [$user, $project]);

-}

-

 1;

@@ -735,26 +735,6 @@ sub references {

   return \%refs;

 }

-sub rename_project {

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

-  

-  croak "Invalid user name or project"

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

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

-  my $renamed_rep = $self->rep($user, $renamed_project);

-  

-  move($rep, $renamed_rep)

-    or croak "Can't move $rep to $renamed_rep: $!";

-}

-

-sub exists_project {

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

-  

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

-  

-  return -e $rep;

-}

-

 sub rep {

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

@@ -1,29 +1,30 @@

 package Gitprep::RepManager;

 use Mojo::Base -base;

-has 'c';

+use Carp 'croak';

+use File::Copy 'move';

+

+has 'app';

 sub rename_project {

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

-  my $c = $self->c;

-  my $api = $c->gitprep_api($c);

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

-  my $dbi = $c->app->dbi;

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

+  my $dbi = $self->app->dbi;

   my $error = {};

-  if ($api->exists_project($user, $renamed_project)

-    || $git->exists_project($user, $renamed_project))

+  if ($self->_exists_project($user, $renamed_project)

+    || $self->_exists_rep($user, $renamed_project))

   {

     $error->{message} = 'Already exists';

     return $error;

   }

   else {

-      $dbi->connector->txn(sub {

-        $api->rename_project($user, $project, $renamed_project);

-        $git->rename_project($user, $project, $renamed_project);

-      });

+    $dbi->connector->txn(sub {

+      $self->_rename_project($user, $project, $renamed_project);

+      $self->_rename_rep($user, $project, $renamed_project);

+    });

     if ($@) {

       $error->{message} = 'Rename failed';

       return $error;

@@ -33,4 +34,44 @@ sub rename_project {

   return 1;

 }

+sub _exists_project {

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

+

+  my $dbi = $self->app->dbi;

+  my $row = $dbi->model('project')->select(id => [$user, $project])->one;

+  

+  return $row ? 1 : 0;

+}

+

+sub _exists_rep {

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

+  

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

+  

+  return -e $rep;

+}

+

+sub _rename_project {

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

+  

+  my $dbi = $self->app->dbi;

+  

+  croak "Invalid parameters"

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

+  

+  $dbi->model('project')->update({name => $renamed_project}, id => [$user, $project]);

+}

+

+sub _rename_rep {

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

+  

+  croak "Invalid user name or project"

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

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

+  my $renamed_rep = $self->app->git->rep($user, $renamed_project);

+  

+  move($rep, $renamed_rep)

+    or croak "Can't move $rep to $renamed_rep: $!";

+}

+

 1;

@@ -153,7 +153,7 @@

         <h3>README</h3>

         <pre><%= $readme %></pre>

       </div>

-    % } elsif ($state eq 'init') {

+    % } elsif ($state eq 'init' && $logined) {

       <div class="text-center" style="margin-bottom:10px">

         <b>Create a new repository on the command line</b>

@@ -180,6 +180,10 @@ git push -u origin master</pre>

       <pre style="margin-bottom:30px">

 git remote add origin <%= $ssh_url %>

 git push -u origin master</pre>

+    % } else {

+      <div class="well text-center muted" style="margin-bottom:30px">

+        <b>Repositry is not yet created.</b>

+      </div>

     % }

   </div>

@@ -1,6 +1,4 @@

 <%

-  use Gitprep::RepManager;

-

   my $api = gitprep_api;

   my $logined = $api->logined;

   my $user_is_valid = $logined && $user eq session('user_id');

@@ -36,7 +34,7 @@

       my $renamed_project = $data->{'renamed-project'};

       # Rename

-      my $manager = Gitprep::RepManager->new(c => $self);

+      my $manager = app->manager;

       my $error = $manager->rename_project($user, $project, $renamed_project);

       if (ref $error) {

         $self->render(json => {ok => 0, message => $error->{message}});