X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FPlack%2FApp%2FGruntmaster.pm;h=56f0ec11c19912ec2a7f20141bb2b4f604f41a45;hb=c039d63e2d631c200f73ae59de2a7d1e66debc71;hp=c8b04f3873a9bace214ef2620b3e6a87259dc0cf;hpb=e4d5bdf52a921932551c051df63ea8087d2037da;p=gruntmaster-page.git

diff --git a/lib/Plack/App/Gruntmaster.pm b/lib/Plack/App/Gruntmaster.pm
index c8b04f3..56f0ec1 100644
--- a/lib/Plack/App/Gruntmaster.pm
+++ b/lib/Plack/App/Gruntmaster.pm
@@ -52,7 +52,9 @@ use constant FORMAT_EXTENSION => {
 use constant NOT_FOUND => [404, ['Content-Type' => 'text/plain'], ['Not found']];
 use constant FORBIDDEN => [401, ['Content-Type' => 'text/plain', 'WWW-Authenticate' => 'Basic realm="Gruntmaster 6000"'], ['Forbidden']];
 
-my $env;
+sub development() { ($ENV{PLACK_ENV} // 'development') eq 'development' }
+
+my ($env, $privacy);
 
 sub db { $env->{'gruntmaster.dbic'} }
 
@@ -71,22 +73,26 @@ sub user    { db->user    ($_{user})    }
 sub redirect { [301, ['X-Forever' => 1, 'Location' => $_[0]], []] }
 sub reply    { [200, ['Content-Type' => 'text/plain'], \@_] }
 sub response {
-	my ($template, $title, $params) = @_;
+	my ($template, $title, $params, $maxage) = @_;
 	unless ($params) {
 		$params = $title;
 		$title = 'No title';
 	}
 	$params->{time} = time;
-	bless {template => $template, title => $title, params => $params}, __PACKAGE__.'::Response'
+	bless {template => $template, title => $title, params => $params, maxage => ($maxage // 1)}, __PACKAGE__.'::Response'
 }
 
-sub forbid   {
-	return if !shift || admin;
+sub forbid {
+	my ($condition) = @_;
+	$privacy = 'private' if $condition;
+	return if !$condition || admin;
 	unwind FORBIDDEN, SUB UP
 }
 
 sub dispatch_request{
 	$env = $_[PSGI_ENV];
+	$privacy = 'public';
+
 	sub (GET) {
 		sub (/css/:theme) {
 			my $theme = $_{theme};
@@ -94,14 +100,14 @@ sub dispatch_request{
 			my $css = read_file "css/themes/$theme.css";
 			$css .= read_file $_ for <css/*.css>;
 			my @headers = ('X-Forever' => 1, 'Cache-Control' => 'public, max-age=604800', 'Content-Type' => 'text/css');
-			[200, \@headers, [CSS::Minifier::XS::minify $css]]
+			[200, \@headers, [development ? $css : CSS::Minifier::XS::minify $css]]
 		},
 
 		sub (/js.js) {
 			my $js;
 			$js .= read_file $_ for <js/*.js>;
 			my @headers = ('X-Forever' => 1, 'Cache-Control' => 'public, max-age=604800', 'Content-Type' => 'application/javascript');
-			[200, \@headers, [JavaScript::Minifier::XS::minify $js]]
+			[200, \@headers, [development ? $js : JavaScript::Minifier::XS::minify $js]]
 		},
 
 		sub (/src/:job) {
@@ -123,25 +129,23 @@ sub dispatch_request{
 			response_filter { return shift }
 		},
 
-		sub () {
+		sub (?:format~) {
+			my $format = lc ($_{format} // '');
 			response_filter {
 				my ($r) = @_;
 				return $r if ref $r ne 'Plack::App::Gruntmaster::Response';
-				return [200, ['Content-Type' => 'application/json', 'X-Forever' => 1], [encode 'UTF-8', encode_json $r->{params}]] if $env->{HTTP_ACCEPT} =~ m,^\s*application/json\s*$,g;
+				my @hdrs = ('X-Forever' => 1, 'Cache-Control' => "$privacy, max-age=$r->{maxage}");
+				return [200, ['Content-Type' => 'application/json', @hdrs], [encode_json $r->{params}]] if $format eq 'json';
 				my $ret = render $r->{template}, 'en', title => $r->{title}, %{$r->{params}};
-				[200, ['Content-Type' => 'text/html'], [encode 'UTF-8', $ret]]
+				[200, ['Content-Type' => 'text/html', @hdrs], [encode 'UTF-8', $ret]]
 			},
 		},
 
-		sub (/st/) {
-			response st => 'Standings', { st => [db->standings] }
-		},
-
 		sub (/st/:contest) {
 			response st => 'Standings', {
-				st => [ db->standings($_{contest}) ],
-				problems => [map { $_->problem } contest->contest_problems]
-			}
+				st => [ contest->standings ],
+				problems => [map { $_->problem } contest->contest_problems],
+			}, 10
 		},
 
 		sub (/ct/:contest/log/st) { redirect "/st/$_{contest}" },
@@ -167,7 +171,7 @@ sub dispatch_request{
 		},
 
 		sub (/) { redispatch_to '/index' },
-		sub (/:article) { [200, ['Content-Type' => 'text/html'], [render_article $_{article}, 'en']] }
+		sub (/:article) { [200, ['Content-Type' => 'text/html', 'Cache-Control' => 'public, max-age=60', 'X-Forever' => 1], [render_article $_{article}, 'en']] }
 	},
 
 	sub (POST) {
@@ -180,6 +184,7 @@ sub dispatch_request{
 			db->users->create({id => $_{username}, name => $_{name}, email => $_{email}, phone => $_{phone}, town => $_{town}, university => $_{university}, level => $_{level}});
 			db->user($_{username})->set_passphrase($_{password});
 
+			purge '/us/';
 			reply 'Registered successfully';
 		},
 
@@ -212,6 +217,7 @@ sub dispatch_request{
 				owner => remote_user->id,
 			});
 
+			purge '/log/';
 			redirect $_{contest} ? "/log/?contest=$_{contest}" : '/log/';
 		}
 	}