Update formats

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

diff --git a/lib/Gruntmaster/Page.pm b/lib/Gruntmaster/Page.pm
index 953d8ae4ab6d78c181d558cff9de3884762f4901..c7f92bbf5a599c8ba57625a7d0012b7e937d71c2 100644 (file)
--- a/lib/Gruntmaster/Page.pm
+++ b/lib/Gruntmaster/Page.pm
@@ -27,8 +27,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];
 }
 
 {
@@ -37,6 +36,8 @@ sub declaregen{
        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$,;
@@ -61,7 +62,7 @@ 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;