From 928a611fa7fa8f1eb3c8689dd6f83890bf190728 Mon Sep 17 00:00:00 2001 From: Marius Gavrilescu Date: Thu, 6 Aug 2015 12:45:09 +0300 Subject: [PATCH] Remove X-Static support --- lib/Plack/App/Gruntmaster.pm | 9 ++++----- lib/Plack/App/Gruntmaster/HTML.pm | 2 -- tmpl/pb_entry.en | 4 ++-- tmpl/skel.en | 3 +-- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/lib/Plack/App/Gruntmaster.pm b/lib/Plack/App/Gruntmaster.pm index 2ccbeb5..4872da5 100644 --- a/lib/Plack/App/Gruntmaster.pm +++ b/lib/Plack/App/Gruntmaster.pm @@ -98,11 +98,10 @@ sub dispatch_request{ response_filter { my ($r) = @_; return $r if ref $r ne 'Plack::App::Gruntmaster::Response'; - my $vary = 'X-Static'; - $vary .= ', Authorization' if $privacy eq 'private'; - my @hdrs = ('X-Forever' => 1, 'Cache-Control' => "$privacy, max-age=$r->{maxage}", Vary => $vary); + my @hdrs = ('X-Forever' => 1, 'Cache-Control' => "$privacy, max-age=$r->{maxage}"); + push @hdrs, Vary => 'Authorization' if $privacy eq 'private'; 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}}, maybe static => $env->{HTTP_X_STATIC}; + my $ret = render $r->{template}, 'en', title => $r->{title}, %{$r->{params}}; [200, ['Content-Type' => 'text/html; charset=utf-8', @hdrs], [encode 'UTF-8', $ret]] }, }, @@ -167,7 +166,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, Vary => 'X-Static'], [render_article $_{article}, 'en', maybe static => $env->{HTTP_X_STATIC}]] } + sub (/:article) { [200, ['Content-Type' => 'text/html; charset=utf-8', 'Cache-Control' => 'public, max-age=3600', 'X-Forever' => 1], [render_article $_{article}, 'en']] } }, sub (POST) { diff --git a/lib/Plack/App/Gruntmaster/HTML.pm b/lib/Plack/App/Gruntmaster/HTML.pm index 3af0608..f08b66b 100644 --- a/lib/Plack/App/Gruntmaster/HTML.pm +++ b/lib/Plack/App/Gruntmaster/HTML.pm @@ -91,8 +91,6 @@ sub _render { $tree->defmap(smap => \%args); my $process = __PACKAGE__->can("process_$tmpl"); $process->($tree, %args) if $process; - $_->detach for $tree->look_down(static => $args{static} ? 'no' : 'yes'); - $_->attr('static', undef) for $tree->look_down(sub {$_[0]->attr('static')}); $_->attr('smap', undef) for $tree->look_down(sub {$_[0]->attr('smap')}); $tree->as_HTML(undef, undef, $optional_end_tags); } diff --git a/tmpl/pb_entry.en b/tmpl/pb_entry.en index ec801c6..8f42d1b 100644 --- a/tmpl/pb_entry.en +++ b/tmpl/pb_entry.en @@ -13,14 +13,14 @@ Job log
Solution -

Submit solution

+

Submit solution

The contest has finished.
To submit solutions to this problem, please visit the problem outside the contest.
-
+
diff --git a/tmpl/skel.en b/tmpl/skel.en index d2d070f..3533f56 100644 --- a/tmpl/skel.en +++ b/tmpl/skel.en @@ -14,14 +14,13 @@