--- trunk/lib/Frey/Web.pm 2008/09/09 23:14:31 183 +++ trunk/lib/Frey/Web.pm 2008/11/19 16:53:13 457 @@ -1,17 +1,61 @@ package Frey::Web; use Moose::Role; +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 +round-trips to server. + +=cut + has 'inline_smaller_than' => ( is => 'rw', isa => 'Int', @@ -41,6 +85,8 @@ $out .= $self->_inline_path( $path ) ? qq|| : qq||; + } elsif ( $path =~ m{<.+>}s ) { + $out .= $path; } else { confess "don't know how to render $path"; } @@ -55,6 +101,8 @@ my $size = $o->add_head( 'path/to/external.css' ); + $o->add_head( '' ); + =cut sub add_head { @@ -62,17 +110,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; @@ -94,19 +144,66 @@ $reload_counter++; - my $html = qq|| - . $self->_head_html - . '' . ( $a->{title} || ref($self) ) . '' - . ( $a->{head} || '' ) - . '' - . ( $a->{body} || '' ) - . qq|
Frey $Frey::VERSION reload
| - . '' - ; + 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} || $self->as_markup; + return $body if $self->content_type !~ m{html}; + $body ||= ''; + + 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 { + 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
|; +} + 1;