--- trunk/lib/Frey/Web.pm 2008/11/19 02:52:42 444 +++ trunk/lib/Frey/Web.pm 2008/11/19 15:28:23 455 @@ -1,8 +1,6 @@ package Frey::Web; use Moose::Role; -#with 'Frey::Escape'; - use Frey::Types; use Continuity::Widget::DomNode; @@ -24,8 +22,8 @@ isa => 'ArrayRef[HashRef[Str]]', lazy => 1, default => sub { [ - { 'Bookmarklets' => Frey::Bookmarklet->new->markup }, - { 'ClassBrowser' => Frey::ClassBrowser->new( usage_on_top => 0 )->markup }, + { 'Bookmarklets' => Frey::Bookmarklet->new->as_markup }, + { 'ClassBrowser' => Frey::ClassBrowser->new( usage_on_top => 0 )->as_markup }, ] }, ); @@ -45,6 +43,12 @@ }, ); +has 'content_type' => ( + is => 'rw', + isa => 'Str', + default => 'text/html', +); + =head2 inline_smaller_than Inline JavaScript and CSS smaller than this size into page reducing @@ -81,7 +85,7 @@ $out .= $self->_inline_path( $path ) ? qq|| : qq||; - } elsif ( $path =~ m{<.+>} ) { + } elsif ( $path =~ m{<.+>}s ) { $out .= $path; } else { confess "don't know how to render $path"; @@ -97,6 +101,8 @@ my $size = $o->add_head( 'path/to/external.css' ); + $o->add_head( '' ); + =cut sub add_head { @@ -104,7 +110,7 @@ return if ! defined $path || $path eq ''; $path =~ s!^/!!; - if ( $path =~ m{<.*>} ) { + if ( $path =~ m{<.*>}s ) { push @{ $self->head }, $path; } elsif ( -e $path ) { if ( $path =~ m/\.(?:js|css)$/ ) { @@ -162,15 +168,19 @@ my $url = $self->request_url; $url =~ s{\?reload=\d+}{}; + my $body = $a->{body} || $self->as_markup; + return $body if $self->content_type !~ m{html}; + $body ||= ''; + my $html = join("\n", qq||, $self->_head_html, '' . ( $self->title || $a->{title} || ref($self) ) . '', '', ( $a->{head} || '' ), - '', - ( $a->{body} || $self->markup || '' ), qq| + + $body
Frey $Frey::VERSION $url @@ -196,4 +206,14 @@ return qq|
$error
|; } +sub as_data { + my ($self) = @_; + $self->data; +} + +sub as_sponge { + my ($self) = @_; + $self->sponge; +} + 1;