simplify renderer requirements

mojolicious · Aug 23, 2012 · 3fee419 · 3fee419
1 parent d3c0725
commit 3fee419
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/lib/Mojolicious/Guides/Rendering.pod b/lib/Mojolicious/Guides/Rendering.pod
@@ -887,11 +887,8 @@ do is add a new C<handler>.
       # One time use inline template
       my $inline = $options->{inline};
 
-      # Generate relative template path
-      my $name = $r->template_name($options);
-
       # Try to find appropriate template in DATA section
-      my $content = $r->get_data_template($options, $name);
+      my $content = $r->get_data_template($options);
 
       # Generate absolute template path
       my $path = $r->template_path($options);

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

diff --git a/lib/Mojolicious/Renderer.pm b/lib/Mojolicious/Renderer.pm
@@ -43,7 +43,7 @@ sub add_helper {
 }
 
 sub get_data_template {
-  my ($self, $options, $template) = @_;
+  my ($self, $options) = @_;
 
   # Index DATA templates
   my $loader = Mojo::Loader->new;
@@ -55,6 +55,7 @@ sub get_data_template {
   }
 
   # Find template
+  my $template = $self->template_name($options);
   return $loader->data($self->{index}{$template}, $template);
 }
 
@@ -343,7 +344,7 @@ Register a new helper.
     template       => 'foo/bar',
     format         => 'html',
     handler        => 'epl'
-  }, 'foo.html.ep');
+  });
 
 Get a C<DATA> section template by name, usually used by handlers.