--- trunk/lib/Frey/Web.pm 2008/11/17 20:14:12 385 +++ trunk/lib/Frey/Web.pm 2008/11/18 00:55:23 392 @@ -1,6 +1,8 @@ package Frey::Web; use Moose::Role; +use Frey::Types; + use Continuity::Widget::DomNode; use Data::Dump qw/dump/; use Carp qw/confess/; @@ -12,6 +14,22 @@ default => sub { [ 'static/frey.css' ] }, ); +has 'status' => ( + is => 'rw', + isa => 'ArrayRef[HashRef[Str]]', + lazy => 1, + default => sub { [ + { 'Bookmarklets' => Frey::Bookmarklet->markup }, + { 'ClassBrowser' => Frey::ClassBrowser->markup }, + ] }, +); + +has 'request_url' => ( + is => 'rw', + isa => 'Uri', coerce => 1, + default => '/', +); + =head2 inline_smaller_than Inline JavaScript and CSS smaller than this size into page reducing @@ -104,22 +122,37 @@ $reload_counter++; - my $html = qq|| - . $self->_head_html - . '' . ( $a->{title} || ref($self) ) . '' - . '' - . ( $a->{head} || '' ) - . '' - . ( $a->{body} || '' ) - . qq|
- Frey $Frey::VERSION - | . dump( $ENV{'REQUEST_URI'} ) . qq| - Bookmarklets| . Frey::Bookmarklet->markup . qq| - ClassBrowser| . Frey::ClassBrowser->markup . qq| - ENV| . dump( %ENV ) . qq| + my $status_line = ''; + foreach my $part ( @{ $self->status } ) { + foreach my $name ( keys %$part ) { + my $content = $part->{$name}; + if ( ref($content) ) { + $content = '' . dump( $content ) . ''; + } else { + $content = qq|$content|; + } + warn "### part [$name] = ", length( $content ), " bytes" if $self->debug; + $status_line .= qq|$name $content|; + } + } + + my $html = join("\n", + qq||, + $self->_head_html, + '' . ( $a->{title} || ref($self) ) . '', + '', + ( $a->{head} || '' ), + '', + ( $a->{body} || '' ), + qq| +
+ Frey $Frey::VERSION + | . $self->request_url . qq| + $status_line
- |; + |, + ); warn "## >>> page ",length($html), " bytes\n" if $self->debug; @@ -128,8 +161,10 @@ sub error { my ( $self, $error ) = @_; - warn $error; - $error =~ s{at\s+(\S+)\s+line\s+(\d+)}{ $1 line $2}gsm; + my ($package, $filename, $line) = caller; + $error .= " at $filename line $line"; + warn "WARN: $error\n"; + $error =~ s{at\s+(\S+)\s+line\s+(\d+)}{at $1 line $2}gsm; return qq|
$error
|; }