X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FPlack%2FApp%2FGruntmaster.pm;h=c02e7dd3f023cbdbd84c402f36cc0d85cabbcd06;hb=ba7920cd654e91f98dbe1a783f159974fba278d9;hp=9284acc1a8b1eae97cd01e579b894d3d4e647481;hpb=7e158d3c2f023119628265310fdb8f85d9b1c29e;p=plack-app-gruntmaster.git

diff --git a/lib/Plack/App/Gruntmaster.pm b/lib/Plack/App/Gruntmaster.pm
index 9284acc..c02e7dd 100644
--- a/lib/Plack/App/Gruntmaster.pm
+++ b/lib/Plack/App/Gruntmaster.pm
@@ -14,9 +14,6 @@ use Web::Simple;
 use Gruntmaster::Data;
 use Plack::App::Gruntmaster::HTML;
 
-use Email::Sender::Simple qw/sendmail/;
-use Email::Simple;
-
 use warnings NONFATAL => 'all';
 no warnings 'illegalproto';
 
@@ -29,6 +26,7 @@ use constant CONTENT_TYPES => +{
 	cpp => 'text/x-c++src',
 	cs => 'text/x-csharp', # Used by GNOME. Not in mime.types.
 	go => 'text/plain', # ?
+	gs => 'text/plain',
 	hs => 'text/x-haskell',
 	java => 'text/x-java',
 	pas => 'text/x-pascal',
@@ -43,6 +41,7 @@ use constant FORMAT_EXTENSION => {
 	CPP => 'cpp',
 	GCCGO => 'go',
 	GOLANG => 'go',
+	GOLFSCRIPT => 'gs',
 	HASKELL => 'hs',
 	MONO => 'cs',
 	JAVA => 'java',
@@ -114,10 +113,11 @@ sub dispatch_request{
 			response_filter {
 				my ($r) = @_;
 				return $r if ref $r ne 'Plack::App::Gruntmaster::Response';
-				my @hdrs = ('X-Forever' => 1, 'Cache-Control' => "$privacy, max-age=$r->{maxage}");
-				push @hdrs, Vary => 'Authorization' if $privacy eq 'private';
+				my $vary = 'X-Static';
+				$vary .= ', Authorization' if $privacy eq 'private';
+				my @hdrs = ('X-Forever' => 1, 'Cache-Control' => "$privacy, max-age=$r->{maxage}", Vary => $vary);
 				return [200, ['Content-Type' => 'application/json; charset=utf-8', @hdrs], [encode_json $r->{params}]] if $format eq 'json';
-				my $ret = render $r->{template}, 'en', title => $r->{title}, %{$r->{params}};
+				my $ret = render $r->{template}, 'en', title => $r->{title}, %{$r->{params}}, maybe static => $env->{HTTP_X_STATIC};
 				[200, ['Content-Type' => 'text/html; charset=utf-8', @hdrs], [encode 'UTF-8', $ret]]
 			},
 		},
@@ -182,7 +182,7 @@ sub dispatch_request{
 
 		sub (/) { redispatch_to '/index' },
 		sub (/favicon.ico) { redirect '/static/favicon.ico' },
-		sub (/:article) { [200, ['Content-Type' => 'text/html; charset=utf-8', 'Cache-Control' => 'public, max-age=3600', 'X-Forever' => 1], [render_article $_{article}, 'en']] }
+		sub (/:article) { [200, ['Content-Type' => 'text/html; charset=utf-8', 'Cache-Control' => 'public, max-age=3600', 'X-Forever' => 1, Vary => 'X-Static'], [render_article $_{article}, 'en', maybe static => $env->{HTTP_X_STATIC}]] }
 	},
 
 	sub (POST) {