Skip to content

Commit b07a30d

Browse files
committed
Merge branch 'feature/split-template-simple'
2 parents 8a23a99 + 8c4358a commit b07a30d

File tree

4 files changed

+11
-286
lines changed

4 files changed

+11
-286
lines changed

Changes

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
* GH #530: Make data censoring configurable (Yanick Champoux, David
88
Precious)
99
* GH #1512: Log hook entries as they are executed (Yanick Champoux)
10+
* GH #1615: Remove Dancer2::Template::Simple from Dancer2 core (Jason
11+
A. Crome)
1012
* GH #1723: Enable use of a different Template Toolkit base class
1113
(Andy Beverley)
1214
* PR #1727: Don't create CPAN package files when generating new apps

lib/Dancer2/CLI/Gen.pm

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use URI;
66
use HTTP::Tiny;
77
use Path::Tiny;
88
use JSON::MaybeXS;
9-
use Dancer2::Template::Simple;
9+
use Dancer2::Template::Tiny;
1010
use Module::Runtime qw( use_module is_module_name );
1111
use CLI::Osprey
1212
desc => 'Helper script to create new Dancer2 applications';
@@ -111,6 +111,13 @@ option no_package_files => (
111111
default => 0,
112112
);
113113

114+
has _engine => (
115+
is => 'ro',
116+
default => sub {
117+
return Dancer2::Template::Tiny->new( config => { start_tag => '[d2%', end_tag => '%2d]' } );
118+
},
119+
);
120+
114121
# Last chance to validate args before we attempt to do something with them
115122
sub BUILD {
116123
my ( $self, $args ) = @_;
@@ -384,10 +391,7 @@ sub _add_to_manifest_skip {
384391
sub _process_template {
385392
my ( $self, $template, $tokens ) = @_;
386393

387-
my $engine = Dancer2::Template::Simple->new;
388-
$engine->{ start_tag } = '[d2%';
389-
$engine->{ stop_tag } = '%2d]';
390-
return $engine->render( \$template, $tokens );
394+
return $self->_engine->render( \$template, $tokens );
391395
}
392396

393397
# These are good candidates to move to Dancer2::CLI if other commands

lib/Dancer2/Template/Simple.pm

Lines changed: 0 additions & 192 deletions
This file was deleted.

t/template_simple.t

Lines changed: 0 additions & 89 deletions
This file was deleted.

0 commit comments

Comments
 (0)