Move FORMAT_EXTENSION to gruntmaster-handlers

[plack-app-gruntmaster.git] / lib / Gruntmaster / Page.pm

diff --git a/lib/Gruntmaster/Page.pm b/lib/Gruntmaster/Page.pm
index 6ca62ddd5ce18cef705e2173e3b93bbf35a2cb9d..e0086507d16027ecdd5100512b83cfcf5ebb797a 100644 (file)
--- a/lib/Gruntmaster/Page.pm
+++ b/lib/Gruntmaster/Page.pm
@@ -3,14 +3,14 @@ package Gruntmaster::Page;
 use 5.014000;
 use strict;
 use warnings;
-use parent qw/Exporter/;
-our @EXPORT_OK = qw/generate/;
 
 use Fcntl qw/:flock/;
 use File::Basename qw/fileparse/;
+use File::Path qw/make_path/;
 use File::Slurp qw/write_file/;
 use IO::Compress::Gzip qw/gzip/;
 use IO::File;
+use Gruntmaster::Data qw/PUBLISH/;
 
 our $VERSION = '0.001';
 our @generators;
@@ -25,8 +25,7 @@ sub declaregen{
        my ($generator, $regex) = @_;
        $generator = "Gruntmaster::Page::$generator";
        eval "require $generator";
-       my $gensub = $generator->can('generate') or die "No such generator: $generator";
-       push @generators, [$regex,  $gensub];
+       push @generators, [$regex,  $generator];
 }
 
 {
@@ -34,20 +33,24 @@ sub declaregen{
        my $contest = qr,(?:ct/$component/)?,;
        declaregen Index                        => qr,^index$,;
        declaregen Learn                        => qr,^learn$,;
+       declaregen Account                      => qr,^account$,;
+       declaregen Us                           => qr,^us/index$,;
+       declaregen 'Us::Entry'          => qr,^us/$component$,;
        declaregen Ct                           => qr,^ct/index$,;
        declaregen 'Ct::Entry'          => qr,^ct/$component/index$,;
        declaregen St                           => qr,^ct/$component/log/st$,;
        declaregen Log                          => qr,^${contest}log/(?:\d+|index)$,;
-       declaregen 'Log::Entry' => qr,^${contest}log/$component/index$,;
+       declaregen 'Log::Entry' => qr,^${contest}log/job/$component$,;
        declaregen Submit                       => qr,^${contest}submit$,;
        declaregen Pb                           => qr,^${contest}pb/index$,;
-       declaregen 'Pb::Entry'          => qr,^${contest}pb/$component/index$,;
+       declaregen 'Pb::Entry'          => qr,^${contest}pb/$component$,;
 }
 
 sub generate{
        my ($path) = @_;
        my ($path_noext, $ext) = $path =~ m/^(.*)\.(.*)$/;
-       my $basename = fileparse $path_noext;
+       my ($basename, $directories) = fileparse $path_noext;
+       make_path $directories;
 
        IO::File->new(">$path_noext.var")->close unless -f "$path_noext.var";
        flock my $lockfh = IO::File->new("<$path_noext.var"), LOCK_EX;
@@ -57,12 +60,13 @@ sub generate{
                my ($regex, $generator) = @$gen;
                next unless $path_noext =~ $regex;
                for my $lang (@{LANGUAGES()}) {
-                       my $page = $generator->($path, $lang);
+                       my $page = $generator->generate($path, $lang);
                        write_file "$path_noext.$lang.$ext.new", $page;
                        say $typemap "URI: $basename.$lang.$ext\nContent-Language: $lang\nContent-Type: " . CONTENT_TYPES->{$ext} . "\n";
                        gzip \$page => "$path_noext.$lang.gz.$ext.new", Minimal => 1;
                        say $typemap "URI: $basename.$lang.gz.$ext\nContent-Language: $lang\nContent-Encoding: gzip\nContent-Type: " . CONTENT_TYPES->{$ext} . "\n";
                }
+               last
        }
 
        for my $lang (@{LANGUAGES()}) {