Compare commits
49
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
654ff61789 | ||
|
|
d340a27585 | ||
|
|
5d3e3eaf3b | ||
|
|
d63632735f | ||
|
|
90f8df88a9 | ||
|
|
fe963f6511 | ||
|
|
9be62a9c2c | ||
|
|
7f072b88be | ||
|
|
0faf79001b | ||
|
|
f22529d42e | ||
|
|
abcd8c3293 | ||
|
|
7ba4f4bf5c | ||
|
|
593d9d1640 | ||
|
|
5e8ade81e4 | ||
|
|
70231b1bce | ||
|
|
77c6298a99 | ||
|
|
01e6647cbf | ||
|
|
22eba8d3c5 | ||
|
|
f68a82f774 | ||
|
|
cb908430e5 | ||
|
|
7cd976ea79 | ||
|
|
1708622c49 | ||
|
|
380cea8aa2 | ||
|
|
9217818ad2 | ||
|
|
02fce2bfdd | ||
|
|
a7da6f3292 | ||
|
|
c736f2ed2d | ||
|
|
7bccefd01b | ||
|
|
cccf6078c1 | ||
|
|
408cba6c35 | ||
|
|
c1afea55a9 | ||
|
|
88041ec8b0 | ||
|
|
1fe6401667 | ||
|
|
c00f8934de | ||
|
|
d4902f8bf0 | ||
|
|
4225658dbc | ||
|
|
d45efa5405 | ||
|
|
f3e65cedce | ||
|
|
906c68db34 | ||
|
|
c7012a1be0 | ||
|
|
5e7728270f | ||
|
|
7618cacaa4 | ||
|
|
80340f9950 | ||
|
|
fb396704bf | ||
|
|
1d9ea654e9 | ||
|
|
3ec7366d6e | ||
|
|
a5e72c7526 | ||
|
|
6146b1f2f5 | ||
|
|
5116c191f3 |
+3
-1
@@ -1,8 +1,10 @@
|
|||||||
language: perl
|
language: perl
|
||||||
install:
|
install:
|
||||||
- cpanm Mojolicious Template
|
- cpanm -n Mojolicious
|
||||||
|
- cpanm -n Template
|
||||||
script: HARNESS_IS_VERBOSE=1 prove -v -Ilib t
|
script: HARNESS_IS_VERBOSE=1 prove -v -Ilib t
|
||||||
perl:
|
perl:
|
||||||
|
- "5.16"
|
||||||
- "5.14"
|
- "5.14"
|
||||||
- "5.12"
|
- "5.12"
|
||||||
- "5.10"
|
- "5.10"
|
||||||
|
|||||||
@@ -1,6 +1,73 @@
|
|||||||
Revision history for Mojolicious::Plugin::TtRenderer
|
Revision history for Mojolicious::Plugin::TtRenderer
|
||||||
|
|
||||||
{{$NEXT}}
|
{{$NEXT}}
|
||||||
|
|
||||||
|
1.46 May 19, 2013
|
||||||
|
- Mojolicious 4.0 compatability
|
||||||
|
|
||||||
|
1.45 April 26, 2013
|
||||||
|
- correctly support app->default->{layout} (GH#37, Fayland Lam)
|
||||||
|
|
||||||
|
1.44 April 13, 2013
|
||||||
|
- promote development changes to production
|
||||||
|
|
||||||
|
1.43_01 April 11, 2013
|
||||||
|
- _template_modified returns value from super class instead of 1 if true (GH#36, Fayland Lam)
|
||||||
|
|
||||||
|
1.43 April 8, 2013
|
||||||
|
- promote development changes
|
||||||
|
|
||||||
|
1.42_04 April 6, 2013
|
||||||
|
- Updated meta for new github repo location
|
||||||
|
|
||||||
|
1.42_03 March 22, 2013
|
||||||
|
- Allow custom relative paths for cache_dir (GH#35, Jason Crowther)
|
||||||
|
|
||||||
|
1.42_02 February 26, 2013
|
||||||
|
- only create COMPILE_DIR based on UID if the user doesn't specify COMPILE_DIR
|
||||||
|
|
||||||
|
1.42_01 February 24, 2013
|
||||||
|
- set COMPILE_DIR based on UID so that multiple users can use TtRenderer with default config
|
||||||
|
|
||||||
|
1.42 February 24, 2013
|
||||||
|
- fix for test on solaris
|
||||||
|
|
||||||
|
1.41 February 23, 2013
|
||||||
|
- Additional testing diagnostics
|
||||||
|
|
||||||
|
1.40 February 20, 2013
|
||||||
|
- Added diagnostic for IO loop implementation in testing
|
||||||
|
|
||||||
|
1.39 January 28, 2013
|
||||||
|
- Documentation updates.
|
||||||
|
|
||||||
|
1.38 January 27, 2013
|
||||||
|
- fixed but where DATA templates were not being rendered with empty renderer path
|
||||||
|
|
||||||
|
1.37 January 12, 2013
|
||||||
|
- fix default_template2.t to use temp directory for COMPILE_DIR
|
||||||
|
|
||||||
|
1.36 January 9, 2013
|
||||||
|
- Use $provider->fetch to find templates (GH#34)
|
||||||
|
|
||||||
|
1.35 December 30, 2012
|
||||||
|
- Documentation fix
|
||||||
|
|
||||||
|
1.34 December 29, 2012
|
||||||
|
- Include META.json in distribution.
|
||||||
|
|
||||||
|
1.33 December 27, 2012
|
||||||
|
- Fix hang in t/deep_recursion.t on *BSD
|
||||||
|
|
||||||
|
1.32 December 27, 2012
|
||||||
|
- silenced a few annoying warnings during test
|
||||||
|
- use temp directory for COMPILE_DIR in tests to avoid failures if the
|
||||||
|
default compile directory already exists and is owned by someone else.
|
||||||
|
|
||||||
|
1.31 December 26, 2012
|
||||||
|
- Set locale "C" in tests that rely on it
|
||||||
|
|
||||||
|
1.30 December 22, 2012
|
||||||
- Don't rely on English locale in the test t/tt_plugin_lite_app.t
|
- Don't rely on English locale in the test t/tt_plugin_lite_app.t
|
||||||
|
|
||||||
1.29 December 18, 2012
|
1.29 December 18, 2012
|
||||||
|
|||||||
+14
-11
@@ -6,17 +6,17 @@ Mojolicious::Plugin::TtRenderer - Template Renderer Plugin
|
|||||||
|
|
||||||
=head1 SYNOPSIS
|
=head1 SYNOPSIS
|
||||||
|
|
||||||
# Mojolicious
|
# Mojolicious
|
||||||
$self->plugin('tt_renderer');
|
$self->plugin('tt_renderer');
|
||||||
$self->plugin(tt_renderer => {template_options => {FILTERS => [ ... ]}});
|
$self->plugin(tt_renderer => {template_options => {FILTERS => [ ... ]}});
|
||||||
|
|
||||||
# Mojolicious::Lite
|
# Mojolicious::Lite
|
||||||
plugin 'tt_renderer';
|
plugin 'tt_renderer';
|
||||||
plugin tt_renderer => {template_options => {FILTERS => [ ... ]}};
|
plugin tt_renderer => {template_options => {FILTERS => [ ... ]}};
|
||||||
|
|
||||||
=head1 DESCRIPTION
|
=head1 DESCRIPTION
|
||||||
|
|
||||||
L<Mojolicous::Plugin::TtRenderer> is a simple loader for
|
L<Mojolicious::Plugin::TtRenderer> is a simple loader for
|
||||||
L<Mojolicious::Plugin::TtRenderer::Engine>.
|
L<Mojolicious::Plugin::TtRenderer::Engine>.
|
||||||
|
|
||||||
=head1 METHODS
|
=head1 METHODS
|
||||||
@@ -26,7 +26,7 @@ L<Mojolicious::Plugin> and implements the following new ones.
|
|||||||
|
|
||||||
=head2 C<register>
|
=head2 C<register>
|
||||||
|
|
||||||
$plugin->register;
|
$plugin->register;
|
||||||
|
|
||||||
Register renderer in L<Mojolicious> application.
|
Register renderer in L<Mojolicious> application.
|
||||||
|
|
||||||
@@ -34,11 +34,14 @@ Register renderer in L<Mojolicious> application.
|
|||||||
|
|
||||||
The current controller instance can be accessed as C<c>.
|
The current controller instance can be accessed as C<c>.
|
||||||
|
|
||||||
[% c.req.headers.host %]
|
[% c.req.headers.host %]
|
||||||
|
|
||||||
=head1 SEE ALSO
|
=head1 SEE ALSO
|
||||||
|
|
||||||
L<Mojolicious::Plugin::TtRenderer::Engine>, L<Mojolicious>, L<Mojolicious::Guides>, L<http://mojolicious.org>.
|
L<Mojolicious::Plugin::TtRenderer::Engine>,
|
||||||
|
L<Mojolicious>,
|
||||||
|
L<Mojolicious::Guides>,
|
||||||
|
L<http://mojolicious.org>.
|
||||||
|
|
||||||
=head1 AUTHOR
|
=head1 AUTHOR
|
||||||
|
|
||||||
@@ -55,7 +58,7 @@ L<https://github.com/abh/mojox-renderer-tt/issues?state=open>.
|
|||||||
|
|
||||||
You can find documentation for this module with the perldoc command.
|
You can find documentation for this module with the perldoc command.
|
||||||
|
|
||||||
perldoc Mojolicious::Plugin::TtRenderer
|
perldoc Mojolicious::Plugin::TtRenderer
|
||||||
|
|
||||||
You can also look for information at:
|
You can also look for information at:
|
||||||
|
|
||||||
|
|||||||
@@ -5,6 +5,8 @@ license = Perl_5
|
|||||||
copyright_holder = Ask Bjørn Hansen
|
copyright_holder = Ask Bjørn Hansen
|
||||||
# copyright_year = 2009
|
# copyright_year = 2009
|
||||||
|
|
||||||
|
version = 1.46
|
||||||
|
|
||||||
[Prereqs]
|
[Prereqs]
|
||||||
Mojolicious = 3.33
|
Mojolicious = 3.33
|
||||||
Template = 2.18
|
Template = 2.18
|
||||||
@@ -12,6 +14,9 @@ Template = 2.18
|
|||||||
[Prereqs / TestRequires ]
|
[Prereqs / TestRequires ]
|
||||||
Test::More = 0
|
Test::More = 0
|
||||||
|
|
||||||
|
[NextRelease]
|
||||||
|
format = %-7v %{MMMM d, yyyy}d
|
||||||
|
|
||||||
[@Git]
|
[@Git]
|
||||||
tag_format = release/%v
|
tag_format = release/%v
|
||||||
# push_to = all
|
# push_to = all
|
||||||
@@ -22,15 +27,15 @@ remove = Readme
|
|||||||
remove = Manifest
|
remove = Manifest
|
||||||
|
|
||||||
[MetaResources]
|
[MetaResources]
|
||||||
bugtracker.web = https://github.com/abh/mojox-renderer-tt/issues
|
bugtracker.web = https://github.com/plicease/mojox-renderer-tt/issues
|
||||||
repository.web = http://github.com/abh/mojox-renderer-tt
|
repository.web = http://github.com/plicease/mojox-renderer-tt
|
||||||
repository.url = git://github.com/abh/mojox-renderer-tt.git
|
repository.url = git://github.com/plicease/mojox-renderer-tt.git
|
||||||
repository.type = git
|
repository.type = git
|
||||||
|
|
||||||
[Homepage]
|
[Homepage]
|
||||||
|
|
||||||
[BumpVersionFromGit]
|
;[BumpVersionFromGit]
|
||||||
version_regexp = ^release/(.*)
|
;version_regexp = ^release/(.*)
|
||||||
|
|
||||||
[PkgVersion]
|
[PkgVersion]
|
||||||
|
|
||||||
@@ -51,7 +56,6 @@ location = root
|
|||||||
|
|
||||||
[Manifest]
|
[Manifest]
|
||||||
|
|
||||||
[NextRelease]
|
|
||||||
format = %-7v %{MMMM d, yyyy}d
|
|
||||||
|
|
||||||
[MinimumPerl]
|
[MinimumPerl]
|
||||||
|
|
||||||
|
[MetaJSON]
|
||||||
|
|||||||
@@ -32,17 +32,17 @@ Mojolicious::Plugin::TtRenderer - Template Renderer Plugin
|
|||||||
|
|
||||||
=head1 SYNOPSIS
|
=head1 SYNOPSIS
|
||||||
|
|
||||||
# Mojolicious
|
# Mojolicious
|
||||||
$self->plugin('tt_renderer');
|
$self->plugin('tt_renderer');
|
||||||
$self->plugin(tt_renderer => {template_options => {FILTERS => [ ... ]}});
|
$self->plugin(tt_renderer => {template_options => {FILTERS => [ ... ]}});
|
||||||
|
|
||||||
# Mojolicious::Lite
|
# Mojolicious::Lite
|
||||||
plugin 'tt_renderer';
|
plugin 'tt_renderer';
|
||||||
plugin tt_renderer => {template_options => {FILTERS => [ ... ]}};
|
plugin tt_renderer => {template_options => {FILTERS => [ ... ]}};
|
||||||
|
|
||||||
=head1 DESCRIPTION
|
=head1 DESCRIPTION
|
||||||
|
|
||||||
L<Mojolicous::Plugin::TtRenderer> is a simple loader for
|
L<Mojolicious::Plugin::TtRenderer> is a simple loader for
|
||||||
L<Mojolicious::Plugin::TtRenderer::Engine>.
|
L<Mojolicious::Plugin::TtRenderer::Engine>.
|
||||||
|
|
||||||
=head1 METHODS
|
=head1 METHODS
|
||||||
@@ -52,7 +52,7 @@ L<Mojolicious::Plugin> and implements the following new ones.
|
|||||||
|
|
||||||
=head2 C<register>
|
=head2 C<register>
|
||||||
|
|
||||||
$plugin->register;
|
$plugin->register;
|
||||||
|
|
||||||
Register renderer in L<Mojolicious> application.
|
Register renderer in L<Mojolicious> application.
|
||||||
|
|
||||||
@@ -60,11 +60,14 @@ Register renderer in L<Mojolicious> application.
|
|||||||
|
|
||||||
The current controller instance can be accessed as C<c>.
|
The current controller instance can be accessed as C<c>.
|
||||||
|
|
||||||
[% c.req.headers.host %]
|
[% c.req.headers.host %]
|
||||||
|
|
||||||
=head1 SEE ALSO
|
=head1 SEE ALSO
|
||||||
|
|
||||||
L<Mojolicious::Plugin::TtRenderer::Engine>, L<Mojolicious>, L<Mojolicious::Guides>, L<http://mojolicious.org>.
|
L<Mojolicious::Plugin::TtRenderer::Engine>,
|
||||||
|
L<Mojolicious>,
|
||||||
|
L<Mojolicious::Guides>,
|
||||||
|
L<http://mojolicious.org>.
|
||||||
|
|
||||||
=head1 AUTHOR
|
=head1 AUTHOR
|
||||||
|
|
||||||
@@ -81,7 +84,7 @@ L<https://github.com/abh/mojox-renderer-tt/issues?state=open>.
|
|||||||
|
|
||||||
You can find documentation for this module with the perldoc command.
|
You can find documentation for this module with the perldoc command.
|
||||||
|
|
||||||
perldoc Mojolicious::Plugin::TtRenderer
|
perldoc Mojolicious::Plugin::TtRenderer
|
||||||
|
|
||||||
You can also look for information at:
|
You can also look for information at:
|
||||||
|
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ use Mojo::ByteStream 'b';
|
|||||||
use Template ();
|
use Template ();
|
||||||
use Cwd qw/abs_path/;
|
use Cwd qw/abs_path/;
|
||||||
use Scalar::Util 'weaken';
|
use Scalar::Util 'weaken';
|
||||||
|
use POSIX ':errno_h';
|
||||||
|
|
||||||
__PACKAGE__->attr('tt');
|
__PACKAGE__->attr('tt');
|
||||||
|
|
||||||
@@ -33,7 +34,7 @@ sub _init {
|
|||||||
if($dir=$args{cache_dir}) {
|
if($dir=$args{cache_dir}) {
|
||||||
|
|
||||||
if($app && substr($dir,0,1) ne '/') {
|
if($app && substr($dir,0,1) ne '/') {
|
||||||
$dir=$app->home->rel_dir('tmp/ctpl');
|
$dir=$app->home->rel_dir($dir);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -41,21 +42,24 @@ sub _init {
|
|||||||
# take and process options :-)
|
# take and process options :-)
|
||||||
|
|
||||||
my @renderer_paths = $app ? map { abs_path($_) } grep { -d $_ } @{ $app->renderer->paths } : ();
|
my @renderer_paths = $app ? map { abs_path($_) } grep { -d $_ } @{ $app->renderer->paths } : ();
|
||||||
|
push @renderer_paths, 'templates';
|
||||||
|
|
||||||
my %config = (
|
my %config = (
|
||||||
( @renderer_paths > 0
|
INCLUDE_PATH => \@renderer_paths,
|
||||||
? (INCLUDE_PATH => [@renderer_paths, 'templates'])
|
COMPILE_EXT => '.ttc',
|
||||||
: ()
|
UNICODE => 1,
|
||||||
),
|
ENCODING => 'utf-8',
|
||||||
COMPILE_EXT => '.ttc',
|
CACHE_SIZE => 128,
|
||||||
COMPILE_DIR => ($dir || abs_path(File::Spec->tmpdir)),
|
RELATIVE => 1,
|
||||||
UNICODE => 1,
|
|
||||||
ENCODING => 'utf-8',
|
|
||||||
CACHE_SIZE => 128,
|
|
||||||
RELATIVE => 1,
|
|
||||||
%{$args{template_options} || {}},
|
%{$args{template_options} || {}},
|
||||||
);
|
);
|
||||||
|
|
||||||
|
$config{COMPILE_DIR} //= $dir || do {
|
||||||
|
my $tmpdir = File::Spec->catdir(File::Spec->tmpdir, "ttr$<");
|
||||||
|
mkdir $tmpdir unless -d $tmpdir;
|
||||||
|
$tmpdir;
|
||||||
|
};
|
||||||
|
|
||||||
$config{LOAD_TEMPLATES} =
|
$config{LOAD_TEMPLATES} =
|
||||||
[Mojolicious::Plugin::TtRenderer::Provider->new(%config, renderer => $app->renderer)]
|
[Mojolicious::Plugin::TtRenderer::Provider->new(%config, renderer => $app->renderer)]
|
||||||
unless $config{LOAD_TEMPLATES};
|
unless $config{LOAD_TEMPLATES};
|
||||||
@@ -77,21 +81,40 @@ sub _render {
|
|||||||
$t = 'inline' if defined $inline;
|
$t = 'inline' if defined $inline;
|
||||||
return unless $t;
|
return unless $t;
|
||||||
|
|
||||||
|
|
||||||
my $helper = Mojolicious::Plugin::TtRenderer::Helper->new(ctx => $c);
|
my $helper = Mojolicious::Plugin::TtRenderer::Helper->new(ctx => $c);
|
||||||
|
|
||||||
# Purge previous result
|
# Purge previous result
|
||||||
$$output = '';
|
$$output = '';
|
||||||
|
|
||||||
|
# fixes for t/lite_app_with_default_layouts.t
|
||||||
|
unless ($c->stash->{layout}) {
|
||||||
|
$c->stash->{content} ||= $c->stash->{'mojo.content'}->{content};
|
||||||
|
}
|
||||||
|
|
||||||
my @params = ({%{$c->stash}, c => $c, h => $helper}, $output, {binmode => ':utf8'});
|
my @params = ({%{$c->stash}, c => $c, h => $helper}, $output, {binmode => ':utf8'});
|
||||||
my $provider = $self->tt->{SERVICE}->{CONTEXT}->{LOAD_TEMPLATES}->[0];
|
my $provider = $self->tt->{SERVICE}->{CONTEXT}->{LOAD_TEMPLATES}->[0];
|
||||||
$provider->options($options);
|
$provider->options($options);
|
||||||
$provider->ctx($c);
|
$provider->ctx($c);
|
||||||
$provider->not_found(0);
|
|
||||||
|
|
||||||
my $ok = $self->tt->process(defined $inline ? \$inline : $t, @params);
|
my $ok = do {
|
||||||
|
if (defined $inline) {
|
||||||
|
$self->tt->process(\$inline, @params);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
my @ret = $provider->fetch($t);
|
||||||
|
|
||||||
return 0 if $provider->not_found;
|
if (not defined $ret[1]) {
|
||||||
|
$self->tt->process($ret[0], @params);
|
||||||
|
}
|
||||||
|
elsif (not defined $ret[0]) { # not found
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
else { # error
|
||||||
|
return 0 if $! == ENOENT && (not ref $ret[0]); # not found when not blessed exception
|
||||||
|
die $ret[0];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
# Error
|
# Error
|
||||||
die $self->tt->error unless $ok;
|
die $self->tt->error unless $ok;
|
||||||
@@ -155,12 +178,10 @@ sub new {
|
|||||||
sub renderer { @_ > 1 ? $_[0]->{renderer} = $_[1] : $_[0]->{renderer} }
|
sub renderer { @_ > 1 ? $_[0]->{renderer} = $_[1] : $_[0]->{renderer} }
|
||||||
sub ctx { @_ > 1 ? $_[0]->{ctx} = $_[1] : $_[0]->{ctx} }
|
sub ctx { @_ > 1 ? $_[0]->{ctx} = $_[1] : $_[0]->{ctx} }
|
||||||
sub options { @_ > 1 ? $_[0]->{options} = $_[1] : $_[0]->{options} }
|
sub options { @_ > 1 ? $_[0]->{options} = $_[1] : $_[0]->{options} }
|
||||||
sub not_found { @_ > 1 ? $_[0]->{not_found} = $_[1] : $_[0]->{not_found} }
|
|
||||||
|
|
||||||
sub _template_modified {
|
sub _template_modified {
|
||||||
my($self, $template) = @_;
|
my($self, $template) = @_;
|
||||||
return 1 if $self->SUPER::_template_modified($template);
|
$self->SUPER::_template_modified($template) || $template =~ /^templates(?:\/|\\)/;
|
||||||
return $template =~ /^templates(?:\/|\\)/;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
sub _template_content {
|
sub _template_content {
|
||||||
@@ -183,7 +204,6 @@ sub _template_content {
|
|||||||
# Try DATA section
|
# Try DATA section
|
||||||
if(defined $options) {
|
if(defined $options) {
|
||||||
$data = $self->renderer->get_data_template($options);
|
$data = $self->renderer->get_data_template($options);
|
||||||
$self->not_found(1) unless defined $data;
|
|
||||||
} else {
|
} else {
|
||||||
my $loader = Mojo::Loader->new;
|
my $loader = Mojo::Loader->new;
|
||||||
foreach my $class (@{ $self->renderer->classes }) {
|
foreach my $class (@{ $self->renderer->classes }) {
|
||||||
@@ -213,27 +233,27 @@ Mojolicious::Plugin::TtRenderer::Engine - Template Toolkit renderer for Mojo
|
|||||||
|
|
||||||
Add the handler:
|
Add the handler:
|
||||||
|
|
||||||
sub startup {
|
sub startup {
|
||||||
...
|
...
|
||||||
|
|
||||||
|
# Via mojolicious plugin
|
||||||
|
$self->plugin(tt_renderer => {template_options => {FILTERS => [ ... ]}});
|
||||||
|
|
||||||
|
# Or manually
|
||||||
|
use Mojolicious::Plugin::TtRenderer::Engine;
|
||||||
|
|
||||||
|
my $tt = Mojolicious::Plugin::TtRenderer::Engine->build(
|
||||||
|
mojo => $self,
|
||||||
|
template_options => {
|
||||||
|
PROCESS => 'tpl/wrapper',
|
||||||
|
FILTERS => [ ... ],
|
||||||
|
UNICODE => 1,
|
||||||
|
ENCODING => 'UTF-8',
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
# Via mojolicious plugin
|
$self->renderer->add_handler( tt => $tt );
|
||||||
$self->plugin(tt_renderer => {template_options => {FILTERS => [ ... ]}});
|
}
|
||||||
|
|
||||||
# Or manually
|
|
||||||
use Mojolicious::Plugin::TtRenderer::Engine;
|
|
||||||
|
|
||||||
my $tt = Mojolicious::Plugin::TtRenderer::Engine->build(
|
|
||||||
mojo => $self,
|
|
||||||
template_options => {
|
|
||||||
PROCESS => 'tpl/wrapper',
|
|
||||||
FILTERS => [ ... ],
|
|
||||||
UNICODE => 1,
|
|
||||||
ENCODING => 'UTF-8',
|
|
||||||
}
|
|
||||||
);
|
|
||||||
|
|
||||||
$self->renderer->add_handler( tt => $tt );
|
|
||||||
}
|
|
||||||
|
|
||||||
Template parameter are taken from C< $c->stash >.
|
Template parameter are taken from C< $c->stash >.
|
||||||
|
|
||||||
@@ -243,20 +263,20 @@ The template file for C<"example/welcome"> would be C<"templates/welcome.html.tt
|
|||||||
|
|
||||||
When template file is not available rendering from C<__DATA__> is attempted.
|
When template file is not available rendering from C<__DATA__> is attempted.
|
||||||
|
|
||||||
__DATA__
|
__DATA__
|
||||||
|
|
||||||
@@ welcome.html.tt
|
@@ welcome.html.tt
|
||||||
Welcome, [% user.name %]!
|
Welcome, [% user.name %]!
|
||||||
|
|
||||||
Inline template is also supported:
|
Inline template is also supported:
|
||||||
|
|
||||||
$self->render(inline => '[% 1 + 1 %]', handler => 'tt');
|
$self->render(inline => '[% 1 + 1 %]', handler => 'tt');
|
||||||
|
|
||||||
=head1 HELPERS
|
=head1 HELPERS
|
||||||
|
|
||||||
Helpers are exported automatically under C<h> namespace.
|
Helpers are exported automatically under C<h> namespace.
|
||||||
|
|
||||||
[% h.url_for('index') %]
|
[% h.url_for('index') %]
|
||||||
|
|
||||||
=head1 METHODS
|
=head1 METHODS
|
||||||
|
|
||||||
@@ -274,7 +294,11 @@ object. When used the INCLUDE_PATH will be set to
|
|||||||
|
|
||||||
=item template_options
|
=item template_options
|
||||||
|
|
||||||
A hash reference of options that are passed to Template->new().
|
A hash reference of options that are passed to Template->new(). Note that if you
|
||||||
|
specify an C<INCLUDE_PATH> through this option it will remove the DATA section
|
||||||
|
templates from your path. A better way to specify an C<INCLUDE_PATH> if you also
|
||||||
|
want to use DATA section templates it by manipulting the L<Mojolicious::Renderer>
|
||||||
|
path.
|
||||||
|
|
||||||
=item cache_dir
|
=item cache_dir
|
||||||
|
|
||||||
@@ -283,18 +307,19 @@ templates. Will default to a temp-dir if not set.
|
|||||||
|
|
||||||
=back
|
=back
|
||||||
|
|
||||||
|
=head1 SEE ALSO
|
||||||
|
|
||||||
|
L<Mojolicious::Plugin::TtRenderer::Engine>,
|
||||||
|
L<Mojolicious>,
|
||||||
|
L<Mojolicious::Guides>,
|
||||||
|
L<http://mojolicious.org>.
|
||||||
|
|
||||||
=head1 AUTHOR
|
=head1 AUTHOR
|
||||||
|
|
||||||
Current maintainer: Graham Ollis C<< <plicease@cpan.org> >>
|
Current maintainer: Graham Ollis C<< <plicease@cpan.org> >>
|
||||||
|
|
||||||
Original author: Ask Bjørn Hansen, C<< <ask at develooper.com> >>
|
Original author: Ask Bjørn Hansen, C<< <ask at develooper.com> >>
|
||||||
|
|
||||||
=head1 TODO
|
|
||||||
|
|
||||||
* Better support non-Mojolicious frameworks
|
|
||||||
* Better way to pass parameters to the templates? (stash)
|
|
||||||
* More sophisticated default search path?
|
|
||||||
|
|
||||||
=head1 BUGS
|
=head1 BUGS
|
||||||
|
|
||||||
Please report any bugs or feature requests to the project's github issue tracker
|
Please report any bugs or feature requests to the project's github issue tracker
|
||||||
@@ -304,7 +329,7 @@ L<https://github.com/abh/mojox-renderer-tt/issues?state=open>.
|
|||||||
|
|
||||||
You can find documentation for this module with the perldoc command.
|
You can find documentation for this module with the perldoc command.
|
||||||
|
|
||||||
perldoc Mojolicious::Plugin::TtRenderer::Engine
|
perldoc Mojolicious::Plugin::TtRenderer::Engine
|
||||||
|
|
||||||
You can also look for information at:
|
You can also look for information at:
|
||||||
|
|
||||||
|
|||||||
@@ -7,4 +7,3 @@ BEGIN {
|
|||||||
use_ok( 'Mojolicious::Plugin::TtRenderer::Engine' );
|
use_ok( 'Mojolicious::Plugin::TtRenderer::Engine' );
|
||||||
}
|
}
|
||||||
|
|
||||||
diag( "Testing Mojolicious::Plugin::TtRenderer::Engine $Mojolicious::Plugin::TtRenderer::Engine::VERSION, Perl $], $^X" );
|
|
||||||
|
|||||||
@@ -0,0 +1,11 @@
|
|||||||
|
use strict;
|
||||||
|
use warnings;
|
||||||
|
use Test::More tests => 1;
|
||||||
|
use Mojo::IOLoop;
|
||||||
|
|
||||||
|
my $loop = eval { Mojo::IOLoop->singleton };
|
||||||
|
diag $@ if $@;
|
||||||
|
ok $loop;
|
||||||
|
diag ref eval { $loop->reactor };
|
||||||
|
diag $@ if $@;
|
||||||
|
|
||||||
+17
-3
@@ -7,15 +7,29 @@ use warnings;
|
|||||||
|
|
||||||
use utf8;
|
use utf8;
|
||||||
|
|
||||||
use Test::More tests => 3;
|
use Test::More;
|
||||||
|
|
||||||
use Mojolicious::Lite;
|
use Mojolicious::Lite;
|
||||||
use Test::Mojo;
|
use Test::Mojo;
|
||||||
|
use File::Temp qw( tempdir );
|
||||||
|
use File::Spec;
|
||||||
|
|
||||||
# Silence
|
if($Mojolicious::VERSION >= 4.0)
|
||||||
|
{
|
||||||
|
plan skip_all => 'test broken in mojo 4.0';
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
plan tests => 3;
|
||||||
|
}
|
||||||
|
|
||||||
|
# Send log to tmp file so that it doesn't clutter up the screen.
|
||||||
app->log->level('fatal');
|
app->log->level('fatal');
|
||||||
|
app->log->path(do {
|
||||||
|
File::Spec->catfile(tempdir(CLEANUP => 1), 'mojo.log');
|
||||||
|
});
|
||||||
|
|
||||||
plugin 'tt_renderer';
|
plugin 'tt_renderer' => {template_options => { COMPILE_DIR => tempdir( CLEANUP => 1 ) }};
|
||||||
|
|
||||||
get '/exception' => sub { die };
|
get '/exception' => sub { die };
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,52 @@
|
|||||||
|
use strict;
|
||||||
|
use warnings;
|
||||||
|
use Test::More tests => 9;
|
||||||
|
use Test::Mojo;
|
||||||
|
use File::Temp qw( tempdir );
|
||||||
|
use FindBin '$Bin';
|
||||||
|
|
||||||
|
use Mojolicious::Lite;
|
||||||
|
use Mojolicious::Plugin::TtRenderer::Engine ();
|
||||||
|
|
||||||
|
my $tt = Mojolicious::Plugin::TtRenderer::Engine->build(
|
||||||
|
mojo => app,
|
||||||
|
template_options => {
|
||||||
|
UNICODE => 1,
|
||||||
|
ENCODING => 'UTF-8',
|
||||||
|
#INCLUDE_PATH => "$Bin/templates",
|
||||||
|
COMPILE_DIR => tempdir( CLEANUP => 1 ),
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
app->renderer->add_handler(tt => $tt);
|
||||||
|
app->renderer->default_handler('tt');
|
||||||
|
|
||||||
|
get '/' => sub {
|
||||||
|
die 'foo';
|
||||||
|
};
|
||||||
|
|
||||||
|
get '/bar' => 'bar';
|
||||||
|
|
||||||
|
get '/grimlock' => 'grimlock';
|
||||||
|
|
||||||
|
my $t = Test::Mojo->new;
|
||||||
|
|
||||||
|
$t->get_ok('/')
|
||||||
|
->status_is(500)
|
||||||
|
->content_like(qr{foo});
|
||||||
|
|
||||||
|
$t->get_ok('/bar')
|
||||||
|
->status_is(200)
|
||||||
|
->content_like(qr{bar});
|
||||||
|
|
||||||
|
$t->get_ok('/grimlock')
|
||||||
|
->status_is(200)
|
||||||
|
->content_like(qr{King});
|
||||||
|
|
||||||
|
__DATA__
|
||||||
|
|
||||||
|
@@ index.html.tt
|
||||||
|
anything
|
||||||
|
|
||||||
|
@@ bar.html.tt
|
||||||
|
sometimes, the bar, he eats you...
|
||||||
@@ -1,7 +1,8 @@
|
|||||||
use strict;
|
use strict;
|
||||||
use warnings;
|
use warnings;
|
||||||
use Test::More tests => 3;
|
use Test::More tests => 9;
|
||||||
use Test::Mojo;
|
use Test::Mojo;
|
||||||
|
use File::Temp qw( tempdir );
|
||||||
|
|
||||||
use Mojolicious::Lite;
|
use Mojolicious::Lite;
|
||||||
|
|
||||||
@@ -10,8 +11,8 @@ app->plugin(
|
|||||||
tt_renderer => {
|
tt_renderer => {
|
||||||
template_options => {
|
template_options => {
|
||||||
# These options are specific to TT
|
# These options are specific to TT
|
||||||
INCLUDE_PATH => 'templates',
|
#INCLUDE_PATH => 'templates',
|
||||||
COMPILE_DIR => 'templates_c',
|
COMPILE_DIR => tempdir( CLEANUP => 1 ),
|
||||||
COMPILE_EXT => '.ttc',
|
COMPILE_EXT => '.ttc',
|
||||||
# ... anything else to be passed on to TT should go here
|
# ... anything else to be passed on to TT should go here
|
||||||
},
|
},
|
||||||
@@ -24,13 +25,29 @@ get '/' => sub {
|
|||||||
die 'foo';
|
die 'foo';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
get '/bar' => 'bar';
|
||||||
|
|
||||||
|
get '/grimlock' => 'grimlock';
|
||||||
|
|
||||||
my $t = Test::Mojo->new;
|
my $t = Test::Mojo->new;
|
||||||
|
|
||||||
$t->get_ok('/')
|
$t->get_ok('/')
|
||||||
->status_is(500)
|
->status_is(500)
|
||||||
->content_like(qr{foo});
|
->content_like(qr{foo});
|
||||||
|
|
||||||
|
$t->get_ok('/bar')
|
||||||
|
->status_is(200)
|
||||||
|
->content_like(qr{bar});
|
||||||
|
|
||||||
|
$t->get_ok('/grimlock')
|
||||||
|
->status_is(200)
|
||||||
|
->content_like(qr{King});
|
||||||
|
|
||||||
__DATA__
|
__DATA__
|
||||||
|
|
||||||
@@ index.html.tt
|
@@ index.html.tt
|
||||||
anything
|
anything
|
||||||
|
|
||||||
|
@@ bar.html.tt
|
||||||
|
sometimes, the bar, he eats you...
|
||||||
|
|
||||||
@@ -0,0 +1,40 @@
|
|||||||
|
use strict;
|
||||||
|
use warnings;
|
||||||
|
use File::Temp qw( tempdir );
|
||||||
|
BEGIN { $ENV{MOJO_HOME} = tempdir( CLEANUP => 1) }
|
||||||
|
use Test::More tests => 6;
|
||||||
|
use Test::Mojo;
|
||||||
|
|
||||||
|
use Mojolicious::Lite;
|
||||||
|
plugin 'tt_renderer' => { template_options => { COMPILE_DIR => tempdir( CLEANUP => 1 ) } };
|
||||||
|
app->renderer->default_handler('tt');
|
||||||
|
|
||||||
|
get '/' => sub {
|
||||||
|
die 'foo';
|
||||||
|
};
|
||||||
|
|
||||||
|
get '/bar' => 'bar';
|
||||||
|
|
||||||
|
my $t = Test::Mojo->new;
|
||||||
|
|
||||||
|
$t->get_ok('/')
|
||||||
|
->status_is(500)
|
||||||
|
->content_like(qr{foo});
|
||||||
|
|
||||||
|
$t->app->log->on(message => sub {
|
||||||
|
my($log, $level, @lines) = @_;
|
||||||
|
diag @lines if $level eq 'error';
|
||||||
|
});
|
||||||
|
|
||||||
|
$t->get_ok('/bar')
|
||||||
|
->status_is(200)
|
||||||
|
->content_like(qr{sometimes, the bar,});
|
||||||
|
|
||||||
|
__DATA__
|
||||||
|
|
||||||
|
@@ index.html.tt
|
||||||
|
anything
|
||||||
|
|
||||||
|
@@ bar.html.tt
|
||||||
|
sometimes, the bar, he eats you...
|
||||||
|
|
||||||
+2
-1
@@ -12,13 +12,14 @@ use Test::More tests => 39;
|
|||||||
use Mojolicious::Lite;
|
use Mojolicious::Lite;
|
||||||
use Mojo::ByteStream 'b';
|
use Mojo::ByteStream 'b';
|
||||||
use Test::Mojo;
|
use Test::Mojo;
|
||||||
|
use File::Temp qw( tempdir );
|
||||||
|
|
||||||
# Silence
|
# Silence
|
||||||
app->log->level('fatal');
|
app->log->level('fatal');
|
||||||
|
|
||||||
use_ok('Mojolicious::Plugin::TtRenderer::Engine');
|
use_ok('Mojolicious::Plugin::TtRenderer::Engine');
|
||||||
|
|
||||||
plugin 'tt_renderer' => {template_options => {PRE_CHOMP => 1, POST_CHOMP => 1, TRIM => 1}};
|
plugin 'tt_renderer' => {template_options => {PRE_CHOMP => 1, POST_CHOMP => 1, TRIM => 1, COMPILE_DIR => tempdir( CLEANUP => 1 ) }};
|
||||||
|
|
||||||
get '/exception' => 'error';
|
get '/exception' => 'error';
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,37 @@
|
|||||||
|
#!/usr/bin/env perl
|
||||||
|
|
||||||
|
use strict;
|
||||||
|
use warnings;
|
||||||
|
|
||||||
|
BEGIN { $ENV{MOJO_MODE}='testing'; };
|
||||||
|
|
||||||
|
use utf8;
|
||||||
|
|
||||||
|
use Test::More tests => 3;
|
||||||
|
|
||||||
|
use Mojolicious::Lite;
|
||||||
|
use Mojo::ByteStream 'b';
|
||||||
|
use Test::Mojo;
|
||||||
|
use File::Temp qw( tempdir );
|
||||||
|
|
||||||
|
# Silence
|
||||||
|
app->log->level('fatal');
|
||||||
|
|
||||||
|
use_ok('Mojolicious::Plugin::TtRenderer::Engine');
|
||||||
|
|
||||||
|
plugin 'tt_renderer' => {template_options => {PRE_CHOMP => 1, POST_CHOMP => 1, TRIM => 1, COMPILE_DIR => tempdir( CLEANUP => 1 ) }};
|
||||||
|
app->defaults(layout => 'wrapper');
|
||||||
|
|
||||||
|
get '/test' => 'test';
|
||||||
|
|
||||||
|
my $t = Test::Mojo->new;
|
||||||
|
|
||||||
|
$t->get_ok('/test')->content_is("WS-hello-EW");
|
||||||
|
|
||||||
|
__DATA__
|
||||||
|
|
||||||
|
@@ test.html.tt
|
||||||
|
hello
|
||||||
|
|
||||||
|
@@ layouts/wrapper.html.tt
|
||||||
|
WS-[%- content -%]-EW
|
||||||
+2
-1
@@ -11,6 +11,7 @@ use Test::More tests => 6;
|
|||||||
|
|
||||||
use Mojolicious::Lite;
|
use Mojolicious::Lite;
|
||||||
use Test::Mojo;
|
use Test::Mojo;
|
||||||
|
use File::Temp qw( tempdir );
|
||||||
|
|
||||||
# Silence
|
# Silence
|
||||||
app->log->level('fatal');
|
app->log->level('fatal');
|
||||||
@@ -18,7 +19,7 @@ app->log->level('fatal');
|
|||||||
my @paths = map { app->home->rel_dir($_) } "templates/multiple_first", "templates/multiple_second";
|
my @paths = map { app->home->rel_dir($_) } "templates/multiple_first", "templates/multiple_second";
|
||||||
app->renderer->paths([@paths]);
|
app->renderer->paths([@paths]);
|
||||||
|
|
||||||
plugin 'TtRenderer';
|
plugin 'TtRenderer' => {template_options => { COMPILE_DIR => tempdir( CLEANUP => 1 ) }};
|
||||||
|
|
||||||
get '/first' => 'first';
|
get '/first' => 'first';
|
||||||
get '/second' => 'second';
|
get '/second' => 'second';
|
||||||
|
|||||||
@@ -0,0 +1 @@
|
|||||||
|
Me Grimlock King!
|
||||||
+16
-4
@@ -5,12 +5,22 @@
|
|||||||
use strict;
|
use strict;
|
||||||
use warnings;
|
use warnings;
|
||||||
|
|
||||||
use File::Temp;
|
BEGIN {
|
||||||
|
unless($^O eq 'MSWin32') {
|
||||||
|
eval '# line '. __LINE__ . ' "' . __FILE__ . qq("\n). q{
|
||||||
|
use POSIX qw( setlocale LC_ALL );
|
||||||
|
setlocale(LC_ALL, 'C');
|
||||||
|
};
|
||||||
|
warn $@ if $@;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
use File::Temp qw( tempdir );
|
||||||
use Mojo::IOLoop;
|
use Mojo::IOLoop;
|
||||||
use Test::More;
|
use Test::More;
|
||||||
|
|
||||||
# Use a clean temporary directory
|
# Use a clean temporary directory
|
||||||
BEGIN { $ENV{MOJO_TMPDIR} ||= File::Temp::tempdir }
|
BEGIN { $ENV{MOJO_TMPDIR} ||= tempdir( CLEANUP => 1) }
|
||||||
|
|
||||||
# Make sure sockets are working
|
# Make sure sockets are working
|
||||||
plan skip_all => 'working sockets required for this test!'
|
plan skip_all => 'working sockets required for this test!'
|
||||||
@@ -24,7 +34,7 @@ use Mojolicious::Lite;
|
|||||||
use Test::Mojo;
|
use Test::Mojo;
|
||||||
|
|
||||||
# POD renderer plugin
|
# POD renderer plugin
|
||||||
plugin 'tt_renderer';
|
plugin 'tt_renderer' => {template_options => { COMPILE_DIR => tempdir( CLEANUP => 1 ) }};
|
||||||
|
|
||||||
# Silence
|
# Silence
|
||||||
app->log->level('error');
|
app->log->level('error');
|
||||||
@@ -41,10 +51,12 @@ my $t = Test::Mojo->new;
|
|||||||
# Simple TT template
|
# Simple TT template
|
||||||
$t->get_ok('/')->status_is(200)
|
$t->get_ok('/')->status_is(200)
|
||||||
->content_like(qr/test123456/);
|
->content_like(qr/test123456/);
|
||||||
$t->get_ok('/blow')->status_is(500)->content_like(qr/file error - doesnotexist.tt:/);
|
$t->get_ok('/blow')->status_is(500)->content_like(qr/file error - doesnotexist\.tt: No such file or directory/);
|
||||||
|
|
||||||
if(eval q{ use Devel::Cycle; 1 })
|
if(eval q{ use Devel::Cycle; 1 })
|
||||||
{
|
{
|
||||||
|
# ignore warnings coming from Devel::Cycle
|
||||||
|
local $SIG{__WARN__} = sub { };
|
||||||
Devel::Cycle::find_cycle(app, sub {
|
Devel::Cycle::find_cycle(app, sub {
|
||||||
my $arg = shift;
|
my $arg = shift;
|
||||||
# Template::Provider (from which M::P::T::Provider inherits) has some cycles which are freed manaully by
|
# Template::Provider (from which M::P::T::Provider inherits) has some cycles which are freed manaully by
|
||||||
|
|||||||
+1
-1
@@ -20,7 +20,7 @@ use_ok 'Foo';
|
|||||||
|
|
||||||
push @{app->renderer->classes}, 'Foo';
|
push @{app->renderer->classes}, 'Foo';
|
||||||
|
|
||||||
plugin 'tt_renderer' => {template_options => {PRE_CHOMP => 1, POST_CHOMP => 1, TRIM => 1}};
|
plugin 'tt_renderer' => {template_options => {PRE_CHOMP => 1, POST_CHOMP => 1, TRIM => 1, COMPILE_DIR => tempdir( CLEANUP => 1 )}};
|
||||||
|
|
||||||
app->log->level('fatal');
|
app->log->level('fatal');
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user