--- trunk/lib/Frey/Web.pm 2008/11/19 01:21:31 434
+++ trunk/lib/Frey/Web.pm 2008/11/25 14:14:21 516
@@ -1,7 +1,7 @@
package Frey::Web;
use Moose::Role;
-#with 'Frey::Escape';
+with 'Frey::Backtrace';
use Frey::Types;
@@ -12,6 +12,7 @@
use Frey::Bookmarklet;
use Frey::ClassBrowser;
+use Frey::SVK;
has 'head' => (
is => 'rw',
@@ -24,8 +25,8 @@
isa => 'ArrayRef[HashRef[Str]]',
lazy => 1,
default => sub { [
- { 'Bookmarklets' => Frey::Bookmarklet->new->markup },
- { 'ClassBrowser' => Frey::ClassBrowser->new( usage_on_top => 0 )->markup },
+ { 'ClassBrowser' => Frey::ClassBrowser->new( usage_on_top => 0 )->as_markup },
+ { 'Bookmarklets' => Frey::Bookmarklet->new->as_markup },
] },
);
@@ -45,6 +46,20 @@
},
);
+has 'content_type' => (
+ is => 'rw',
+ isa => 'Str',
+ default => 'text/html',
+ documentation => 'Content-type header',
+);
+
+has 'dump_max_bytes' => (
+ is => 'rw',
+ isa => 'Int',
+ default => 4096,
+ documentation => 'Maximum dump size sent to browser before truncation',
+);
+
=head2 inline_smaller_than
Inline JavaScript and CSS smaller than this size into page reducing
@@ -81,6 +96,8 @@
$out .= $self->_inline_path( $path ) ?
qq|| :
qq||;
+ } elsif ( $path =~ m{<.+>}s ) {
+ $out .= $path;
} else {
confess "don't know how to render $path";
}
@@ -95,6 +112,8 @@
my $size = $o->add_head( 'path/to/external.css' );
+ $o->add_head( '' );
+
=cut
sub add_head {
@@ -102,17 +121,19 @@
return if ! defined $path || $path eq '';
$path =~ s!^/!!;
- if ( -e $path ) {
+ if ( $path =~ m{<.*>}s ) {
+ push @{ $self->head }, $path;
+ } elsif ( -e $path ) {
if ( $path =~ m/\.(?:js|css)$/ ) {
push @{ $self->head }, $path;
} else {
confess "can't add_head( $path ) it's not js or css";
}
+ return -s $path;
} else {
confess "can't find $path: $!";
}
- return -s $path;
}
our $reload_counter = 0;
@@ -146,7 +167,7 @@
if ( ref($content) ) {
$content = '' . dump($content) . '
';
my $l = length($content);
- $content = qq|$l bytes| if $l > 1024;
+ $content = qq|$l bytes| if $l > $self->dump_max_bytes;
} else {
$content = qq|$content|;
}
@@ -155,19 +176,69 @@
}
}
+ my $url = $self->request_url;
+ $url =~ s{\?reload=\d+}{};
+
+ my $body = $a->{body};
+ $body ||= $self->as_markup if $self->can('as_markup');
+ if ( $self->content_type !~ m{html} ) {
+ warn "# return only $self body ", $self->content_type;
+ return $body
+ } elsif ( ! defined $body ) {
+ warn "# no body";
+ $body = '';
+ }
+
+ my $warn_colors = {
+ '#' => '#444',
+ '##' => '#888',
+ };
+
+ $status_line
+ .= qq|warn|
+ . $self->editor_links(
+ join("", map {
+ warn "# $_";
+ my $style = '';
+ $style = $warn_colors->{$1}
+ ? ' style="color:' . $warn_colors->{$1} . '"'
+ : ''
+ if m{^(#+)};
+ qq|$_
|; # XXX should be but CSS hates me
+ } $self->warnings )
+ )
+ . qq|
|
+ if $self->warnings;
+
+ my ($exit,$description) = ('exit','stop server');
+ ($exit,$description) = ('restart','restart server')
+ if $ENV{FREY_RESTART}; # tune labels on exit link
+
+ my $right =
+ qq|
+
+ $url
+ $exit
+
+ |;
+
+ my $info = Frey::SVK->info;
+ my $revision = Frey::SVK->info->{Revision} || '';
+ $revision = $1 if $info->{'Mirrored From'} =~ m{Rev\.\s+(\d+)};
+
my $html = join("\n",
qq|
| . $self->request_url . qq|
+ Frey $Frey::VERSION $revision
$status_line
+ $right
$error|; + + my @backtrace = $self->backtrace; + $error .= "\n\t" . join( "\n\t", @backtrace ) if @backtrace; + + warn "ERROR: $error\n"; + return + qq|
| + . $self->editor_links( $error ) . + qq|| + ; +} + +sub add_status { + my ( $self, $data ) = @_; + push @{ $self->status }, $data; + warn "## current status ", $#{ $self->status }, " elements"; } 1;