[Jifty-commit] r2414 - in Template-Declare: t

[jifty-commit at lists.jifty.org]

Author: clkao
Date: Wed Dec 20 17:59:32 2006
New Revision: 2414

Modified:
   Template-Declare/lib/Template/Declare.pm
   Template-Declare/t/roots.t

Log:
failing tests for non-toplevel templates.

Modified: Template-Declare/lib/Template/Declare.pm
==============================================================================
--- Template-Declare/lib/Template/Declare.pm	(original)
+++ Template-Declare/lib/Template/Declare.pm	Wed Dec 20 17:59:32 2006
@@ -79,14 +79,19 @@
     my $template_name = shift;
     my $show_private  = shift || 0;
 
-    foreach my $package (reverse @{Template::Declare->roots}) {
-    if ( my $coderef = $package->can( _template_name_to_sub($template_name) ) ) {
-        return $coderef;
-    }
-
-    elsif ($show_private and $coderef =$package->can( _template_name_to_private_sub($template_name) )) {
-        return $coderef;
-    }
+    foreach my $package ( reverse @{ Template::Declare->roots } ) {
+        if ( my $coderef
+            = $package->can( _template_name_to_sub($template_name) ) )
+        {
+            return $coderef;
+        }
+
+        elsif ( $show_private
+            and $coderef
+            = $package->can( _template_name_to_private_sub($template_name) ) )
+        {
+            return $coderef;
+        }
     }
     return undef;
 }

Modified: Template-Declare/t/roots.t
==============================================================================
--- Template-Declare/t/roots.t	(original)
+++ Template-Declare/t/roots.t	Wed Dec 20 17:59:32 2006
@@ -20,6 +20,9 @@
     };
 };
 
+package Wifty::UI::something;
+use base 'Wifty::UI';
+
 package Baseclass::UI;
 use base qw/Template::Declare/;
 use Template::Declare::Tags;
@@ -48,7 +51,7 @@
 use Template::Declare::Tags;
 Template::Declare->init(roots => ['Baseclass::UI', 'Wifty::UI']);
 
-use Test::More qw/no_plan/;
+use Test::More tests => 10;
 use HTML::Lint;
 
 {
@@ -81,6 +84,13 @@
     ok_lint($simple);
 }
 
+{
+    local $Template::Declare::Tags::BUFFER;
+    my $simple = ( show('something/simple') );
+    like( $simple, qr'This is child class content' );
+    ok_lint($simple);
+}
+
 sub ok_lint {
     my $html = shift;