@@ -116,7 +116,15 @@ sub startup {

   # Helper

   $self->helper(gitprep_api => sub { Gitprep::API->new(shift) });

-

+  $self->helper(finish_rendering => sub {

+    my $self = shift;

+    

+    $self->stash->{'mojo.routed'} = 1;

+    $self->rendered;

+    

+    return $self;

+  });

+  

   # Routes

   my $r = $self->routes;

@@ -179,7 +187,7 @@ sub startup {

       $r->get('/commits/#rev/(*blob)')->name('commits');

       # Branches

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

+      $r->any('/branches')->name('branches');

       # Tags

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

@@ -87,21 +87,30 @@ sub logined_admin {

 }

 sub logined {

-  my $self = shift;

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

   my $c = $self->cntl;

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

-  my $user = $c->session('user');

+  my $current_user = $c->session('user');

   my $password = $c->session('password');

   return unless defined $password;

   my $correct_password

-    = $dbi->model('user')->select('password', id => $user)->value;

+    = $dbi->model('user')->select('password', id => $current_user)->value;

   return unless defined $correct_password;

-  return $password eq $correct_password;

+  my $logined;

+  

+  if (defined $user) {

+    $logined = $user eq $current_user && $password eq $correct_password;

+  }

+  else {

+    $logined = $password eq $correct_password

+  }

+  

+  return $logined;

 }

 sub users {

@@ -172,21 +172,6 @@ sub blob_plain {

   return $content;

 }

-sub blob_raw {

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

-  

-  # Get blob raw

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

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

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

-  local $/;

-  my $blob_raw = scalar <$fh>;

-

-  close $fh or croak 'Reading git-shortlog failed';

-  

-  return $blob_raw;

-}

-

 sub blob_mimetype {

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

@@ -233,6 +218,43 @@ sub blob_contenttype {

   return $type;

 }

+sub blob_mode {

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

+  

+  # Mode

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

+  my @cmd = $self->cmd(

+    $user,

+    $project,

+    'ls-tree',

+    $rev,

+    '--',

+    $file

+  );

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

+    or croak 'Open git-ls-tree failed';

+  my $line = $self->_dec(scalar <$fh>);

+  close $fh or return;

+  my ($mode) = ($line || '') =~ m/^([0-9]+) /;

+  

+  return $mode;

+}

+

+sub blob_raw {

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

+  

+  # Get blob raw

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

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

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

+  local $/;

+  my $blob_raw = scalar <$fh>;

+

+  close $fh or croak 'Reading git-shortlog failed';

+  

+  return $blob_raw;

+}

+

 sub blob_size_kb {

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

@@ -341,6 +363,28 @@ sub commits_number {

   return $commits_num;

 }

+sub delete_branch {

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

+  

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

+  my $exists;

+  for my $b (@$branches) {

+    if ($branch eq $b->{name}) {

+      $exists = 1;

+      next;

+    }

+  }

+  

+  if ($exists) {

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

+    system(@cmd) == 0

+      or croak "Branch deleting failed. Can't delete branch $branch";

+  }

+  else {

+    croak "Branch deleteting failed.. branchg $branch is not exists";

+  }

+}

+

 sub description {

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

@@ -362,77 +406,6 @@ sub description {

   }

 }

-sub blob_mode {

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

-  

-  # Mode

-  $file =~ s#/+$##;

-  my @cmd = $self->cmd(

-    $user,

-    $project,

-    'ls-tree',

-    $rev,

-    '--',

-    $file

-  );

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

-    or croak 'Open git-ls-tree failed';

-  my $line = $self->_dec(scalar <$fh>);

-  close $fh or return;

-  my ($mode) = ($line || '') =~ m/^([0-9]+) /;

-  

-  return $mode;

-}

-

-sub file_type {

-  my ($self, $mode) = @_;

-  

-  # File type

-  if ($mode !~ m/^[0-7]+$/) { return $mode }

-  else { $mode = oct $mode }

-  if ($self->_s_isgitlink($mode)) { return 'submodule' }

-  elsif (S_ISDIR($mode & S_IFMT)) { return 'directory' }

-  elsif (S_ISLNK($mode)) { return 'symlink' }

-  elsif (S_ISREG($mode)) { return 'file' }

-  else { return 'unknown' }

-  

-  return

-}

-

-sub file_type_long {

-  my ($self, $mode) = @_;

-  

-  # File type

-  if ($mode !~ m/^[0-7]+$/) { return $mode }

-  else { $mode = oct $mode }

-  if ($self->_s_isgitlink($mode)) { return 'submodule' }

-  elsif (S_ISDIR($mode & S_IFMT)) { return 'directory' }

-  elsif (S_ISLNK($mode)) { return 'symlink' }

-  elsif (S_ISREG($mode)) {

-    if ($mode & S_IXUSR) { return 'executable file' }

-    else { return 'file' }

-  }

-  else { return 'unknown' }

-  

-  return;

-}

-

-sub fill_from_file_info {

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

-  

-  # Fill file info

-  $diff->{from_file} = [];

-  $diff->{from_file}[$diff->{nparents} - 1] = undef;

-  for (my $i = 0; $i < $diff->{nparents}; $i++) {

-    if ($diff->{status}[$i] eq 'R' || $diff->{status}[$i] eq 'C') {

-      $diff->{from_file}[$i] =

-        $self->path_by_id($user, $project, $parents->[$i], $diff->{from_id}[$i]);

-    }

-  }

-

-  return $diff;

-}

-

 sub difftree {

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

@@ -504,6 +477,55 @@ sub difftree {

   return $diffs;

 }

+sub file_type {

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

+  

+  # File type

+  if ($mode !~ m/^[0-7]+$/) { return $mode }

+  else { $mode = oct $mode }

+  if ($self->_s_isgitlink($mode)) { return 'submodule' }

+  elsif (S_ISDIR($mode & S_IFMT)) { return 'directory' }

+  elsif (S_ISLNK($mode)) { return 'symlink' }

+  elsif (S_ISREG($mode)) { return 'file' }

+  else { return 'unknown' }

+  

+  return

+}

+

+sub file_type_long {

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

+  

+  # File type

+  if ($mode !~ m/^[0-7]+$/) { return $mode }

+  else { $mode = oct $mode }

+  if ($self->_s_isgitlink($mode)) { return 'submodule' }

+  elsif (S_ISDIR($mode & S_IFMT)) { return 'directory' }

+  elsif (S_ISLNK($mode)) { return 'symlink' }

+  elsif (S_ISREG($mode)) {

+    if ($mode & S_IXUSR) { return 'executable file' }

+    else { return 'file' }

+  }

+  else { return 'unknown' }

+  

+  return;

+}

+

+sub fill_from_file_info {

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

+  

+  # Fill file info

+  $diff->{from_file} = [];

+  $diff->{from_file}[$diff->{nparents} - 1] = undef;

+  for (my $i = 0; $i < $diff->{nparents}; $i++) {

+    if ($diff->{status}[$i] eq 'R' || $diff->{status}[$i] eq 'C') {

+      $diff->{from_file}[$i] =

+        $self->path_by_id($user, $project, $parents->[$i], $diff->{from_id}[$i]);

+    }

+  }

+

+  return $diff;

+}

+

 sub branches {

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

@@ -68,7 +68,7 @@

     % }

     % if ($errors) {

-      <div class="alert">

+      <div class="alert alert-error">

         <button type="button" class="close" data-dismiss="alert">&times;</button>

         % for my $error (@$errors) {

           <p><%= $error %></p>

@@ -7,6 +7,10 @@

   my $errors;

   if ($op eq 'delete') {

+    unless ($api->logined) {

+      return $self->render_exception;

+    }

+

     # Validation

     my $params = $api->params;

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

@@ -1,8 +0,0 @@

-    <%

-      use Encode 'encode';

-      

-      $self->res->headers->content_type('text/plain;charset=UTF-8');

-      $self->res->body(encode('UTF-8', 'あ'));

-      $self->rendered;

-      return;

-    %>

@@ -5,20 +5,86 @@

   # Parameters

   my $user = param('user');

   my $project = param('project');

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

   # Git

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

-  

+

   # Default branch

   my $default_branch = {};

-  $default_branch->{name} = app->manager->default_branch($user, $project);

-  $default_branch->{commit} = $git->get_commit($user, $project, $default_branch->{name});

-  # No merged branches

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

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

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

-  my $merged_branches_count = $branches_count - $no_merged_branches_count - 1;

+  # Branch

+  my $branches;

+  my $branches_count;

+  my $no_merged_branches_count;

+  my $merged_branches_count;

+  

+  # Delete

+  my $errors;

+  if ($op eq 'delete') {

+

+    # Validation

+    my $params = $api->params;

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

+    my $rule = [

+      user => [

+        ['not_blank' => 'User name is empty.']

+      ],

+      project => [

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

+      ],

+      branch => [

+        ['not_blank' => 'Branch name is empty']

+      ]

+    ];

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

+

+    if ($vresult->is_ok) {

+      

+      # Valid parameters

+      my $params = $vresult->data;

+      my $user = $params->{user};

+      my $project = $params->{project};

+      my $branch = $params->{branch};

+      

+      # Delete branch

+      if ($api->logined($user)) {

+      

+        # Delete user

+        eval { $git->delete_branch($user, $project, $branch) };

+        if ($@) {

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

+          $errors = ['Internal Error'];

+        }

+        else {

+          $self->flash(branch_deleted => 1);

+          $self->flash(branch => $branch);

+          $self->redirect_to;

+          $self->finish_rendering;

+          return;

+        }

+      }

+      # Forbidden

+      else {

+        $self->res->code('403');

+        $self->finish_rendering;

+        return;

+      }

+    }

+    else { $errors = $vresult->messages }

+  }

+  # List

+  else {

+    # Default branch

+    $default_branch->{name} = app->manager->default_branch($user, $project);

+    $default_branch->{commit} = $git->get_commit($user, $project, $default_branch->{name});

+    

+    # No merged branches

+    $branches  = $git->branches($user, $project);

+    $branches_count = $git->branches_count($user, $project);

+    $no_merged_branches_count = $git->no_merged_branches_count($user, $project);

+    $merged_branches_count = $branches_count - $no_merged_branches_count - 1;

+  }

 %>

 % layout 'common';

@@ -45,12 +111,32 @@

         }

         display_no_merged = !display_no_merged;

       });

+      

+      // Click delete button

+      $('.delete-branch').on('click', function () {

+        if (window.confirm('Are you sure you want to remove this branch?')) {

+          return true;

+        }

+        else {

+          return false;

+        }

+      });

     });

   % end

   %= include '/include/header';

-  <div class="container">

+  <div class="container" style="padding-bottom:30px">

+

+    % if ($errors) {

+      <div class="alert alert-error">

+        <button type="button" class="close" data-dismiss="alert">&times;</button>

+        % for my $error (@$errors) {

+          <p><%= $error %></p>

+        % }

+      </div>

+    % }

+    

     %= include '/include/project_header';

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

@@ -113,6 +199,12 @@

             </div>

           </div>

           <div class="text-right" style="padding-top:5px">

+            % if ($api->logined($user)) {

+              <form action="<%= url_for->query(op => 'delete') %>" method="post" style="display:inline-block">

+                <input type="submit" class="btn delete-branch" style="color:#900;" value="Delete branch">

+                %= hidden_field branch => $bname;

+              </form>

+            % }

             <a class="btn" href="<%= url_for("/$user/$project/compare/$default_branch->{name}...$bname") %>">

               Compare

             </a>

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

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

   # Response

-  $self->res->code(200);

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

   $self->res->headers->content_type($type);

-  $self->res->body($blob_raw);

-  $self->rendered;

-  $self->stash->{'mojo.routed'} = 1;

+  $self->render(data => $blob_raw);

+  $self->finish_rendering;

   return;

-%>

+%>