--- trunk/lib/Frey/Web.pm 2008/11/18 00:30:29 389
+++ trunk/lib/Frey/Web.pm 2008/11/20 14:39:43 480
@@ -1,6 +1,8 @@
package Frey::Web;
use Moose::Role;
+with 'Frey::Backtrace';
+
use Frey::Types;
use Continuity::Widget::DomNode;
@@ -8,6 +10,9 @@
use Carp qw/confess/;
use File::Slurp;
+use Frey::Bookmarklet;
+use Frey::ClassBrowser;
+
has 'head' => (
is => 'rw',
isa => 'ArrayRef[Str]',
@@ -19,17 +24,41 @@
isa => 'ArrayRef[HashRef[Str]]',
lazy => 1,
default => sub { [
- { 'Bookmarklets' => Frey::Bookmarklet->markup },
- { 'ClassBrowser' => Frey::ClassBrowser->markup },
+ { 'ClassBrowser' => Frey::ClassBrowser->new( usage_on_top => 0 )->as_markup },
+ { 'Bookmarklets' => Frey::Bookmarklet->new->as_markup },
] },
);
-has 'urequest_url' => (
+has 'request_url' => (
is => 'rw',
isa => 'Uri', coerce => 1,
default => '/',
);
+has 'title' => (
+ is => 'rw',
+ isa => 'Str',
+ lazy => 1,
+ default => sub {
+ my ($self) = @_;
+ ref($self);
+ },
+);
+
+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
@@ -66,6 +95,8 @@
$out .= $self->_inline_path( $path ) ?
qq|| :
qq||;
+ } elsif ( $path =~ m{<.+>}s ) {
+ $out .= $path;
} else {
confess "don't know how to render $path";
}
@@ -80,6 +111,8 @@
my $size = $o->add_head( 'path/to/external.css' );
+ $o->add_head( '' );
+
=cut
sub add_head {
@@ -87,17 +120,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;
@@ -113,9 +148,6 @@
=cut
-use Frey::Bookmarklet;
-use Frey::ClassBrowser;
-
sub page {
my $self = shift;
my $a = {@_};
@@ -124,25 +156,69 @@
my $status_line = '';
foreach my $part ( @{ $self->status } ) {
+ if ( ref($part) ne 'HASH' ) {
+ warn "part not hash ",dump( $part ) ;
+ #$self->status( $part );
+ next;
+ }
foreach my $name ( keys %$part ) {
- warn "### part [$name] = ", length( $part->{name} ), " bytes" if $self->debug;
- $status_line .= qq|$name| . $part->{$name} . qq||;
+ my $content = $part->{$name};
+ if ( ref($content) ) {
+ $content = '' . dump($content) . '
';
+ my $l = length($content);
+ $content = qq|$l bytes| if $l > $self->dump_max_bytes;
+ } else {
+ $content = qq|$content|;
+ }
+ warn "### part [$name] = ", length( $content ), " bytes" if $self->debug;
+ $status_line .= qq|$name $content\n|;
}
}
+ 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 = '';
+ }
+
+ $status_line
+ .= qq|warn|
+ . $self->editor_links( join("", $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 $html = join("\n",
qq|
| . $self->urequest_url . qq|
$status_line
+ $right
$error|; + + $error =~ s{at\s+(\S+)\s+line\s+(\d+)} + {at $1 line $2}gsm; + + $error =~ s{(via package ")([\w:]+)(")} + {$1$2$3}gsm; + + return $error; +} + +sub error { + my $self = shift; + my $error = join(" ", @_); + + my @backtrace = $self->backtrace; + $error .= "\n\t" . join( "\n\t", @backtrace ) if @backtrace; + + warn "ERROR: $error\n"; + return + qq|
| + . $self->editor_links( $error ) . + qq|| + ; } 1;