Skip to content

Commit

Permalink
Merge pull request #5 from ywatase/fix_extention_problem
Browse files Browse the repository at this point in the history
fix extension and suffix problem
  • Loading branch information
Richard Simões committed Apr 13, 2012
2 parents 831f9d1 + c00dffc commit 1f80f14
Show file tree
Hide file tree
Showing 4 changed files with 39 additions and 1 deletion.
4 changes: 3 additions & 1 deletion lib/Dancer/Template/Xslate.pm
Expand Up @@ -32,8 +32,10 @@ sub init {
$self->config->{extension} = $xslate_args{suffix}
if exists $xslate_args{suffix};

$self->config->{extension} =~ s/^\.//;

## avoid 'Text::Xslate: Unknown option(s): extension'
$xslate_args{suffix} = delete $xslate_args{extension}
$xslate_args{suffix} = '.' . delete $xslate_args{extension}
if exists $xslate_args{extension};

$self->{driver} = Text::Xslate->new(%xslate_args);
Expand Down
29 changes: 29 additions & 0 deletions t/03-cascade.t
@@ -0,0 +1,29 @@
use strict;
use warnings;
use Test::More tests => 2;
use File::Spec::Functions qw(catfile);

use Dancer::Template::Xslate;
my $engine = Dancer::Template::Xslate->new(
config =>
{
extension => 'tx',
path => [catfile(qw(t views))],
},
);

my $template = catfile(qw(t views cascade.tx));
my $result = $engine->render($template);
my $expected = "header\nbody\nfooter\n";

is $result, $expected, "cascade and extension test";

$engine = Dancer::Template::Xslate->new(
config =>
{
suffix => '.tx',
path => [catfile(qw(t views))],
},
);
$result = $engine->render($template);
is $result, $expected, "cascade and extension test";
4 changes: 4 additions & 0 deletions t/views/cascade.tx
@@ -0,0 +1,4 @@
: cascade cascade_base
: around body -> {
body
: }
3 changes: 3 additions & 0 deletions t/views/cascade_base.tx
@@ -0,0 +1,3 @@
header
: block body -> {}
footer

0 comments on commit 1f80f14

Please sign in to comment.