config file become JSON

Changes

@@ -1,4 +1,8 @@
-0.02
+0.03 (beta)
+  - config file become JSON.
+  - URL become more restful.
+0.02 (beta)
   - fixed blob, blog_plain, commitdiff, commitdiff_plain encoding bug
-0.01
+
+0.01 (beta)
   - first beta release.

README

@@ -49,40 +49,40 @@ Description
 
 Config
 
-  You can set config in gitweblite.conf. Config is written by Perl data structure.
+  You can set config in gitweblite.conf. Config is written by JSON.
 
-    search_dirs => [$dir, ...]
-
+    search_dirs
+        
       Git repository searching directories.
 
       Default:
 
-        search_dirs => ['/git/pub', '/home']
+        "search_dirs" : ["/git/pub", "/home"]
 
-    search_max_depth => $num
+    search_max_depth
 
       Searching directory max depth.
 
       Default:
 
-        search_max_depth => 10
+        "search_max_depth" : 10
 
-    git_bin => $path
+    git_bin
 
       git command
 
       Default:
 
-        git_bin => '/usr/local/bin/git'
+        "git_bin" : "/usr/local/bin/git"
 
-    hypnotoad => {$opt => $val, ...}
+    hypnotoad
 
       Server configuration.
 
       Default:
 
-        hypnotoad => {
-          listen => ['http://*:10010']
+        "hypnotoad" : {
+          "listen" => ["http://*:10010"]
         }
 
   See also gitweblite.conf.example.

gitweblite.conf

@@ -1,5 +1,6 @@
 {
-  hypnotoad => {
-    listen => ['http://*:10010']
+  // Server config
+  "hypnotoad" : {
+    "listen" : ["http://*:10010"]
   }
 }

gitweblite.conf.example

@@ -1,15 +1,15 @@
 {
-  # Search directory
-  search_dirs => ['/git/pub', '/home'],
+  // Search directory
+  "search_dirs" : ["/git/pub", "/home"],
 
-  # Serach max depth
-  search_max_depth => 10,
+  // Serach max depth
+  "search_max_depth" : 10,
 
-  # Git command
-  git_bin => '/usr/local/bin/git',
+  // Git command
+  "git_bin" : "/usr/local/bin/git",
 
-  # Server config
-  hypnotoad => {
-    listen => ['http://*:10010']
+  // Server config
+  "hypnotoad" : {
+    "listen" : ["http://*:10010"]
   }
 }

lib/Gitweblite.pm

@@ -13,7 +13,7 @@ sub startup {
   my $self = shift;
 
   # Config
-  my $conf = $self->plugin('Config');
+  my $conf = $self->plugin('JSONConfigLoose', {ext => 'conf'});
   my $search_dirs = $conf->{search_dirs} || ['/git/pub', '/home'];
   $self->config(search_dirs => $search_dirs);
   my $search_max_depth = $conf->{search_max_depth} || 10;
@@ -105,10 +105,13 @@ sub startup {
       ->to('#blob', plain => 1)->name('blob_plain');
 
     # Blob diff
-    $r->get('/blobdiff')->to('#blobdiff')->name('blobdiff');
+    $r->get('/blobdiff/(:diff)/(*file)',
+        [diff => qr/[a-zA-Z0-9]{40}\.\.[a-zA-Z0-9]{40}/])
+      ->to('#blobdiff')->name('blobdiff');
 
     # Blob diff plain
-    $r->get('/blobdiff_plain')
+    $r->get('/blobdiff_plain/(:diff)/(*file)',
+        [diff => qr/[a-zA-Z0-9]{40}\.\.[a-zA-Z0-9]{40}/])
       ->to('#blobdiff', plain => 1)->name('blobdiff_plain');
 
     # Snapshot

lib/Mojolicious/Plugin/JSONConfigLoose.pm

@@ -0,0 +1,21 @@
+package Mojolicious::Plugin::JSONConfigLoose;
+use Mojo::Base 'Mojolicious::Plugin::JSONConfig';
+
+sub load {
+  my ($self, $file, $conf, $app) = @_;
+  $app->log->debug(qq/Reading config file "$file"./);
+
+  # Slurp UTF-8 file
+  open my $handle, "<:encoding(UTF-8)", $file
+    or die qq/Couldn't open config file "$file": $!/;
+  my $content;
+  while (my $line = <$handle>) {
+    next if $line =~ m#^\s*//#;
+    $content .= $line;
+  }
+
+  # Process
+  return $self->parse($content, $file, $conf, $app);
+}
+
+1;

templates/include/difftree.html.ep

@@ -64,8 +64,8 @@
               % } else {
                 <td class="link">
               % }
-              <a href="<%= url_for('blobdiff',project => $project_ns)
-                  ->query(from_id => $from_id, id => $id, file => $file) %>">
+              <a href="<%= url_for('blobdiff',project => $project_ns,
+                  diff => "$from_id..$id", file => $file) %>">
                 diff<%= $i + 1 %>
               </a>
               | </td>
@@ -157,8 +157,8 @@
           </td>
           <td class="link">
             % if ($status ne 'A') {
-              <a href="<%= url_for('blobdiff', project => $project_ns)
-                  ->query(from_id => $from_id, id => $id, file => $file) %>">
+              <a href="<%= url_for('blobdiff', project => $project_ns,
+                  diff => "$from_id..$id", file => $file) %>">
                 diff
               </a>
               |

templates/main/blobdiff.html.ep

@@ -9,8 +9,8 @@
   </div>
   %= include '/include/page_navi', current => 'blobdiff', head_id => $id, project_ns => $project_ns;
   <div class="page_nav">
-    <a href="<%= url_for('blobdiff_plain', project => $project_ns)
-        ->query(from_id => $from_id, id => $id, file => $file) %>">
+    <a href="<%= url_for('blobdiff', project => $project_ns,
+        plain => 1, diff => "$from_id..$id", file => $file) %>">
       Raw
     </a>
     |