--- trunk/lib/Frey/Web.pm 2008/07/17 17:04:21 154 +++ trunk/lib/Frey/Web.pm 2008/11/25 00:26:15 507 @@ -1,44 +1,107 @@ package Frey::Web; use Moose::Role; -use MooseX::AttributeHelpers; + +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; +use Frey::SVK; -has 'js' => ( - metaclass => 'Collection::Array', +has 'head' => ( is => 'rw', isa => 'ArrayRef[Str]', - default => sub { [] }, - provides => { - 'push' => 'add_js', - }, + default => sub { [ 'static/frey.css' ] }, ); -has 'css' => ( - metaclass => 'Collection::Array', +has 'status' => ( is => 'rw', - isa => 'ArrayRef[Str]', - default => sub { [ 'static/app.css' ] }, - provides => { - 'push' => 'add_css', + isa => 'ArrayRef[HashRef[Str]]', + lazy => 1, + default => sub { [ + { 'ClassBrowser' => Frey::ClassBrowser->new( usage_on_top => 0 )->as_markup }, + { 'Bookmarklets' => Frey::Bookmarklet->new->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', + 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 +round-trips to server. + +=cut + +has 'inline_smaller_than' => ( + is => 'rw', + isa => 'Int', + default => 10240, +); + sub dom2html { # warn "## dom2html ",dump( @_ ); return Continuity::Widget::DomNode->create( @_ )->to_string; } -sub _unroll_markup { -# warn "## _unroll_markup ",dump( @_ ); - my ( $markup, $array ) = @_; +sub _inline_path { + my ( $self, $path ) = @_; + -s $path < $self->inline_smaller_than; +} + +sub _head_html { + my $self = shift; my $out = ''; - foreach my $path ( @$array ) { + foreach my $path ( @{ $self->head } ) { $path =~ s!^/!!; - confess "can't find $path" unless -e $path; - $out .= sprintf( $markup, $path ); + if ( $path =~ m/\.js$/ ) { + $out .= $self->_inline_path( $path ) ? + qq|| : + qq||; + } elsif ( $path =~ m/\.css$/ ) { + $out .= $self->_inline_path( $path ) ? + qq|| : + qq||; + } elsif ( $path =~ m{<.+>}s ) { + $out .= $path; + } else { + confess "don't know how to render $path"; + } + $out .= "\n"; } return $out; } @@ -49,6 +112,8 @@ my $size = $o->add_head( 'path/to/external.css' ); + $o->add_head( '' ); + =cut sub add_head { @@ -56,43 +121,188 @@ return if ! defined $path || $path eq ''; $path =~ s!^/!!; - if ( -e $path ) { - if ( $path =~ m/\.js$/ ) { - $self->add_js( $path ); - } elsif ( $path =~ m/\.css$/ ) { - $self->add_css( $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; + +=head2 page + + $self->page( + title => 'page title', + head => '', + body => 'Page Body', + ); + +=cut + sub page { my $self = shift; my $a = {@_}; $reload_counter++; - my $html = qq|| - . _unroll_markup( qq||, $self->js ) - . _unroll_markup( qq||, $self->css ) - . '' . ( $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 > $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 = ''; + } + + my $warn_colors = { + '#' => '#444', + '##' => '#888', + }; + + $status_line + .= qq|warn| + . $self->editor_links( + join("", map { + warn "# $_"; + my $style = ''; + $style = $warn_colors->{$1} + ? ' style="color:' . $warn_colors->{$1} . '"' + : '' + if m{^(#+)}; + qq|$_
|; # XXX should be but CSS hates me + } $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 $revision = Frey::SVK->info->{Revision} || ''; + + my $html = join("\n", + qq||, + $self->_head_html, + '' . ( $self->title || $a->{title} || ref($self) ) . '', + '', + ( $a->{head} || '' ), + qq| + + $body +
+ Frey $Frey::VERSION $revision + $status_line + $right +
+ + |, + ); warn "## >>> page ",length($html), " bytes\n" if $self->debug; return $html; } +=head2 editor + +Create HTML editor link with optional line and title + + my $html = $self->editor( $class, $line, $title ); + +=cut + +sub editor { + my ( $self, $class, $line, $title ) = @_; + confess "need class" unless $class; + $line ||= 1; + qq|$class|; +} + +=head2 editor_links + +Create HTML links to editor for perl error message + + my $html = $self->editor_links( $error ) + +=cut + +sub editor_links { + my ( $self, $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|
| + ; +} + +sub add_status { + my ( $self, $data ) = @_; + push @{ $self->status }, $data; + warn "## current status ", $#{ $self->status }, " elements"; +} + 1;