Add theme & translation system + use Etherpad instead of Etherpad::API

Author: ldidry

cpanfile

@@ -1,6 +1,10 @@
 requires "Mojolicious";
 requires "Mojolicious::Plugin::I18N";
 requires "Mojo::Pg";
-requires "Minion";
-requires "Etherpad::API";
-requires "Term::ProgressBar";
+requires 'Minion', '== 4.06';
+requires 'Etherpad';
+requires 'Term::ProgressBar';
+requires 'IO::Socket::SSL';
+requires 'Locale::Maketext';
+requires 'Locale::Maketext::Extract';
+requires 'Mojolicious::Plugin::DebugDumperHelper';

lib/Mounter.pm

@@ -0,0 +1,33 @@
+package Mounter;
+use Mojo::Base 'Mojolicious';
+use FindBin qw($Bin);
+use File::Spec qw(catfile);
+
+# This method will run once at server start
+sub startup {
+    my $self = shift;
+
+    push @{$self->commands->namespaces}, 'Padro::Command';
+
+    my $config = $self->plugin('Config' =>
+        {
+            file    => File::Spec->catfile($Bin, '..' ,'padro.conf'),
+            default => {
+                prefix => '/',
+                theme  => 'default',
+            }
+        }
+    );
+
+    # Themes handling
+    shift @{$self->static->paths};
+    if ($config->{theme} ne 'default') {
+        my $theme = $self->home->rel_dir('themes/'.$config->{theme});
+        push @{$self->static->paths}, $theme.'/public' if -d $theme.'/public';
+    }
+    push @{$self->static->paths}, $self->home->rel_dir('themes/default/public');
+
+    $self->plugin('Mount' => {$config->{prefix} => File::Spec->catfile($Bin, '..', 'script', 'application')});
+}
+
+1;

lib/Padro.pm

@@ -2,7 +2,7 @@ package Padro;
 use Mojo::Base 'Mojolicious';
 use Mojo::Pg;
 use Mojo::Pg::Migrations;
