X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FGruntmaster%2FPage.pm;h=e0086507d16027ecdd5100512b83cfcf5ebb797a;hb=464772b79e3a44caa340b81982c0da6c401bf04b;hp=d3d25066accaaa17ba53591b76e0755338f413a9;hpb=088a8d629e11c01e227ca2dc0c80894f1e1db997;p=plack-app-gruntmaster.git

diff --git a/lib/Gruntmaster/Page.pm b/lib/Gruntmaster/Page.pm
index d3d2506..e008650 100644
--- a/lib/Gruntmaster/Page.pm
+++ b/lib/Gruntmaster/Page.pm
@@ -3,11 +3,10 @@ package Gruntmaster::Page;
 use 5.014000;
 use strict;
 use warnings;
-use parent qw/Exporter/;
-our @EXPORT_OK = qw/generate _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;
@@ -26,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];
 }
 
 {
@@ -36,6 +34,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$,;
@@ -46,10 +46,11 @@ sub declaregen{
 	declaregen 'Pb::Entry'		=> qr,^${contest}pb/$component$,;
 }
 
-sub _generate{
+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;
@@ -59,7 +60,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;
@@ -76,10 +77,6 @@ sub _generate{
 	close $typemap;
 }
 
-sub generate{
-	PUBLISH 'genpage', shift;
-}
-
 1;
 __END__
 # Below is stub documentation for your module. You'd better edit it!