@@ -20,6 +20,10 @@

 ;;; Forget to comment out after resetting password.

 ;reset_password=1

+[hypnotoad]

+;;; Listen URL

+;listen=http://*:10020

+

 [reverse_proxy]

 ;;; Reverse proxy support

 ;on=1

@@ -29,6 +33,3 @@

 ;;; If proxy path is http://somehost.com/foo/bar, you set path_depth to 2.

 ;path_depth=1

 ;path_depth=2

-

-[hypnotoad]

-listen=http://*:10020

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

 use 5.008007;

 package Gitprep;

-our $VERSION = '0.04';

-

 use Mojo::Base 'Mojolicious';

 use Gitprep::Git;

 use DBIx::Custom;

@@ -14,6 +12,8 @@ use Gitprep::Manager;

 use Scalar::Util 'weaken';

 use Carp 'croak';

+our $VERSION = '0.04';

+

 has 'git';

 has 'dbi';

 has 'validator';

@@ -22,28 +22,27 @@ has 'manager';

 sub startup {

   my $self = shift;

-  # Config

+  # Config file

   $self->plugin('INIConfig', {ext => 'conf'});

-  # My Config(Development)

+  # Config file for developper

   my $my_conf_file = $self->home->rel_file('gitprep.my.conf');

   $self->plugin('INIConfig', {file => $my_conf_file}) if -f $my_conf_file;

-  # Config

+  # Listen

   my $conf = $self->config;

-  $conf->{hypnotoad} ||= {listen => ["http://*:10020"]};

-  my $listen = $conf->{hypnotoad}{listen} || '';

-  if ($listen ne '' && ref $listen ne 'ARRAY') {

-    $listen = [ split /,/, $listen ];

-  }

+  my $listen = $conf->{hypnotoad}{listen} ||= ['http://*:10020'];

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

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

-  # Git command

+  # Git

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

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

+  my $git_bin

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

   if (!$git_bin || ! -e $git_bin) {

     $git_bin ||= '';

-    my $error = "Can't detect or found git command ($git_bin). set git_bin in gitprep.conf";

+    my $error = "Can't detect or found git command ($git_bin)."

+      . " set git_bin in gitprep.conf";

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

     croak $error;

   }

@@ -55,18 +54,17 @@ sub startup {

   $self->manager($manager);

   # Repository home

-  my $rep_home = $ENV{GITPREP_REP_HOME}

-    || $self->home->rel_file('data/rep');

+  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: $!";

   }

   $self->git($git);

-

+  

   # Added public path

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

-

+  

   # DBI

   my $db_file = $ENV{GITPREP_DB_FILE}

     || $self->home->rel_file('data/gitprep.db');

@@ -77,7 +75,7 @@ sub startup {

   );

   $self->dbi($dbi);

-  # Change database file permision

+  # Database file permision

   if (my $user = $self->config->{hypnotoad}{user}) {

     my $uid = (getpwnam $user)[2];

     chown $uid, -1, $db_file;

@@ -115,112 +113,119 @@ 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;

-

-  # DBViewer(only development)

-  if ($self->mode eq 'development') {

-    eval {

-      $self->plugin(

-        'DBViewer',

-        dsn => "dbi:SQLite:database=$db_file"

-      );

-    };

-  }

-  

-  # Auto route

   {

-    my $r = $r->under(sub {

+    # API

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

+    

+    # Finish rendering

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

       my $self = shift;

-      my $api = $self->gitprep_api;

-      

-      # Admin page authentication

-      {

-        my $path = $self->req->url->path->parts->[0] || '';

-

-        if ($path eq '_admin' && !$api->logined_admin) {

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

-          return;

-        }

-      }

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

+      $self->rendered;

-      return 1; 

+      return $self;

     });

-    $self->plugin('AutoRoute', route => $r);

   }

-

-  # User defined Routes

+  

+  # Routes

   {

-    # User

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

-    {

-      # Home

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

-      

-      # Settings

-      $r->get('/_settings')->name('user-settings');

+    my $r = $self->routes;

+

+    # DBViewer(only development)

+    if ($self->mode eq 'development') {

+      eval {

+        $self->plugin(

+          'DBViewer',

+          dsn => "dbi:SQLite:database=$db_file"

+        );

+      };

     }

-    # Project

+    # Auto route

     {

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

-      

-      # Home

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

-      

-      # Commit

-      $r->get('/commit/*diff')->name('commit');

-      

-      # Commits

-      $r->get('/commits/*rev_file', {file => undef})->name('commits');

-      

-      # Branches

-      $r->any('/branches/*base_branch', {base_branch => undef})->name('branches');

+      my $r = $r->under(sub {

+        my $self = shift;

+        

+        my $api = $self->gitprep_api;

+        

+        # Admin page authentication

+        {

+          my $path = $self->req->url->path->parts->[0] || '';

-      # Tags

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

+          if ($path eq '_admin' && !$api->logined_admin) {

+            $self->redirect_to('/');

+            return;

+          }

+        }

+        

+        return 1; 

+      });

+      $self->plugin('AutoRoute', route => $r);

+    }

-      # Tree

-      $r->get('/tree/*rev_dir', {dir => undef})->name('tree');

-      

-      # Blob

-      $r->get('/blob/*rev_file', {file => undef})->name('blob');

-      

-      # Raw

-      $r->get('/raw/*rev_file', {file => undef})->name('raw');

-      

-      # Archive

-      $r->get('/archive/(*rev).tar.gz')->to(archive_type => 'tar')->name('archive');

-      $r->get('/archive/(*rev).zip')->to(archive_type => 'zip')->name('archive');

-      

-      # Compare

-      $r->get('/compare/(*rev1)...(*rev2)')->name('compare');

-      

-      # Settings

-      $r->any('/settings');

+    # Custom routes

+    {

+      # User

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

+      {

+        # Home

+        $r->get('/')->name('user');

+        

+        # Settings

+        $r->get('/_settings')->name('user-settings');

+      }

-      # Fork

-      $r->any('/fork');

+      # Project

+      {

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

+        

+        # Home

+        $r->get('/')->name('project');

+        

+        # Commit

+        $r->get('/commit/*diff')->name('commit');

+        

+        # Commits

+        $r->get('/commits/*rev_file', {file => undef})->name('commits');

+        

+        # Branches

+        $r->any('/branches/*base_branch', {base_branch => undef})->name('branches');

-      # Network

-      $r->get('/network');

+        # Tags

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

-      # Network Graph

-      $r->get('/network/graph/(*rev1)...(*rev2_abs)')->name('network/graph');

-      

-      # Get branches and tags

-      $r->get('/api/revs')->name('api/revs');

+        # Tree

+        $r->get('/tree/*rev_dir', {dir => undef})->name('tree');

+        

+        # Blob

+        $r->get('/blob/*rev_file', {file => undef})->name('blob');

+        

+        # Raw

+        $r->get('/raw/*rev_file', {file => undef})->name('raw');

+        

+        # Archive

+        $r->get('/archive/(*rev).tar.gz')->to(archive_type => 'tar')->name('archive');

+        $r->get('/archive/(*rev).zip')->to(archive_type => 'zip')->name('archive');

+        

+        # Compare

+        $r->get('/compare/(*rev1)...(*rev2)')->name('compare');

+        

+        # Settings

+        $r->any('/settings');

+        

+        # Fork

+        $r->any('/fork');

+

+        # Network

+        $r->get('/network');

+

+        # Network Graph

+        $r->get('/network/graph/(*rev1)...(*rev2_abs)')->name('network/graph');

+        

+        # Get branches and tags

+        $r->get('/api/revs')->name('api/revs');

+      }

     }

   }