[Jifty-commit] r6303 - in jifty/trunk: lib/Jifty/View/Declare

[Jifty commits]

Author: alexmv
Date: Wed Feb  4 14:55:33 2009
New Revision: 6303

Modified:
   jifty/trunk/   (props changed)
   jifty/trunk/Makefile.PL
   jifty/trunk/lib/Jifty/View/Declare/Page.pm

Log:
 r41853 at kohr-ah:  chmrr | 2009-02-04 14:55:25 -0500
  * Bump String::BufferStack dep
  * Make dep checker happy with LWP::Simple
  * Fix TD header bug, reported by c9s


Modified: jifty/trunk/Makefile.PL
==============================================================================
--- jifty/trunk/Makefile.PL	(original)
+++ jifty/trunk/Makefile.PL	Wed Feb  4 14:55:33 2009
@@ -56,7 +56,7 @@
 requires('Locale::Maketext::Extract' => '0.20');
 requires('Locale::Maketext::Lexicon' => '0.60');
 requires('Log::Log4perl' => '1.11'); # Log::Log4perl::Appender
-requires('LWP::UserAgent'); # Net::HTTP
+requires('LWP::UserAgent'); # Net::HTTP LWP::Simple
 requires('MIME::Types');
 requires('Module::Pluggable' => '3.5'); # Module::Pluggable::Object
 requires('Module::Pluggable::Object');
@@ -67,7 +67,7 @@
 requires('Params::Validate');
 requires('Scalar::Defer' => '0.12');
 requires('Shell::Command');
-requires('String::BufferStack' => '1.10');
+requires('String::BufferStack' => '1.12');
 requires('String::Koremutake');
 requires('SUPER');
 requires('SQL::ReservedWords');

Modified: jifty/trunk/lib/Jifty/View/Declare/Page.pm
==============================================================================
--- jifty/trunk/lib/Jifty/View/Declare/Page.pm	(original)
+++ jifty/trunk/lib/Jifty/View/Declare/Page.pm	Wed Feb  4 14:55:33 2009
@@ -48,8 +48,11 @@
 
 sub render {
     my $self = shift;
-    $self->render_body( sub { $self->render_page->() });
+    # This needs to be private so we can prepend the header at the end
+    Template::Declare->buffer->push(private => 1);
+    $self->render_body( sub { $self->render_page->() } );
     $self->render_footer;
+    outs_raw(Template::Declare->buffer->pop);
     return '';
 }
 
@@ -70,8 +73,7 @@
 
     $self->_render_header($self->_title || Jifty->config->framework('ApplicationName'));
 
-    $self->done_header(Template::Declare->buffer->data);
-    Template::Declare->end_buffer_frame;
+    $self->done_header(Template::Declare->buffer->pop);
     return '';
 };
 
@@ -142,8 +144,7 @@
                 Template::Declare->new_buffer_frame;
                 $_->();
                 $self->_title(
-                    $self->_title . Template::Declare->buffer->data );
-                Template::Declare->end_buffer_frame;
+                    $self->_title . Template::Declare->buffer->pop );
             } else {
                 $self->_title( $self->_title . Jifty->web->escape($_) );
             }
@@ -176,7 +177,9 @@
 sub render_footer {
     my $self = shift;
     outs_raw('</html>');
-    Template::Declare->buffer->data( $self->done_header . Template::Declare->buffer->data );
+    my $ref = Template::Declare->buffer->buffer_ref;
+    $$ref = $self->done_header . $$ref;
+    return '';
 }
 
 =head2 render_pre_content_hook