Import some changes from the mindcoding branch

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

diff --git a/lib/Gruntmaster/Page/Base.pm b/lib/Gruntmaster/Page/Base.pm
index 84d74510638108fd11117d166353bb883270dda0..1a68b3c2b48658513d8796ad02cad0434ac8327b 100644 (file)
--- a/lib/Gruntmaster/Page/Base.pm
+++ b/lib/Gruntmaster/Page/Base.pm
@@ -3,7 +3,7 @@ package Gruntmaster::Page::Base;
 use 5.014000;
 use strict;
 use warnings;
-our $VERSION = '0.001';
+our $VERSION = '5999.000_001';
 
 use File::Slurp qw/read_file/;
 use HTML::Template::Compiled;
@@ -32,7 +32,6 @@ sub footer{
 ##################################################
 
 use POSIX ();
-use Gruntmaster::Data ();
 use List::Util ();
 use LWP::UserAgent;
 use Plack::Request ();
@@ -50,7 +49,6 @@ sub import_to {
        feature->import(':5.14');
        warnings->import;
        File::Slurp->export_to_level(1, $caller, qw/read_file/);
-       Gruntmaster::Data->export_to_level(1, $caller);
        List::Util->export_to_level(1, $caller, qw/sum/);
 
        no strict 'refs';
@@ -61,6 +59,7 @@ sub import_to {
                local $Log::Log4perl::caller_depth = $Log::Log4perl::caller_depth + 1;
                $_[0]->{'psgix.logger'}->({qw/level debug message/ => $_[1]})
        };
+       *{"${caller}::db"} = sub { $_[0]->{'gruntmaster.dbic'} };
        *{"${caller}::reply"} = sub { [200, ['Content-Type' => 'text/plain', 'Cache-Control' => 'no-cache'], [ @_ ] ] };
        *{"${caller}::purge"} = sub {
                return unless $ENV{PURGE_HOST};
@@ -89,7 +88,8 @@ sub generate{
        my $htc = HTML::Template::Compiled->new(scalarref => \$templates{$self}{$lang}, default_escape => 'HTML', use_perl => 1);
        $self->_generate($htc, $lang, @args);
        my $out = $htc->output;
-       utf8::downgrade($out);
+       utf8::decode($out) for 1 .. 3;
+       utf8::encode($out);
        my $vary = 'Accept-Language, ' . $self->vary;
        [200, ['Content-Type' => 'text/html', 'Content-Language' => $_[1], 'Vary' => $vary, 'X-Forever' => 1, 'Cache-Control' => 'max-age=' . $self->max_age], [ $out ] ]
 }