Handle Unicode correctly

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

diff --git a/lib/Gruntmaster/Page/Base.pm b/lib/Gruntmaster/Page/Base.pm
index b328d2b257fbfa84a36478a8fad500a46e8cef71..cf29eacc3c56962148f012739c16bc36b0260aee 100644 (file)
--- a/lib/Gruntmaster/Page/Base.pm
+++ b/lib/Gruntmaster/Page/Base.pm
@@ -4,7 +4,6 @@ use 5.014000;
 use strict;
 use warnings;
 
-use Encode qw/encode/;
 use File::Slurp qw/read_file/;
 use HTML::Template::Compiled;
 
@@ -13,6 +12,9 @@ use HTML::Template::Compiled;
 use POSIX ();
 use Gruntmaster::Data ();
 use List::Util ();
+use LWP::UserAgent;
+
+my $ua = LWP::UserAgent->new;
 
 sub import {
        my $caller = caller;
@@ -27,7 +29,13 @@ sub import {
        *{"${caller}::TITLE"} = sub () { $title };
        *{"${caller}::debug"} = sub {
                local $Log::Log4perl::caller_depth = $Log::Log4perl::caller_depth + 1;
-               $_[0]->({qw/level debug message/ => $_[1]})
+               $_[0]->{'psgix.logger'}->({qw/level debug message/ => $_[1]})
+       };
+       *{"${caller}::reply"} = sub { [200, ['Content-Type' => 'text/plain'], [ @_ ] ] };
+       *{"${caller}::purge"} = sub {
+               return unless $ENV{PURGE_HOST};
+               my $req = HTTP::Request->new(PURGE => "http://$ENV{PURGE_HOST}$_[0]");
+               $ua->request($req)
        };
 }
 
@@ -75,8 +83,8 @@ my %orig_header_templates = (
 
 <div class="container-fluid">
 
-<div id="subtitle">TITLE_GOES_HERE</div>
-
+<h1 id="title">TITLE_GOES_HERE</h1>
+<div id="result"></div>
 HTML
 );
 
@@ -137,7 +145,9 @@ sub generate{
 
        my $htc = HTML::Template::Compiled->new(scalarref => \$templates{$self}{$lang}, default_escape => 'HTML',);
        $self->_generate($htc, $lang, @args);
-       [200, ['Content-Type' => 'text/html', 'Content-Language' => $_[1], 'Vary' => 'Accept-Language'], [ encode 'UTF-8' => $htc->output ] ]
+       my $out = $htc->output;
+       utf8::downgrade($out);
+       [200, ['Content-Type' => 'text/html', 'Content-Language' => $_[1], 'Vary' => 'Accept-Language', 'X-Forever' => 1], [ $out ] ]
 }
 
 sub _generate {}