fixed small line directive bug in Mojo::Template

mojolicious · May 13, 2013 · 9c53f86 · 9c53f86
1 parent 92d1cf7
commit 9c53f86
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/Changes b/Changes
@@ -53,6 +53,7 @@
   - Fixed layout bugs in Mojolicious::Renderer.
   - Fixed support for HEAD request method in Mojo::Server::CGI and
     Mojo::Server::PSGI.
+  - Fixed small line directive bug in Mojo::Template.
   - Fixed small limit bug in Mojo::Message.
 
 3.97  2013-04-25

diff --git a/lib/Mojo/Template.pm b/lib/Mojo/Template.pm
@@ -99,7 +99,9 @@ sub compile {
 
   # Compile with line directive
   return undef unless my $code = $self->code;
-  my $compiled = eval qq{#line 1 "@{[$self->name]}"\n$code};
+  my $name = $self->name;
+  $name =~ s/"//g;
+  my $compiled = eval qq{#line 1 "$name"\n$code};
   $self->compiled($compiled) and return undef unless $@;
 
   # Use local stacktrace for compile exceptions

diff --git a/lib/Mojolicious/Plugin/EPLRenderer.pm b/lib/Mojolicious/Plugin/EPLRenderer.pm
@@ -43,13 +43,14 @@ sub _epl {
       # Try template
       if (-r $path) {
         $log->debug(qq{Rendering template "$t".});
-        $$output = $mt->name("template $t")->render_file($path, $c);
+        $$output = $mt->name(qq{template "$t"})->render_file($path, $c);
       }
 
       # Try DATA section
       elsif (my $d = $renderer->get_data_template($options)) {
         $log->debug(qq{Rendering template "$t" from DATA section.});
-        $$output = $mt->name("template $t from DATA section")->render($d, $c);
+        $$output
+          = $mt->name(qq{template "$t" from DATA section})->render($d, $c);
       }
 
       # No template

diff --git a/t/mojo/template.t b/t/mojo/template.t
@@ -1052,16 +1052,17 @@ like "$output", qr/exception\.mt line 2/, 'right result';
 
 # Exception in file (different name)
 $mt     = Mojo::Template->new;
-$output = $mt->name('foo.mt')->render_file($file);
+$output = $mt->name('"foo.mt" from DATA section')->render_file($file);
 isa_ok $output, 'Mojo::Exception', 'right exception';
-like $output->message, qr/foo\.mt line 2/, 'message contains filename';
+like $output->message, qr/foo\.mt from DATA section line 2/,
+  'message contains filename';
 is $output->lines_before->[0][0], 1,      'right number';
 is $output->lines_before->[0][1], 'test', 'right line';
 is $output->line->[0], 2,        'right number';
 is $output->line->[1], '% die;', 'right line';
 is $output->lines_after->[0][0], 3,     'right number';
 is $output->lines_after->[0][1], '123', 'right line';
-like "$output", qr/foo\.mt line 2/, 'right result';
+like "$output", qr/foo\.mt from DATA section line 2/, 'right result';
 
 # Exception with UTF-8 context
 $mt     = Mojo::Template->new;