improve rendering of built-in templates to show actual template names…

… in log messages
mojolicious · Oct 20, 2015 · c810342 · c810342
1 parent 429563e
commit c810342
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 19 deletions.
diff --git a/Changes b/Changes
@@ -2,6 +2,8 @@
 6.25  2015-10-20
   - Improved Mojo::DOM::CSS to support selectors with leading and trailing
     whitespace.
+  - Improved rendering of built-in templates to show actual template names in
+    log messages.
   - Fixed "0" value bug in Mojo::JSON::Pointer.
 
 6.24  2015-10-13

diff --git a/lib/Mojolicious/Plugin/DefaultHelpers.pm b/lib/Mojolicious/Plugin/DefaultHelpers.pm
@@ -105,14 +105,14 @@ sub _development {
     status   => $page eq 'exception' ? 500 : 404,
     template => "$page.$mode"
   };
-  my $inline = $renderer->_bundled($mode eq 'development' ? $mode : $page);
-  return $c if _fallbacks($c, $options, $page, $inline);
-  _fallbacks($c, {%$options, format => 'html'}, $page, $inline);
+  my $bundled = 'mojo/' . ($mode eq 'development' ? $mode : $page);
+  return $c if _fallbacks($c, $options, $page, $bundled);
+  _fallbacks($c, {%$options, format => 'html'}, $page, $bundled);
   return $c;
 }
 
 sub _fallbacks {
-  my ($c, $options, $template, $inline) = @_;
+  my ($c, $options, $template, $bundled) = @_;
 
   # Mode specific template
   return 1 if $c->render_maybe(%$options);
@@ -124,7 +124,7 @@ sub _fallbacks {
   my $stash = $c->stash;
   return undef unless $stash->{format} eq 'html';
   delete @$stash{qw(extends layout)};
-  return $c->render_maybe(%$options, inline => $inline, handler => 'ep');
+  return $c->render_maybe($bundled, %$options, handler => 'ep');
 }
 
 sub _inactivity_timeout {

diff --git a/lib/Mojolicious/Plugin/PODRenderer.pm b/lib/Mojolicious/Plugin/PODRenderer.pm
@@ -77,8 +77,7 @@ sub _html {
 
   # Combine everything to a proper response
   $c->content_for(perldoc => "$dom");
-  my $template = $c->app->renderer->_bundled('perldoc');
-  $c->render(inline => $template, title => $title, parts => \@parts);
+  $c->render('mojo/perldoc', title => $title, parts => \@parts);
 }
 
 sub _perldoc {

diff --git a/lib/Mojolicious/Renderer.pm b/lib/Mojolicious/Renderer.pm
@@ -24,10 +24,8 @@ has helpers => sub { {} };
 has paths   => sub { [] };
 
 # Bundled templates
-my $HOME = Mojo::Home->new;
-$HOME->parse(
-  $HOME->parse($HOME->mojo_lib_dir)->rel_dir('Mojolicious/templates'));
-my %TEMPLATES = map { $_ => slurp $HOME->rel_file($_) } @{$HOME->list_files};
+my $TEMPLATES = Mojo::Home->new(Mojo::Home->new->mojo_lib_dir)
+  ->rel_dir('Mojolicious/templates');
 
 sub DESTROY { Mojo::Util::_teardown($_) for @{shift->{namespaces}} }
 
@@ -201,16 +199,14 @@ sub template_path {
   return undef unless my $name = $self->template_name(shift);
 
   # Search all paths
-  for my $path (@{$self->paths}) {
+  for my $path (@{$self->paths}, $TEMPLATES) {
     my $file = catfile $path, split('/', $name);
     return $file if -r $file;
   }
 
   return undef;
 }
 
-sub _bundled { $TEMPLATES{"@{[pop]}.html.ep"} }
-
 sub _extends {
   my ($self, $stash) = @_;
   my $layout = delete $stash->{layout};
@@ -240,7 +236,8 @@ sub _warmup {
 
   # Handlers for templates
   s/\.(\w+)$// and push @{$templates->{$_}}, $1
-    for map { sort @{Mojo::Home->new($_)->list_files} } @{$self->paths};
+    for map { sort @{Mojo::Home->new($_)->list_files} } @{$self->paths},
+    $TEMPLATES;
 
   # Handlers and classes for DATA templates
   for my $class (reverse @{$self->classes}) {

diff --git a/lib/Mojolicious/Static.pm b/lib/Mojolicious/Static.pm
@@ -13,8 +13,8 @@ has classes => sub { ['main'] };
 has paths   => sub { [] };
 
 # Bundled files
-my $HOME   = Mojo::Home->new;
-my $PUBLIC = $HOME->parse($HOME->mojo_lib_dir)->rel_dir('Mojolicious/public');
+my $PUBLIC = Mojo::Home->new(Mojo::Home->new->mojo_lib_dir)
+  ->rel_dir('Mojolicious/public');
 
 sub dispatch {
   my ($self, $c) = @_;

diff --git a/...Mojolicious/templates/development.html.ep → ...icious/templates/mojo/development.html.ep b/...Mojolicious/templates/development.html.ep → ...icious/templates/mojo/development.html.ep
@@ -129,7 +129,7 @@
     </style>
   </head>
   <body>
-    %= include inline => app->renderer->_bundled('mojobar')
+    %= include 'mojo/mojobar'
     <script>
       function mojoDrawer (handle, drawer) {
         $(handle).click(function () {

diff --git a/lib/Mojolicious/templates/exception.html.ep → ...olicious/templates/mojo/exception.html.ep b/lib/Mojolicious/templates/exception.html.ep → ...olicious/templates/mojo/exception.html.ep
diff --git a/lib/Mojolicious/templates/mojobar.html.ep → ...ojolicious/templates/mojo/mojobar.html.ep b/lib/Mojolicious/templates/mojobar.html.ep → ...ojolicious/templates/mojo/mojobar.html.ep
diff --git a/lib/Mojolicious/templates/not_found.html.ep → ...olicious/templates/mojo/not_found.html.ep b/lib/Mojolicious/templates/not_found.html.ep → ...olicious/templates/mojo/not_found.html.ep
diff --git a/lib/Mojolicious/templates/perldoc.html.ep → ...ojolicious/templates/mojo/perldoc.html.ep b/lib/Mojolicious/templates/perldoc.html.ep → ...ojolicious/templates/mojo/perldoc.html.ep
@@ -90,7 +90,7 @@
     </style>
   </head>
   <body>
-    %= include inline => app->renderer->_bundled('mojobar')
+    %= include 'mojo/mojobar'
     <div id="wrapperlicious">
       <div id="perldoc">
         <div id="source">