--- trunk/lib/Frey/Web.pm 2008/11/17 20:14:12 385 +++ trunk/lib/Frey/Web.pm 2008/11/19 19:59:52 468 @@ -1,17 +1,56 @@ package Frey::Web; use Moose::Role; +with 'Frey::Backtrace'; + +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->as_markup }, + { 'ClassBrowser' => Frey::ClassBrowser->new( usage_on_top => 0 )->as_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); + }, +); + +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 @@ -48,6 +87,8 @@ $out .= $self->_inline_path( $path ) ? qq|| : qq||; + } elsif ( $path =~ m{<.+>}s ) { + $out .= $path; } else { confess "don't know how to render $path"; } @@ -62,6 +103,8 @@ my $size = $o->add_head( 'path/to/external.css' ); + $o->add_head( '' ); + =cut sub add_head { @@ -69,17 +112,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; @@ -95,42 +140,100 @@ =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 $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 $html = join("\n", + qq||, + $self->_head_html, + '' . ( $self->title || $a->{title} || ref($self) ) . '', + '', + ( $a->{head} || '' ), + qq| + + $body +
+ Frey $Frey::VERSION + $url + $status_line
- |; + |, + ); warn "## >>> page ",length($html), " bytes\n" if $self->debug; return $html; } -sub error { +sub editor_links { my ( $self, $error ) = @_; - warn $error; - $error =~ s{at\s+(\S+)\s+line\s+(\d+)}{ $1 line $2}gsm; - return qq|
$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;