[Jifty-commit] r3263 - in Template-Declare: lib/Template lib/Template/Declare

[jifty-commit at lists.jifty.org]

Author: jesse
Date: Sat May 19 16:17:40 2007
New Revision: 3263

Modified:
   Template-Declare/   (props changed)
   Template-Declare/lib/Template/Declare.pm
   Template-Declare/lib/Template/Declare/Tags.pm

Log:
 r56979 at pinglin:  jesse | 2007-05-19 16:17:20 -0400
  * refactor refactor ok


Modified: Template-Declare/lib/Template/Declare.pm
==============================================================================
--- Template-Declare/lib/Template/Declare.pm	(original)
+++ Template-Declare/lib/Template/Declare.pm	Sat May 19 16:17:40 2007
@@ -373,8 +373,20 @@
             return $coderef;
         }
 
-        foreach my $alias_key ( @{ Template::Declare->aliases->{$package} } )
-        {
+
+        my $sub = $self->_resolve_template_aliased_from_package($template_name, $package, $show_private);  
+        return $sub  if $sub;      
+
+    }
+}
+
+sub _resolve_template_aliased_from_package {
+    my $self = shift;
+    my $template_name = shift;
+    my $package =  shift;
+    my $show_private = shift;
+
+        foreach my $alias_key ( @{ Template::Declare->aliases->{$package} } ) {
             my $alias_info   = $package->alias_metadata()->{$alias_key};
             my $alias_prefix = $alias_info->{path};
             my $alias_class  = $alias_info->{class};
@@ -384,11 +396,7 @@
 
             if ( $template_name =~ m{$alias_prefix/(.*)$} ) {
                 my $dispatch_to_template = $1;
-                if (my $coderef = $alias_class->_has_template(
-                        $dispatch_to_template, $show_private
-                    )
-                    )
-                {
+                if (my $coderef = $alias_class->_has_template( $dispatch_to_template, $show_private)) {
 
                     # We're going to force $self to the aliased class
                     return sub {
@@ -397,12 +405,7 @@
                         local $TEMPLATE_VARS->{$alias_class} = $package_vars;
                         &$coderef($alias_class);
                     };
-                } elsif (
-                    $coderef = $alias_class->resolve_template(
-                        $dispatch_to_template, $show_private
-                    )
-                    )
-                {
+                } elsif ( $coderef = $alias_class->resolve_template( $dispatch_to_template, $show_private)) {
 
                     # We're going to force $self to the aliased class
                     return sub {
@@ -416,7 +419,6 @@
             }
 
         }
-    }
 }
 
 sub _find_template_sub {

Modified: Template-Declare/lib/Template/Declare/Tags.pm
==============================================================================
--- Template-Declare/lib/Template/Declare/Tags.pm	(original)
+++ Template-Declare/lib/Template/Declare/Tags.pm	Sat May 19 16:17:40 2007
@@ -112,7 +112,7 @@
 
 =cut
 
-#sub outs { outs_raw( map { _escape_utf8($_); } grep {defined} @_ ); }
+#sub outs { outs_raw( map { _escape_html($_); } grep {defined} @_ ); }
 
 =head2 outs_raw STUFF
 
@@ -137,7 +137,7 @@
         my $returned =
             ref($item) eq 'CODE'
             ? $item->()
-            : ( $raw ? $item : _escape_utf8($item) ) || '';
+            : ( $raw ? $item : _escape_html($item) ) || '';
         my $content = Template::Declare->buffer->data || '';
         Template::Declare->end_buffer_frame;
         Template::Declare->buffer->append( $content . $returned );
@@ -289,7 +289,7 @@
     Template::Declare->new_buffer_frame;
 
     my $last = join '',    #
-        map { ref($_) ? $_ : _escape_utf8($_) }    #
+        map { ref($_) ? $_ : _escape_html($_) }    #
         $coderef->(%ATTRIBUTES);
 
     %ATTRIBUTES = ();                              # prevent leakage
@@ -351,14 +351,14 @@
             my $field = shift;
             my $val   = shift;
 
-            $buf .= ' ' . $field . q{="} . _escape_utf8($val) . q{"};
+            $buf .= ' ' . $field . q{="} . _escape_html($val) . q{"};
             wantarray ? () : '';
         };
 
         local $DEPTH = $DEPTH + 1;
         %ATTRIBUTES = ();
         Template::Declare->new_buffer_frame;
-        my $last = join '', map { ref($_) ? $_ : _escape_utf8($_) } $code->();
+        my $last = join '', map { ref($_) ? $_ : _escape_html($_) } $code->();
 
         if ( length( Template::Declare->buffer->data ) ) {
 
@@ -482,7 +482,7 @@
 
 }
 
-sub _escape_utf8 {
+sub _escape_html {
     my $val = shift;
     no warnings 'uninitialized';
     $val =~ s/&/&/g;