@@ -1,8 +1,7 @@

 1.4

   - fix markdown bugs (*em*, _em_)

   - default readme file is changed. README is changed to README.md

-  - add private repository and collaborator feature

-  - add project encoding support

+  - add private repository feature

 1.3

   - add README.md support

   - add submodule support

@@ -18,12 +18,14 @@ use Validator::Custom;

   eval {require Digest::SHA; import Digest::SHA qw(sha1 sha1_hex)};

 }

-our $VERSION = '1.04';

+our $VERSION = '1.0301';

 has 'dbi';

+has 'git';

 has 'manager';

 has 'validator';

-has 'git';

+

+use constant BUFFER_SIZE => 8192;

 sub startup {

   my $self = shift;

@@ -43,7 +45,7 @@ sub startup {

   $listen = [split /,/, $listen] unless ref $listen eq 'ARRAY';

   $conf->{hypnotoad}{listen} = $listen;

-  # Git settings

+  # Git

   my $git = Gitprep::Git->new;

   my $git_bin

     = $conf->{basic}{git_bin} ? $conf->{basic}{git_bin} : $git->search_bin;

@@ -55,20 +57,23 @@ sub startup {

     croak $error;

   }

   $git->bin($git_bin);

-

+  

+  # Repository Manager

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

+  weaken $manager->{app};

+  $self->manager($manager);

+  

   # Repository home

   my $rep_home = $ENV{GITPREP_REP_HOME} || $self->home->rel_file('data/rep');

+  $git->rep_home($rep_home);

   unless (-d $rep_home) {

     mkdir $rep_home

       or croak "Can't create directory $rep_home: $!";

   }

-  $git->rep_home($rep_home);

   $self->git($git);

-  # Repository Manager

-  my $manager = Gitprep::Manager->new(app => $self, git => $git);

-  weaken $manager->{app};

-  $self->manager($manager);

+  # Added public path

+  # push @{$self->static->paths}, $rep_home;

   # DBI

   my $db_file = $ENV{GITPREP_DB_FILE}

@@ -237,10 +242,10 @@ sub startup {

               # API

               my $api = $self->gitprep_api;

-              my $user = $self->param('user');

-              my $project = $self->param('project');

               # Private

+              my $user = $self->param('user');

+              my $project = $self->param('project');

               my $private = $self->app->manager->is_private_project($user, $project);

               if ($private) {

                 if ($api->can_access_private_project($user, $project)) {

@@ -42,26 +42,6 @@ sub check_user_and_password {

   return $is_valid;

 }

-sub git {

-  my $self = shift;

-

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

-  

-  my $user = $self->cntl->param('user');

-  my $project = $self->cntl->param('project');

-  

-  if (defined $user && defined $project){

-    # Project encoding

-    my $encoding = $self->app->dbi->model('project')->select(

-      'encoding',

-      id => [$user, $project]

-    )->value;

-    $git->encoding($encoding) if length $encoding;

-  }

-

-  return $git;

-}

-

 sub is_collaborator {

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

@@ -78,7 +58,6 @@ sub can_access_private_project {

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

   my $session_user = $self->cntl->session('user');

-  return unless $session_user;

   my $is_valid =

     ($user eq $session_user || $self->is_collaborator($user, $project))

@@ -87,15 +66,6 @@ sub can_access_private_project {

   return $is_valid;

 }

-sub manager {

-  my $self = shift;

-  

-  my $manager = $self->app->manager->clone;

-  $manager->git($self->git);

-  

-  return $manager;

-}

-

 sub new {

   my ($class, $cntl) = @_;

@@ -53,18 +53,6 @@ sub branch_status {

   return $status;

 }

-sub clone {

-  my $self = shift;

-  

-  my $clone = __PACKAGE__->new;

-  $clone->bin($self->bin);

-  $clone->encoding($self->encoding);

-  $clone->rep_home($self->rep_home);

-  $clone->text_exts([@{$self->text_exts}]);

-  

-  return $clone;

-}

-

 sub no_merged_branch_h {

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

@@ -559,7 +547,7 @@ sub description {

   else {

     # Read description

     return unless -f $file;

-    my $description = $self->_dec($self->_slurp($file) || '', 'UTF-8');

+    my $description = $self->_dec($self->_slurp($file) || '');

     return $description;

   }

 }

@@ -1669,9 +1657,9 @@ sub _chop_str {

 }

 sub _dec {

-  my ($self, $str, $encoding) = @_;

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

-  my $enc = $encoding || $self->encoding;

+  my $enc = $self->encoding;

   my $new_str;

   eval { $new_str = decode($enc, $str) };

@@ -1679,6 +1667,14 @@ sub _dec {

   return $@ ? $str : $new_str;

 }

+sub _enc {

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

+  

+  my $enc = $self->encoding;

+  

+  return encode($enc, $str);

+}

+

 sub _mode_str {

   my $self = shift;

   my $mode = oct shift;

@@ -8,7 +8,6 @@ use File::Path qw/mkpath rmtree/;

 use File::Temp ();

 has 'app';

-has 'git';

 sub admin_user {

   my $self = shift;

@@ -20,16 +19,6 @@ sub admin_user {

   return $admin_user;

 }

-sub clone {

-  my $self = shift;

-  

-  my $clone = __PACKAGE__->new;

-  $clone->app($self->app);

-  $clone->git($self->git);

-  

-  return $clone;

-}

-

 sub default_branch {

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

@@ -61,12 +50,8 @@ sub fork_project {

     $dbi->connector->txn(sub {

       # Original project id

-      my $project_info = $dbi->model('project')->select(

-        ['original_pid', 'private', 'encoding'],

-        id => [$original_user, $project]

-      )->one;

-      

-      my $original_pid = $project_info->{original_pid};

+      my $original_pid = $dbi->model('project')

+        ->select('original_pid', id => [$original_user, $project])->value;

       croak "Can't get original project id"

         unless defined $original_pid && $original_pid > 0;

@@ -78,9 +63,7 @@ sub fork_project {

           $project,

           {

             original_user => $original_user,

-            original_pid => $original_pid,

-            private => $project_info->{private},

-            encoding => $project_info->{encoding}

+            original_pid => $original_pid

           }

         );

       };

@@ -283,7 +266,7 @@ sub rename_project {

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

   # Rename project

-  my $git = $self->git;

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

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

   my $error;

   eval {

@@ -349,8 +332,7 @@ EOS

     "default_branch not null default 'master'",

     "original_user not null default ''",

     "original_pid integer not null default 0",

-    "private not null default 0",

-    "encoding not null default ''"

+    "private not null default 0"

   ];

   for my $column (@$project_columns) {

     eval { $dbi->execute("alter table project add column $column") };

@@ -440,7 +422,6 @@ sub _create_project {

       $dbi->model('number')->update({value => $number}, where => {key => 'original_pid'});

       $params->{original_pid} = $number;

     }

-    use Data::Dumper;

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

   });

 }

@@ -449,7 +430,7 @@ sub _create_rep {

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

   # Create repository directory

-  my $git = $self->git;

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

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

   mkdir $rep

     or croak "Can't create directory $rep: $!";

@@ -483,9 +464,9 @@ sub _create_rep {

       or croak "Can't move post-update";

     # Description

-    my $description = $opts->{description};

-    $description = '' unless defined $description;

     {

+      my $description = $opts->{description};

+      $description = '' unless defined $description;

       my $file = "$rep/description";

       open my $fh, '>', $file

         or croak "Can't open $file: $!";

@@ -512,8 +493,7 @@ sub _create_rep {

       my $file = "$temp_work/README.md";

       open my $readme_fh, '>', $file

         or croak "Can't create $file: $!";

-      print $readme_fh "# $project\n";

-      print $readme_fh "\n" . encode('UTF-8', $description) . "\n";

+      print $readme_fh "$project\n=====\n";

       close $readme_fh;

       my @git_add_cmd = $git->cmd_rep(

@@ -576,7 +556,7 @@ sub _create_user_dir {

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

   # Create user directory

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

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

   my $user_dir = "$rep_home/$user";

   mkpath $user_dir;

 }

@@ -594,7 +574,7 @@ sub _delete_user_dir {

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

   # Delete user directory

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

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

   my $user_dir = "$rep_home/$user";

   rmtree $user_dir;

 }

@@ -611,7 +591,7 @@ sub _delete_rep {

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

   # Delete repository

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

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

   croak "Can't remove repository. repository home is empty"

     if !defined $rep_home || $rep_home eq '';

   my $rep = "$rep_home/$user/$project.git";

@@ -643,7 +623,7 @@ sub _exists_rep {

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

   # Exists repository

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

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

   return -e $rep;

 }

@@ -652,7 +632,7 @@ sub _fork_rep {

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

   # Fork repository

-  my $git = $self->git;

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

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

   my $to_rep = $git->rep($to_user, $to_project);

   my @cmd = (

@@ -694,8 +674,8 @@ sub _rename_rep {

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

   # Rename repository

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

-  my $renamed_rep = $self->git->rep($user, $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: $!";

 }

@@ -2,7 +2,7 @@

   my $api = gitprep_api;

   # Git

-  my $git = $api->git;

+  my $git = app->git;

   # Branches

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

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

 <%

   # API

-  my $api = gitprep_api;

+  my $api = $self->gitprep_api;

   # Parameter

   my $user = param('user');

@@ -23,7 +23,7 @@

   }

   # Git

-  my $git = $api->git;

+  my $git = app->git;

   # Object type

   my $type = $git->object_type($user, $project, "$rev^{}");

@@ -39,7 +39,7 @@

       $params->{salt} = $salt;

       # Create user

-      eval { $api->manager->create_user($id, $params) };

+      eval { app->manager->create_user($id, $params) };

       if ($@) {

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

         $errors = ['Internal Error'];

@@ -23,7 +23,7 @@

       # Delete user

       my $count;

-      eval { $count = $api->manager->delete_user($user) };

+      eval { $count = app->manager->delete_user($user) };

       if ($@) {

         app->log->error("/_admin/users?op=delete: $@");

         $errors = ['Internal Error'];

@@ -41,7 +41,7 @@

     else { $errors = $vresult->messages }

   }

-  my $users = $api->manager->users;

+  my $users = app->manager->users;

 %>

 % layout 'common', title => 'Admin Users';

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

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

     # Git

-    my $git = $api->git;

+    my $git = app->git;

     if ($vresult->is_ok) {

       # Not logined

       unless ($api->logined) {

@@ -46,7 +46,7 @@

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

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

-      my $manager = $api->manager;

+      my $manager = app->manager;

       if ($manager->exists_project($user, $project)) {

         $errors = ['Repository already exists'];

       }

@@ -2,7 +2,7 @@

   # API

   my $api = gitprep_api;

-  my $admin_user = $api->manager->admin_user;

+  my $admin_user = app->manager->admin_user;

   if (defined $admin_user && $admin_user ne '') {

     $self->redirect_to('/');

     return;

@@ -15,7 +15,7 @@

   if ($op eq 'create') {

     # Check existence admin user

-    my $admin_user = $api->manager->admin_user;

+    my $admin_user = app->manager->admin_user;

     if (defined $admin_user) { $errors = ['Admin user already exists.'] }

     else {

       # Validation

@@ -1,8 +1,6 @@

 <%

-  my $api = gitprep_api;

-

   # Users

-  my $manager = $api->manager;

+  my $manager = app->manager;

   my $users = $manager->users;

   # Goto Start page

@@ -12,7 +12,7 @@

   my $logined_user = $api->logined($user);

   if ($reset_password_conf_on) {

-    my $admin_user = $api->manager->admin_user;

+    my $admin_user = app->manager->admin_user;

     $user = $admin_user ? $admin_user->{id} : undef;

   }

   elsif (!$logined_admin && !$logined_user) {

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

   my $api = gitprep_api;

   # Git

-  my $git = $api->git;

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

   # Parameters

   my $user = param('user');

@@ -5,7 +5,7 @@

   my $api = gitprep_api;

   # Git

-  my $git = $api->git;

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

   # Parameters

   my $user = param('user');

@@ -9,7 +9,7 @@

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

   # Git

-  my $git = $api->git;

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

   # Delete

   my $errors;

@@ -52,7 +52,7 @@

   }

   # Default branch

-  my $base_branch_name = param('base_branch') || $api->manager->default_branch($user, $project);

+  my $base_branch_name = param('base_branch') || app->manager->default_branch($user, $project);

   my $base_branch = $git->branch($user, $project, $base_branch_name);

   # No merged branches

@@ -9,7 +9,7 @@

   $rev = $diff unless defined $rev;

   # Git

-  my $git = $api->git;

+  my $git = app->git;

   # Commit

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

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

   my $api = gitprep_api;

   # Git

-  my $git = $api->git;

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

   # Parameters

   my $user = param('user');

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

   my $page = param('page') || 0;

   # Git

-  my $git = $api->git;

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

   # Commits

   my $commits = $git->forward_commits($user, $project, $from_rev, $rev);

@@ -14,13 +14,13 @@

   }

   # Repository is already exists

-  if ($api->manager->exists_project($current_user, $project)) {

+  if (app->manager->exists_project($current_user, $project)) {

     $self->redirect_to("/$current_user/$project");

     return;

   }

   # Fork

   else {

-    eval { $api->manager->fork_project($current_user, $user, $project) };

+    eval { app->manager->fork_project($current_user, $user, $project) };

     if ($@) {

       $self->render_exception('Internal Error');

       app->log->error("/$user/$project/fork: $@");

@@ -15,7 +15,7 @@

   }

   # Branches

-  my $git = $api->git;

+  my $git = app->git;

   my $remote_branches = $git->branches($remote_user, $remote_project);

   my $remote_branch_names = [map { $_->{name} } @$remote_branches];

@@ -1,10 +1,8 @@

 <%

-  my $api = gitprep_api;

-  

   my $rev = stash('rev');

   my $from_rev = stash('from_rev');

-  my $git = $api->git;

+  my $git = app->git;

   my $diff_tree = stash('diff_tree');

   my $blob_diff = stash('blob_diff');

@@ -1,13 +1,11 @@

 <%

-  my $api = gitprep_api;

-  

   my $display = stash('display') || '';

   my $rev = stash('rev');

   $rev = '' unless defined $rev;

   my $branches = stash('branches');

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

-  my $default_branch_name = $api->manager->default_branch($user, $project);

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

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

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

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

 %>

 %= javascript begin

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

 <%

-  my $api = gitprep_api;

-  

   # Parameters

   my $rev = stash('rev');

   my $from_rev = stash('from_rev');

   # Git

-  my $git = $api->git;

+  my $git = app->git;

   # Diff tree

   my $diff_trees = $git->diff_tree(

@@ -3,8 +3,8 @@

   my $logined = $api->logined;

   my $current_user = session('user');

   my $user = stash('user');

-  my $original_user = $api->manager->original_user($user, $project);

-  my $original_project = $api->manager->original_project($user, $project);

+  my $original_user = app->manager->original_user($user, $project);

+  my $original_project = app->manager->original_project($user, $project);

 %>

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

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

   use Mojo::ByteStream ();

   use Text::Markdown::Discount ();

-  my $api = gitprep_api;

-  

   # README

   my $type;

   my $lines;

-  eval { $lines = $api->git->blob($user, $project, $rev, 'README') };

+  eval { $lines = app->git->blob($user, $project, $rev, 'README') };

   my $readme_e;

   if ($lines) {

     $type = 'plain';

@@ -16,7 +14,7 @@

     $readme_e =~ s#(^|\s|[^\x00-\x7F])(http(?:s)?://.+?)($|\s|[^\x00-\x7F])#$1<a href="$2">$2</a>$3#msg;

   }

   else {

-    eval { $lines = $api->git->blob($user, $project, $rev, 'README.md') };

+    eval { $lines = app->git->blob($user, $project, $rev, 'README.md') };

     if ($lines) {

       $type = 'markdown';

       my $readme = join "\n", @$lines;

@@ -3,21 +3,21 @@

   my $api = gitprep_api;

   # Branches

-  my $branches = [map { $_->{name} } @{$api->git->branches($user, $project)}];

+  my $branches = [map { $_->{name} } @{app->git->branches($user, $project)}];

   # Members

-  my $members = $api->manager->members($user, $project);

+  my $members = app->manager->members($user, $project);

   # Members branches

   for my $member (@$members) {

     my $branches = [

-      map { $_->{name} } @{$api->git->branches($member->{id}, $member->{project})}

+      map { $_->{name} } @{app->git->branches($member->{id}, $member->{project})}

     ];

     $member->{branches} = $branches;

   }

   # Default branch

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

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

 %>

 % layout 'common', title => "Network \x{30fb} $user/$project";

@@ -1,14 +1,12 @@

 <%

-  my $api = gitprep_api;

-  

   my $user = param('user');

   my $project = param('project');

   my $branch = param('rev1');

   my $rev2_abs = param('rev2_abs');

   my ($remote_user, $remote_project, $remote_branch) = split /\//, $rev2_abs, 3;

-  my $commits = $api->git->get_commits($user, $project, $branch, 100);

-  my $remote_commits = $api->git->get_commits(

+  my $commits = app->git->get_commits($user, $project, $branch, 100);

+  my $remote_commits = app->git->get_commits(

     $remote_user,

     $remote_project,

     $remote_branch,

@@ -7,14 +7,14 @@

   my $api = gitprep_api;

   # Git

-  my $git = $api->git;

+  my $git = app->git;

   # Parameters

   my $user = param('user');

   my $project = param('project');

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

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

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

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

     $self->render_not_found;

     return;

   }

@@ -49,7 +49,7 @@

   my $url = url_for->to_abs;

   $url->base(undef);

   my $ssh_port = config->{basic}{ssh_port};

-  my $rep_home = $api->git->rep_home;

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

   my $execute_user = getpwuid($>);

   my $ssh_rep_url = "ssh://$execute_user\@" . $url->host

     . ($ssh_port ? ":$ssh_port" : '') . "$rep_home/$user/$project.git";

@@ -1,9 +1,6 @@

 <%

-  # API

-  my $api = gitprep_api;

-

   # Git

-  my $git = $api->git;

+  my $git = app->git;

   # Parameters

   my $user = param('user');

@@ -1,9 +1,7 @@

 <%

-  use Encode ();

-  

   # API

   my $api = gitprep_api;

-  my $manager = $api->manager;

+  my $manager = app->manager;

   # Parameters

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

@@ -16,7 +14,7 @@

   }

   # Rename project

-  my $git = $api->git;

+  my $git = app->git;

   my $errors;

   my $post = lc $self->req->method eq 'post';

   if ($op eq 'rename-project' && $post) {

@@ -37,11 +35,11 @@

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

       # Rename

-      if ($api->manager->exists_project($user, $to_project)) {

+      if (app->manager->exists_project($user, $to_project)) {

         $errors = ["$to_project is already exists"];

       }

       else {

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

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

         if (my $e = $@) {

           app->log->error($e);

           $errors = ['Internal Error'];

@@ -76,7 +74,7 @@

   # Change default branch

   elsif ($op eq 'default-branch' && $post) {

     my $default_branch = param('default-branch');

-    eval { $api->manager->default_branch($user, $project, $default_branch) };

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

     if (my $e = $@) {

       app->log->error("/$user/$project/settings?op=default-branch: $e");

       $errors = ['Internal Error'];

@@ -87,35 +85,7 @@

       return;

     }

   }

-  # Encoding

-  elsif ($op eq 'encoding' && $post) {

-    my $encoding = param('encoding') || '';

-    

-    my $enc = $encoding ? $encoding : 'UTF-8';

-    my $enc_object = Encode::find_encoding($enc);

-    if ($enc_object) {

-      eval {

-        app->dbi->model('project')->update(

-          {encoding => $encoding},

-          id => [$user, $project]

-        );

-      };

-      if (my $e = $@) {

-        app->log->error("/$user/$project/settings?op=encoding: $e");

-        $errors = ['Internal Error'];

-      }

-      else {

-        my $message = 'Encoding is saved. Encoding is '

-          . ($encoding ? $encoding : 'UTF-8(default)');

-        flash(message => $message);

-        $self->redirect_to('current');

-        return;

-      }

-    }

-    else {

-      $errors = ["$encoding is invalid encoding"];

-    }

-  }

+  

   # Private repository

   elsif ($op eq 'private' && $post) {

     my $private = param('private') ? 1 : 0;

@@ -145,7 +115,7 @@

     my $user = param('user');

     my $project = param('project');

-    eval { $api->manager->delete_project($user, $project) };

+    eval { app->manager->delete_project($user, $project) };

     if (my $e = $@) {

       app->log->error("/$user/$project/settings: $e");

       $errors = ['Internal Error'];

@@ -156,8 +126,6 @@

       return;

     }

   }

-  

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

 %>

 % layout 'common', title => 'Options';

@@ -241,31 +209,21 @@

               </div>

             </form>

           </div>

-          <div class="border-gray" style="padding:5px 10px;border-top:none;">

+          <div class="border-gray radius-bottom" style="padding:5px 10px;border-top:none;">

             <form id="form-default-branch" action="<%= url_for->query(op => 'default-branch') %>" method="post" style="margin-bottom:0px">

               Default Branch

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

               % my $branch_names = [map { $_->{name} } @$branches];

-              % my $default_branch = $project_info->{default_branch};

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

               % push @$branch_names, $default_branch unless @$branch_names;

               % param('default-branch', $default_branch);

               %= select_field 'default-branch' => $branch_names, style => 'margin-top:5px';

             </form>

           </div>

-          <div class="border-gray" style="padding:5px 10px;border-top:none;">

-            <form action="<%= url_for->query(op => 'encoding') %>" method="post" style="margin-bottom:0px">

-              Encoding

-              % my $encoding = $project_info->{encoding};

-              % param('encoding', $encoding);

-              %= text_field 'encoding', style => 'margin-top:5px;width:100px';

-              <input type="submit" class="btn" value="Save">

-              (Default is UTF-8)

-            </form>

-          </div>

           <div class="border-gray radius-bottom" style="padding:5px 10px;border-top:none;">

-            <form action="<%= url_for->query(op => 'private') %>" method="post" style="margin-bottom:0px">

+            <form id="form-default-branch" action="<%= url_for->query(op => 'private') %>" method="post" style="margin-bottom:0px">

               <span>Make this repository private</span>

-              % my $private = $api->manager->is_private_project($user, $project);

+              % my $private = app->manager->is_private_project($user, $project);

               % if ($private) {

                 % param('private', 1);

               % }

@@ -308,7 +266,7 @@

   <div id="rename-confirm" class="modal hide" tabindex="-1" role="dialog" aria-labelledby="rename-confirm-label" aria-hidden="true">

     <div class="modal-header">

-      <button type="button" class="close" data-dismiss="modal" aria-hidden="true">??</button>

+      <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>

       <div style="font-weight:bold">Are you sure you want to rename?</div>

     </div>

     <div class="modal-body">

@@ -333,7 +291,7 @@

   <div id="delete-confirm" class="modal hide" tabindex="-1" role="dialog" aria-labelledby="delete-confirm-label" aria-hidden="true">

     <div class="modal-header">

-      <button type="button" class="close" data-dismiss="modal" aria-hidden="true">??</button>

+      <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>

       <div style="font-weight:bold">Are you ABSOLUTELY sure?</div>

     </div>

     <div class="modal-body">

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

 <%

   # API

   my $api = gitprep_api;

-  my $manager = $api->manager;

+  my $manager = app->manager;

   # Parameters

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

@@ -15,7 +15,7 @@

   }

   # Rename project

-  my $git = $api->git;

+  my $git = app->git;

   my $errors;

   if (lc $self->req->method eq 'post') {

     if ($op eq 'add') {

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

   use Symbol ();

   use IO::Select ();

-  my $api = gitprep_api;

-  

   my $service = param('service') || '';

   my $user = param('user');

   my $project = param('project');

-  my $git = $api->git;

+  my $git = app->git;

   # Smart HTTP

   if ($service eq 'git-upload-pack' || $service eq 'git-receive-pack') {

@@ -67,7 +65,7 @@

       or die "Can't close pipe for @cmd:$!";

     my $content_type = 'text/plain; charset=UTF-8';

-    my $rep_home = $api->git->rep_home;

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

     my $file = "$rep_home/$user/$project.git/info/refs";

     if (-f $file) {

       my $asset = Mojo::Asset::File->new(path => $file);

@@ -3,13 +3,11 @@

   use Symbol ();

   use IO::Select ();

-  my $api = gitprep_api;

-  

   my $service = param('service');

   my $user = param('user');

   my $project = param('project');

-  my $git = $api->git;

+  my $git = app->git;

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

   my @cmd = $git->cmd($user, $project, $service, '--stateless-rpc', $rep_dir);

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

 <%

-  my $api = gitprep_api;

-  

   my $path = param('Path');

   my $user = param('user');

   my $project = param('project');

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

     $content_type = 'application/x-git-packed-objects-toc';

   }

-  my $rep_home = $api->git->rep_home;

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

   my $file = "$rep_home/$user/$project.git/$path";

   if (-f $file) {

     my $asset = Mojo::Asset::File->new(path => $file);

@@ -5,7 +5,7 @@

   my $api = gitprep_api;

   # Git

-  my $git = $api->git;

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

   # Parameters

   my $user = param('user');

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

   my $page = param('page') || 1;

   # Git

-  my $git = $api->git;

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

   # Ref names

   my $limit = app->config->{basic}{tags_limit};

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

   my $api = gitprep_api;

   # Git

-  my $git = $api->git;

+  my $git = app->git;

   # Parameters

   my $user = param('user');

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

 <%

-  my $api = gitprep_api;

-  

   # Redirect for project delete

   if (my $deleted_project = param('deleted_project')) {

     flash('deleted_project', $deleted_project);

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

   my $user = param('user');

   # Projects

-  unless ($api->manager->exists_user($user)) {

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

     $self->render_not_found;

     return;

   }

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

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

   my $reps = [];

   for my $project (@$projects) {

-    my $rep = $api->git->repository($user, $project->{name}) || {none => 1};

+    my $rep = app->git->repository($user, $project->{name}) || {none => 1};

     $rep->{name} = $project->{name};

     push @$reps, $rep;

   }

@@ -1,36 +0,0 @@

-use Test::More 'no_plan';

-

-use FindBin;

-use utf8;

-use lib "$FindBin::Bin/../mojo/lib";

-use lib "$FindBin::Bin/../lib";

-use lib "$FindBin::Bin/../extlib/lib/perl5";

-use Encode qw/encode decode/;

-

-use Test::Mojo;

-

-# Test DB

-$ENV{GITPREP_DB_FILE} = "$FindBin::Bin/basic_enc.db";

-

-# Test Repository home

-$ENV{GITPREP_REP_HOME} = "$FindBin::Bin/../../gitprep_t_rep_home";

-

-$ENV{GITPREP_NO_MYCONFIG} = 1;

-

-use Gitprep;

-

-my $app = Gitprep->new;

-my $t = Test::Mojo->new($app);

-

-my $user = 'kimoto';

-my $project = 'gitprep_t';

-

-# For perl 5.8

-{

-  no warnings 'redefine';

-  sub note { print STDERR "# $_[0]\n" unless $ENV{HARNESS_ACTIVE} }

-}

-

-# Encoding(EUC-jp)

-$t->get_ok("/$user/$project/blob/ed7b91659762fa612563f0595f3faca6aecfcfa0/euc-jp.txt");

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

@@ -20,6 +20,7 @@ my $rep_home = $ENV{GITPREP_REP_HOME} = "$FindBin::Bin/user";

 $ENV{GITPREP_NO_MYCONFIG} = 1;

+

 use Gitprep;

 # For perl 5.8

@@ -606,37 +607,3 @@ note 'Private repository and collaborator';

   $t->get_ok("/kimoto/t1");

   $t->content_like(qr/t1 is private repository/);

 }

-

-note 'Project encoding';

-{

-  unlink $db_file;

-  rmtree $rep_home;

-

-  my $app = Gitprep->new;

-  my $t = Test::Mojo->new($app);

-  $t->ua->max_redirects(3);

-

-  # Create admin user

-  $t->post_ok('/_start?op=create', form => {password => 'a', password2 => 'a'});

-  $t->content_like(qr/Login page/);

-

-  # Login success

-  $t->post_ok('/_login?op=login', form => {id => 'admin', password => 'a'});

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

-  

-  # Create user

-  $t->post_ok('/_admin/user/create?op=create', form => {id => 'kimoto', password => 'a', password2 => 'a'});

-  $t->content_like(qr/Success.*created/);

-

-  # Login as kimoto

-  $t->post_ok('/_login?op=login', form => {id => 'kimoto', password => 'a'});

-  $t->get_ok('/')->content_like(qr/kimoto/);

-

-  # Create repository

-  $t->post_ok('/_new?op=create', form => {project => 't1', description => 'Hello', readme => 1});

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

-  

-  # Change encoding

-  $t->post_ok("/kimoto/t1/settings?op=encoding", form => {encoding => 'EUC-jp'});

-  $t->content_like(qr/Encoding is EUC-jp/);

-}