X-Git-Url: https://git.decadent.org.uk/gitweb/?p=maypole.git;a=blobdiff_plain;f=lib%2FMaypole%2FView%2FTT.pm;h=8759e0cba9206754a24783b7b82de80cb0e1d8f9;hp=7106b7a563f0d5593fdbe3860752aa488b1b575f;hb=0aed36464b4d092c9e32f70916fb38a1bb124ab6;hpb=28823167d12d4cd1419cc6a58900c0fc5819e1af diff --git a/lib/Maypole/View/TT.pm b/lib/Maypole/View/TT.pm index 7106b7a..8759e0c 100644 --- a/lib/Maypole/View/TT.pm +++ b/lib/Maypole/View/TT.pm @@ -3,53 +3,80 @@ use base 'Maypole::View::Base'; use Maypole::Constants; use Template; use File::Spec::Functions qw(catdir tmpdir); +use Template::Constants qw( :all ); -our $error_template; +our $error_template; { local $/; $error_template = ; } +our $VERSION = '2.13'; + +my $debug_flags = DEBUG_ON; + use strict; -our $VERSION = 2.11; sub template { - my ( $self, $r ) = @_; - - unless ($self->{tt}) { - my $view_options = $r->config->view_options || {}; - $self->{provider} = Template::Provider->new($view_options); - $self->{tt} = Template->new({ - %$view_options, - LOAD_TEMPLATES => [ $self->{provider} ], - }); + my ( $self, $r ) = @_; + unless ($self->{tt}) { + my $view_options = $r->config->view_options || { POST_CHOMP=>1, PRE_CHOMP=>1, TRIM=>1 }; + if ($r->debug) { + $view_options->{DEBUG} = $debug_flags; } - $self->{provider}->include_path([ $self->paths($r) ]); - - my $template_file = $r->template; - my $ext = $r->config->template_extension; - $template_file .= $ext if defined $ext; - - my $output; - if ($self->{tt}->process($template_file, { $self->vars($r) }, \$output )) { - $r->{output} = $output; - return OK; - } - else { - $r->{error} = "TT error for template '$template_file'\n" . $self->{tt}->error; - return ERROR; + $view_options->{POST_CHOMP} = 1 unless (exists $view_options->{POST_CHOMP}); + $self->{provider} = Template::Provider->new($view_options); + $self->{tt} = Template->new({ + %$view_options, + LOAD_TEMPLATES => [ $self->{provider} ], + }); + } + + $self->{provider}->include_path([ $self->paths($r) ]); + + my $template_file = $r->template; + + my $ext = $r->config->template_extension; + $template_file .= $ext if defined $ext; + + my $output; + my $processed_ok = eval{$self->{tt}->process($template_file, { $self->vars($r) }, \$output );}; + if ($processed_ok) { + $r->{output} = $output; + return OK; + } else { + if ($@) { + my $error = "fatal error in template '$template_file' : $@\nTT paths : " . join(', ',$self->paths($r)) . "\n"; + $r->warn($error); + $r->{error} = $error; + } else { + my $error = "TT error for template '$template_file'\n" . $self->{tt}->error . "\nTT paths : " . join(', ',$self->paths($r)) . "\n"; + $r->warn($error); + $r->{error} = $error; } + return ERROR; + } } sub report_error { my ($self, $r, $error, $type) = @_; my $output; + # Need to be very careful here. my $tt = Template->new; + unless (ref $r->{config}) { + $r->warn("no config for this request"); + $error .= '
There was a problem finding configuration for this request'; + $r->{config} ||= {}; + } + + $r->warn("report_error - reporting error to user : $error\n"); + if ($tt->process(\$error_template, - { err_type => $type, error => $error, - config => { %{$r->{config}}}, - request => $r, # We have that at least - eval{$self->vars($r)} }, \$output )) { + { err_type => $type, error => $error, + config => $r->{config}, + request => $r, + paths => [ $self->paths($r) ], + eval{$self->vars($r)} }, \$output )) { $r->{output} = $output; if ($tt->error) { $r->{output} = "Even the error template errored - ".$tt->error.""; } @@ -103,6 +130,10 @@ options. Processes the template and sets the output. See L +=item report_error + +Reports the details of an error, current state and parameters + =back =head1 TEMPLATE TOOLKIT INTRODUCTION @@ -268,6 +299,18 @@ truncate, format, escape or encode trivially. A useful selection is included with Template Toolkit and they can also be found on CPAN or can be written easily. See L. +TT provides stderr and stdout filters, which allow you to write handy macros +like this one to output debug information to your web server log, etc : + +=over 4 + +[% MACRO debug_msg(text) + FILTER stderr; "[TT debug_msg] $text\n"; END; +%] + +=back + + TT Macros allow you to reuse small blocks of content, directives, etc. The MACRO directive allows you to define a directive or directive block which is then evaluated each time the macro is called. Macros can be passed named parameters @@ -384,23 +427,32 @@ the path "[% request.path %]". The error text returned was:

Request details

- - [% FOR thing = ["model_class", "table", "template", "path", +

+ [% FOR attribute = ["model_class", "table", "template", "path", "content_type", "document_encoding", "action", "args", "objects"] %] - + + [% END %] + + + [% FOREACH param IN request.params %] + [% END %]

[%thing %]	[% - request.$thing.list.join(" , ") %]
[% attribute %]	[% + request.$attribute.list.join(" , ") %]

CGI Parameters
[% param.key %]	[% param.value %]

Website / Template Paths

+ + + +

Base URI	[% request.config.uri_base %]
Paths	[% paths %]

Application configuration

- - [% FOR thing = config.keys %] - - [% END %] +

[%thing %]

[% - config.$thing.list.join(" , ") %]

+ + + +

Model	[% request.config.model %]
View	[% request.config.view %]
Classes	[% request.config.classes.list.join(" , ") %]
Tables	[% request.config.display_tables.list.join(" , ") %]

- -