-use Etherpad::API;
+use Etherpad;
 
 # This method will run once at server start
 sub startup {
@@ -24,36 +24,52 @@ sub startup {
     $addr    .= $self->config->{minion}->{user};
     $addr    .= ':'.$self->config->{minion}->{pwd};
     $addr    .= '@'.$self->config->{minion}->{host};
+    $addr    .= ':'.$self->config->{minion}->{port} if defined $self->config->{minion}->{port};
     $addr    .= '/'.$self->config->{minion}->{database};
     $self->plugin('Minion' => {Pg => $addr});
 
+    # Themes handling
+    shift @{$self->renderer->paths};
+    shift @{$self->static->paths};
+    if ($config->{theme} ne 'default') {
+        my $theme = $self->home->rel_dir('themes/'.$config->{theme});
+        push @{$self->renderer->paths}, $theme.'/templates' if -d $theme.'/templates';
+        push @{$self->static->paths}, $theme.'/public' if -d $theme.'/public';
+    }
+    push @{$self->renderer->paths}, $self->home->rel_dir('themes/default/templates');
+    push @{$self->static->paths}, $self->home->rel_dir('themes/default/public');
+
+    # Internationalization
+    my $lib = $self->home->rel_dir('themes/'.$config->{theme}.'/lib');
+    eval qq(use lib "$lib");
+    $self->plugin('I18N');
+
+    # Debug
+    $self->plugin('DebugDumperHelper');
+
     # Add new MIME type
     $self->types->type(txt => 'text/plain; charset=utf-8');
 
     # Helpers
-    $self->helper(
-        debug => sub {
-            my $c = shift;
-            $c->app->log->debug($c->dumper(\@_));
-        }
-    );
-
     $self->helper(
         pg => sub {
             my $c     = shift;
             my $addr  = 'postgresql://';
-            $addr    .= $c->config->{db}->{user};
-            $addr    .= ':'.$c->config->{db}->{pwd};
-            $addr    .= '@'.$c->config->{db}->{host};
+            $addr    .= $c->config->{db}->{host};
+            $addr    .= ':'.$c->config->{db}->{port} if defined $c->config->{db}->{port};
             $addr    .= '/'.$c->config->{db}->{database};
             state $pg = Mojo::Pg->new($addr);
+            $pg->password($c->config->{db}->{pwd});
+            $pg->username($c->config->{db}->{user});
+            return $pg;
         }
     );
 
     $self->helper(
         ep => sub {
             my $c     = shift;
-            state $ep = Etherpad::API->new($c->config->{ep});
+            state $ep = Etherpad->new($c->config->{ep});
+            return $ep;
         }
     );
 
@@ -163,6 +179,9 @@ sub startup {
         }
     );
 
+    # Check Etherpad connection
+    $self->app->ep->check_token();
+
     # Database migration
     my $migrations = Mojo::Pg::Migrations->new(pg => $self->pg);
     if ($self->mode eq 'development') {

lib/Padro/Command/theme.pm

@@ -0,0 +1,99 @@
+# vim:set sw=4 ts=4 sts=4 ft=perl expandtab:
+package Padro::Command::theme;
+use Mojo::Base 'Mojolicious::Commands';
+use FindBin qw($Bin);
+use File::Spec qw(catfile cat dir);
+use File::Path qw(make_path);
+
+has description => 'Create new theme skeleton.';
+has usage => sub { shift->extract_usage };
+has message    => sub { shift->extract_usage . "\nCreate new theme skeleton:\n" };
+has namespaces => sub { ['Padro::Command::theme'] };
+
+sub run {
+    my $c    = shift;
+    my $name = shift;
+
+    unless (defined $name) {
+        say $c->extract_usage;
+        exit 1;
+    }
+
+    my $home = File::Spec->catdir($Bin, '..', 'themes', $name);
+
+    unless (-d $home) {
+
+        # Create skeleton
+        mkdir $home;
+        mkdir File::Spec->catdir($home, 'public');
+        make_path(File::Spec->catdir($home, 'templates', 'layouts'));
+        make_path(File::Spec->catdir($home, 'lib', 'Padro', 'I18N'));
+
+        my $i18n = <<EOF;
+# vim:set sw=4 ts=4 sts=4 ft=perl expandtab:
+package Padro::I18N;
+
+use base 'Locale::Maketext';
+use File::Basename qw/dirname/;
+use Locale::Maketext::Lexicon {
+    _auto => 1,
+    _decode => 1,
+    _style  => 'gettext',
+    '*' => [
+        Gettext => dirname(__FILE__) . '/I18N/*.po',
+        Gettext => dirname(__FILE__) . '/../../../default/lib/Padro/I18N/*.po',
+    ]
+};
+
+1;
+EOF
+
+        open my $f, '>', File::Spec->catfile($home, 'lib', 'Padro', 'I18N.pm') or die "Unable to open $home/lib/Padro/I18N.pm: $!";
+        print $f $i18n;
+        close $f;
+
+        my $makefile = <<EOF;
+EN=lib/Padro/I18N/en.po
+FR=lib/Padro/I18N/fr.po
+SEDOPTS=-e "s\@SOME DESCRIPTIVE TITLE\@Padro language file\@" \\
+        -e "s\@YEAR THE PACKAGE'S COPYRIGHT HOLDER\@2015 Luc Didry\@" \\
+        -e "s\@CHARSET\@utf8\@" \\
+        -e "s\@the PACKAGE package\@the Padro package\@" \\
+        -e '/^\\#\\. (/{N;/\\n\\#\\. (/{N;/\\n.*\\.\\.\\/default\\//{s/\\#\\..*\\n.*\\#\\./\\#. (/g}}}' \\
+        -e '/^\\#\\. (/{N;/\\n.*\\.\\.\\/default\\//{s/\\n/ /}}' 
+SEDOPTS2=-e '/^\\#.*\\.\\.\\/default\\//,+3d'
+XGETTEXT=carton exec ../../local/bin/xgettext.pl
+CARTON=carton exec
+
+locales:
+        \$(XGETTEXT) -D templates -D ../default/templates -o \$(EN) 2>/dev/null
+        \$(XGETTEXT) -D templates -D ../default/templates -o \$(FR) 2>/dev/null
+        sed \$(SEDOPTS) -i \$(EN)
+        sed \$(SEDOPTS2) -i \$(EN)
+        sed \$(SEDOPTS) -i \$(FR)
+        sed \$(SEDOPTS2) -i \$(FR)
+EOF
+
+        open $f, '>', File::Spec->catfile($home, 'Makefile') or die "Unable to open $home/Makefile: $!";
+        print $f $makefile;
+        close $f;
+    } else {
+        say "$name theme already exists. Aborting.";
+        exit 1;
+    }
+}
+
+=encoding utf8
+
+=head1 NAME
+
+Padro::Command::theme - Create new theme skeleton.
+
+=head1 SYNOPSIS
+
+  Usage: script/padro theme THEME_NAME
+
+  Your new theme will be available in the themes directory.
+=cut
+
+1;

script/application

@@ -0,0 +1,10 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+
+use lib 'lib';
+
+# Start command line interface for application
+require Mojolicious::Commands;
+Mojolicious::Commands->start_app('Padro');

script/padro

@@ -8,4 +8,4 @@ BEGIN { unshift @INC, "$FindBin::Bin/../lib" }
 
 # Start command line interface for application
 require Mojolicious::Commands;
-Mojolicious::Commands->start_app('Padro');
+Mojolicious::Commands->start_app('Mounter');

themes/default/lib/Padro/I18N.pm

@@ -0,0 +1,12 @@
+package Padro::I18N;
+
+use base 'Locale::Maketext';
+use File::Basename qw/dirname/;
+use Locale::Maketext::Lexicon {
+    _auto => 1,
+    _decode => 1,
+    _style  => 'gettext',
+    '*' => [Gettext => dirname(__FILE__) . '/I18N/*.po']
+};
+
+1;