--- trunk/lib/Frey/Web.pm 2008/11/17 16:59:06 375 +++ trunk/lib/Frey/Web.pm 2008/11/18 17:41:41 422 @@ -1,17 +1,50 @@ package Frey::Web; use Moose::Role; +#with 'Frey::Escape'; + +use Frey::Types; + use Continuity::Widget::DomNode; use Data::Dump qw/dump/; use Carp qw/confess/; use File::Slurp; +use Frey::Bookmarklet; +use Frey::ClassBrowser; + has 'head' => ( is => 'rw', isa => 'ArrayRef[Str]', default => sub { [ 'static/frey.css' ] }, ); +has 'status' => ( + is => 'rw', + isa => 'ArrayRef[HashRef[Str]]', + lazy => 1, + default => sub { [ + { 'Bookmarklets' => Frey::Bookmarklet->new->markup }, + { 'ClassBrowser' => Frey::ClassBrowser->new->markup }, + ] }, +); + +has 'request_url' => ( + is => 'rw', + isa => 'Uri', coerce => 1, + default => '/', +); + +has 'title' => ( + is => 'rw', + isa => 'Str', + lazy => 1, + default => sub { + my ($self) = @_; + ref($self); + }, +); + =head2 inline_smaller_than Inline JavaScript and CSS smaller than this size into page reducing @@ -95,30 +128,50 @@ =cut -use Frey::Bookmarklet; -use Frey::ClassBrowser; - sub page { my $self = shift; my $a = {@_}; $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 } ) { + if ( ref($part) ne 'HASH' ) { + warn "part not hash ",dump( $part ) ; + #$self->status( $part ); + next; + } + foreach my $name ( keys %$part ) { + my $content = $part->{$name}; + if ( ref($content) ) { + $content = '' . dump($content) . ''; + my $l = length($content); + $content = qq|$l bytes| if $l > 1024; + } else { + $content = qq|$content|; + } + warn "### part [$name] = ", length( $content ), " bytes" if $self->debug; + $status_line .= qq|$name $content\n|; + } + } + + my $html = join("\n", + qq||, + $self->_head_html, + '' . ( $self->title || $a->{title} || ref($self) ) . '', + '', + ( $a->{head} || '' ), + '', + ( $a->{body} || $self->markup || '' ), + qq| +
+ Frey $Frey::VERSION + | . $self->request_url . qq| + $status_line
- |; + |, + ); warn "## >>> page ",length($html), " bytes\n" if $self->debug; @@ -126,9 +179,13 @@ } sub error { - my ( $self, $error ) = @_; - warn $error; - $error =~ s{at\s+(\S+)\s+line\s+(\d+)}{ $1 line $2}gsm; + my $self = shift; + my $error = join(" ", @_); + my ($package, $filename, $line) = caller; + $error .= " at $filename line $line" if $error !~ m{ at }; + warn "WARN: $error\n"; + $error =~ s{at\s+(\S+)\s+line\s+(\d+)}{at $1 line $2}gsm; + $error =~ s{(via package ")([\w:]+)(")}{$1$2$3}gsm; return qq|
$error
|; }