@@ -8,7 +8,6 @@ use Gitprep::Git;

 use DBIx::Custom;

 use Validator::Custom;

 use Encode qw/encode decode/;

-use Mojo::JSON;

 use Gitprep::API;

 use Carp 'croak';

 use Gitprep::RepManager;

@@ -86,18 +85,6 @@ sub startup {

   ];

   $dbi->create_model($_) for @$models;

-  # Fiter

-  $dbi->register_filter(json => sub {

-    my $value = shift;

-    

-    if (ref $value) {

-      return decode('UTF-8', Mojo::JSON->new->encode($value));

-    }

-    else {

-      return Mojo::JSON->new->decode(encode('UTF-8', $value));

-    }

-  });

-  

   # Validator

   my $validator = Validator::Custom->new;

   $self->validator($validator);

@@ -3,7 +3,6 @@ use Mojo::Base -base;

 use Carp ();

 use File::Basename ();

-use Mojo::JSON;

 use Encode qw/encode decode/;

 use Digest::MD5 'md5_hex';

@@ -12,19 +11,16 @@ sub dirname { File::Basename::dirname(@_) }

 has 'cntl';

+sub app { shift->cntl->app }

+

 sub admin_user {

   my $self = shift;

-  # DBI

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

-  

   # Admin user

-  my $users = $dbi->model('user')->select->filter('config' => 'json')->all;

-  for my $user (@$users) {

-    return $user->{id} if $user->{config}{admin};

-  }

+  my $admin_user = $self->app->dbi->model('user')

+    ->select('id', where => {admin => 1})->value;

-  return;

+  return $admin_user;

 }

 sub encrypt_password {

@@ -54,14 +50,10 @@ sub new {

 sub exists_admin {

   my $self = shift;

-  my $users = $self->cntl->app->dbi->model('user')->select(

-    ['id', 'config'],

-    append => 'order by id'

-  )->filter(config => 'json')->all;

+  my $row = $self->app->dbi->model('user')

+    ->select(where => {admin => 1})->one;

-  my $exists = grep { $_->{config}{admin} } @$users;

-  

-  return $exists;

+  return $row ? 1 : 0;;

 }

 sub root_ns {

@@ -75,18 +67,11 @@ sub root_ns {

 sub is_admin {

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

-  # Controler

-  my $c = $self->cntl;

-  

-  # DBI

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

-  

   # Check admin

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

-  return unless $row;

-  my $config = $self->json($row->{config});

+  my $is_admin = $self->app->dbi->model('user')

+    ->select('admin', id => $user)->value;

-  return $config->{admin};

+  return $is_admin;

 }

 sub logined_admin {

@@ -101,18 +86,6 @@ sub logined_admin {

   return $self->is_admin($user) && $self->logined;

 }

-

-sub json {

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

-  

-  if (ref $value) {

-    return decode('UTF-8', Mojo::JSON->new->encode($value));

-  }

-  else {

-    return Mojo::JSON->new->decode(encode('UTF-8', $value));

-  }

-}

-

 sub logined {

   my $self = shift;

@@ -124,22 +97,21 @@ sub logined {

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

   return unless defined $password;

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

-  return unless $row;

-  my $config = $self->json($row->{config});

+  my $correct_password

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

+  return unless defined $correct_password;

-  return $password eq $config->{password};

+  return $password eq $correct_password;

 }

 sub users {

   my $self = shift;

-  my $users = $self->cntl->app->dbi->model('user')->select(

-    ['id', 'config'],

+  my $users = $self->app->dbi->model('user')->select(

+    'id',

+    where => [':admin{<>}',{admin => 1}],

     append => 'order by id'

-  )->filter(config => 'json')->all;

-

-  @$users = grep { ! $_->{config}{admin} } @$users;

+  )->all;

   return $users;

 }

@@ -157,16 +129,11 @@ sub params {

 sub default_branch {

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

-  my $c = $self->cntl;

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

-  my $row = $dbi->model('project')

-    ->select('config', id => [$user, $project])->one;

-  return unless $row;

-  

-  my $config = $self->json($row->{config});

-

+  my $default_branch = $self->app->dbi->model('project')

+    ->select('default_branch', id => [$user, $project])

+    ->value;

-  return $config->{default_branch};

+  return $default_branch;

 }

 1;

@@ -4,8 +4,8 @@ use Mojo::Base -base;

 use Carp 'croak';

 use File::Copy 'move';

 use File::Path qw/mkpath rmtree/;

-use Mojo::JSON;

 use File::Temp ();

+use Encode 'encode';

 has 'app';

@@ -18,22 +18,21 @@ sub members {

   # Projects

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

     ->model('project')

-    ->select(['user_id', 'name', 'config'])

-    ->filter(config => 'json')

+    ->select([qw/user_id name original_user original_project/])

     ->all;

   # Members

   my $members = [];

   for my $project (@$projects) {

-    $project->{config}{original_user} = ''

-      unless defined $project->{config}{original_user};

+    $project->{original_user} = ''

+      unless defined $project->{original_user};

-    $project->{config}{original_project} = ''

-      unless defined $project->{config}{original_project};

+    $project->{original_project} = ''

+      unless defined $project->{original_project};

     push @$members, {id => $project->{user_id}, project => $project->{name}}

-      if $project->{config}{original_user} eq $user

-        && $project->{config}{original_project} eq $project_name;

+      if $project->{original_user} eq $user

+        && $project->{original_project} eq $project_name;

   }

   return $members;

@@ -120,13 +119,12 @@ sub original_project {

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

-  my $config = $dbi->model('project')

-    ->select('config', id => [$user, $project])

-    ->filter(config => 'json')

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

+    ->select('original_project', id => [$user, $project])

     ->value;

-  return unless $config;

+  return unless defined $original_project;

-  return $config->{original_project};

+  return $original_project;

 }

 sub original_user {

@@ -134,13 +132,12 @@ sub original_user {

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

-  my $config = $dbi->model('project')

-    ->select('config', id => [$user, $project])

-    ->filter(config => 'json')

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

+    ->select('original_user', id => [$user, $project])

     ->value;

-  return unless $config;

+  return unless defined $original_user;

-  return $config->{original_user};

+  return $original_user;

 }

 sub _delete_db_user {

@@ -305,7 +302,7 @@ sub setup_database {

     my $sql = <<"EOS";

 create table user (

   row_id integer primary key autoincrement,

-  id not null unique,

+  id not null unique default ''

 );

 EOS

     $dbi->execute($sql);

@@ -313,16 +310,18 @@ EOS

   # Create usert columns

   my $user_columns = [

-    "config not null default ''",

+    "admin not null default '0'",

+    "password not null default ''",

+    "salt not null default ''"

   ];

   for my $column (@$user_columns) {

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

   }

   # Check user table

-  eval { $dbi->select(['config'], table => 'user') };

+  eval { $dbi->select([qw/row_id id admin password salt/], table => 'user') };

   if ($@) {

-    my $error = "Can't create user table properly";

+    my $error = "Can't create user table properly: $@";

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

     croak $error;

   }

@@ -342,37 +341,29 @@ EOS

   # Create Project columns

   my $project_columns = [

-    "config not null default ''",

+    "default_branch not null default 'master'",

+    "original_user not null default ''",

+    "original_project not null default ''"

   ];

   for my $column (@$project_columns) {

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

   }

   # Check project table

-  eval { $dbi->select(['config'], table => 'project') };

+  eval { $dbi->select([qw/default_branch original_user original_project/], table => 'project') };

   if ($@) {

-    my $error = "Can't create project table properly";

+    my $error = "Can't create project table properly: $@";

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

     croak $error;

   }

 }

 sub _create_project {

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

-  $new_config ||= {};

-  

-  # Config

-  my $config = {default_branch => 'master'};

-  $config = {%$config, %$new_config};

-  my $config_json = Mojo::JSON->new->encode($config);

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

+  $params ||= {};

   # Create project

-  $self->app->dbi->model('project')->insert(

-    {

-      config => $config_json,

-    },

-    id => [$user, $project]

-  );

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

 }

 sub _create_rep {

@@ -418,7 +409,7 @@ sub _create_rep {

     my $file = "$temp_rep/description";

     open my $fh, '>', $file

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

-    print $fh $description

+    print $fh encode('UTF-8', $description)

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

     close $fh;

   }

@@ -535,30 +526,11 @@ sub _rename_project {

   );

   # Rename related project

-  my $row_ids = $dbi->model('project')->select('row_id')->values;

-  for my $row_id (@$row_ids) {

-    my $config = $dbi->model('project')

-      ->select('config', where => {row_id => $row_id})

-      ->filter(config => 'json')

-      ->value;

-    

-    my $original_user = $config->{original_user};

-    $original_user = '' unless defined $original_user;

+  $dbi->model('project')->update(

+    {original_project => $renamed_project},

+    where => {original_user => $user, original_project => $project},

+  );

-    my $original_project = $config->{original_project};

-    $original_project = '' unless defined $original_project;

-    

-    if ($original_user eq $user

-      && $original_project eq $project)

-    {

-      $config->{original_project} = $renamed_project;

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

-        {config => $config},

-        where => {row_id => $row_id},

-        filter => {config => 'json'}

-      );

-    }

-  }

 }

 sub _rename_rep {

@@ -37,10 +37,9 @@

         = $api->encrypt_password($params->{password});

       $params->{password} = $password_encrypted;

       $params->{salt} = $salt;

-      my $config_json = $api->json($params);

       # Create user

-      eval { app->manager->create_user($id, {config => $config_json}) };

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

       if ($@) {

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

         $errors = ['Internal Error'];

@@ -90,6 +90,6 @@

         </div>

       </form>

     </div>

-    <div class="text-center" style="margin-bottom:20px"><big><a href="/_admin/users">See Users</a></big></div>

+    <div class="text-center" style="margin-bottom:20px"><big><a href="/_admin/users">Users</a></big></div>

   </div>

   %= include '/include/footer';

@@ -26,7 +26,7 @@

               <a href="#"><%= $uid %></a>

             </td>

             <td style="text-align:right">

-              <a class="btn btn-mini" href="<%= url_for("/reset-password?user=$uid") %>">Reset Password</a>

+              <a class="btn btn-mini" href="<%= url_for('/reset-password')->query(user => $uid, mode => 'admin') %>">Reset Password</a>

               <a class="btn btn-mini" href="<%= url_for("/_admin/user/delete?user=$uid") %>">Delete</a>

             </td>

           </tr>

@@ -23,17 +23,15 @@

       my ($id, $password) = @$values;

-      my $config_json

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

+      my $row

+        = $dbi->model('user')->select(['password', 'salt'], id => $id)->one;

-      return unless $config_json;

-      

-      my $config = $api->json($config_json);

+      return unless defined $password;

       my $is_valid = $api->check_password(

         $password,

-        $config->{salt},

-        $config->{password}

+        $row->{salt},

+        $row->{password}

       );

       return $is_valid;

@@ -59,10 +57,9 @@

       my $params = $vresult->data;

       my $id = $params->{id};

       my $password = $params->{password};

-      my $config_json = $self->app->dbi->model('user')->select('config', id => $id)->value;

-      my $config = $api->json($config_json);

-      my $password_encrypted = $config->{password};

-      my $admin = $config->{admin};

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

+      my $password_encrypted = $row->{password};

+      my $admin = $row->{admin};

       session(user => $id);

       session(password => $password_encrypted);

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

 <%

-  use Mojo::Util 'md5_sum';

-  

   # API

   my $api = gitprep_api;

@@ -15,9 +13,7 @@

     # Check existence admin user

     my $admin_user = app->dbi->model('user')->select(id => 'admin')->one;

-    if ($admin_user) {

-      $errors = ['admin user already exists'];

-    }

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

     else {

       # Validation

       my $params = $api->params;

@@ -39,16 +35,15 @@

         # Valida parameters

         my $params = $vresult->data;

-        my $id = 'admin';

+        my $user = 'admin';

         $params->{admin} = 1;

         my ($password_encryped, $salt)

           = $api->encrypt_password($params->{password});

         $params->{password} = $password_encryped;

         $params->{salt} = $salt;

-        my $config_json = $api->json($params);

         # Create admin user

-        $self->app->dbi->model('user')->insert({id => $id, config => $config_json});

+        $self->app->dbi->model('user')->insert($params, id => $user);

         # Redirect

         $self->flash(admin_user_created => 1);

@@ -11,6 +11,7 @@

   # User

   my $user = param('user');

+  my $mode = param('mode') || '';

   # Reset password

   my $reset_password_conf_on;

@@ -71,28 +72,24 @@

         my ($password_encrypted, $salt)

           = $api->encrypt_password($valid_params->{password});

-        # Create admin user

+        # Reset password

         my $dbi = app->dbi;

+        my $count = $dbi->model('user')

+          ->update({password => $password_encrypted, salt => $salt}, id => $user);

-        my $config_json = $dbi->model('user')->select('config', id => $user)->value;

-        if (defined $config_json) {

-          my $config = $api->json($config_json);

-          $config->{password} = $password_encrypted;

-          $config->{salt} = $salt;

-          $self->app->dbi->model('user')->update({config => $config_json}, id => $user);

+        if ($count) {

+          # Redirect

+          my $messages = [];

+          push @$messages, "Success Reset Password: User $user password is changed";

+          if ($reset_password_conf_on) {

+            my $message = "Password is reseted. Don't forget"

+              . " to comment out reset_password option line from config file";

+            push @$messages, $message;

+          }

+          flash(messages => $messages);

+          $self->redirect_to(url_for->query(user => $user, mode => $mode));

         }

         else { $errors = ["User $user don't exists"] }

-        

-        # Redirect

-        my $messages = [];

-        push @$messages, "Success Reset Password: User $user password is changed";

-        if ($reset_password_conf_on) {

-          my $message = "Password is reseted. Don't forget"

-            . " to comment out reset_password option line from config file";

-          push @$messages, $message;

-        }

-        flash(messages => $messages);

-        $self->redirect_to(url_for->query(user => $user));

       }

       else { $errors = $vresult->messages }

     }

@@ -130,6 +127,9 @@

           <div>

             <b><%= $user %></b>

             %= hidden_field user => $user;

+            % if ($mode) {

+              %= hidden_field mode => $mode;

+            % }

           </div>

         </div>

         <div class="control-group">

@@ -146,6 +146,9 @@

         </div>

       </form>

     </div>

+    % if ($mode eq 'admin') {

+      <div class="text-center" style="margin-bottom:20px;font-size:120%"><a href="<%= url_for('_admin/users') %>">Users</a></div>

+    % }

   </div>

   %= include '/include/footer';

@@ -212,6 +212,7 @@

         Default Branch

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

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

+        % push @$branch_names, 'master' unless @$branch_names;

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

       </div>

     </div>