--- trunk/lib/Frey/Web.pm 2008/11/26 07:57:12 532 +++ trunk/lib/Frey/Web.pm 2008/11/28 15:07:03 588 @@ -1,24 +1,23 @@ package Frey::Web; use Moose::Role; -with 'Frey::Backtrace'; +with 'Frey::Session'; use Frey::Types; -use Continuity::Widget::DomNode; +#use Continuity::Widget::DomNode; use Data::Dump qw/dump/; use Carp qw/confess cluck/; use File::Slurp; use Frey::Bookmarklet; use Frey::ClassBrowser; +use Frey::INC; + use Frey::SVK; -has 'head' => ( - is => 'rw', - isa => 'ArrayRef[Str]', - default => sub { [ 'static/frey.css' ] }, -); +our @head; +sub head { @head } has 'request_url' => ( is => 'rw', @@ -47,25 +46,67 @@ is => 'rw', isa => 'Int', default => 4096, - documentation => 'Maximum dump size sent to browser before truncation', + 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, + documentation => 'inline JavaScript and CSS to reduce round-trips', +); + +has 'html_dump_width' => ( + documentation => 'crop longer lines in dumps', + is => 'rw', + isa => 'Int', +# required => 1, # FIXME we can't have required fields with defaults because Frey::Action isn't smart enough and asks for them + default => 128, ); -sub dom2html { -# warn "## dom2html ",dump( @_ ); - return Continuity::Widget::DomNode->create( @_ )->to_string; +my %escape = ('<'=>'<', '>'=>'>', '&'=>'&', '"'=>'"'); +my $escape_re = join '|' => keys %escape; + +sub html_escape { + my ( $self, $html ) = @_; + $html =~ s/($escape_re)/$escape{$1}/g; + return $html; +} + +sub html_dump { + my ( $self, $dump ) = @_; + $dump = dump( $dump ) if ref($dump); + my $width = $self->html_dump_width; + $dump =~ s{(\n[^\n]{$width})([^\n]+?)([^\n]{5})}{\n$1...$3}gs; + $dump = $self->html_escape( $dump ); + $dump =~ s{\Q...\E}{…}gs; +# $dump =~ $self->editor_links( $dump ); # FIXME include this + return "$dump"; +} + +sub popup { my $self = shift; $self->popup_dropdown('popup', @_); } +sub dropdown { my $self = shift; $self->popup_dropdown('dropdown', @_); } + +our $re_html = qr{<(?:!--.+?--|(\w+).+?/\1)>}s; # relaxed html check for one semi-valid tag + +sub popup_dropdown { + my ( $self, $type, $name, $content, $full ) = @_; + + $content = $self->html_dump($content) if ref $content; + + $content = qq|$content| unless $content =~ m{^\s*<(span|a|code).+?/\1>\s*}; + + $content =~ s{([^<]+)}{$1} && $self->TODO("code wrapped in span"); + + warn "## $type [$name] = ", length( $content ), " bytes" if $self->debug; + + if ( $name =~ m{::} && $name !~ $re_html ) { + return qq|$name $content\n|; + } elsif ( $name =~ s{^\s*($name $content\n|; + } } sub _inline_path { @@ -76,7 +117,7 @@ sub _head_html { my $self = shift; my $out = ''; - foreach my $path ( @{ $self->head } ) { + foreach my $path ( @head ) { $path =~ s!^/!!; if ( $path =~ m/\.js$/ ) { $out .= $self->_inline_path( $path ) ? @@ -111,11 +152,11 @@ return if ! defined $path || $path eq ''; $path =~ s!^/!!; - if ( $path =~ m{<.*>}s ) { - push @{ $self->head }, $path; + if ( $path =~ $re_html ) { + push @head, $path; } elsif ( -e $path ) { if ( $path =~ m/\.(?:js|css)$/ ) { - push @{ $self->head }, $path; + push @head, $path; } else { confess "can't add_head( $path ) it's not js or css"; } @@ -126,6 +167,17 @@ } +sub add_css { + my ($self,$css) = @_; + my ( $package, $path, $line ) = caller; + $self->add_head( qq| + + | ); +} + our $reload_counter = 0; @@ -154,21 +206,9 @@ my $status_line = ''; - unshift @status, { 'ClassBrowser' => Frey::ClassBrowser->new( usage_on_top => 0 )->as_markup }; - unshift @status, { 'Bookmarklets' => Frey::Bookmarklet->new->as_markup }; - foreach my $part ( @status ) { 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|; + $status_line .= $self->popup( $name, $part->{$name} ); } } @@ -199,8 +239,9 @@ |; - my $info = Frey::SVK->info; - my $revision = Frey::SVK->info->{Revision} || ''; + my $svk = Frey::SVK->new; + my $info = $svk->info; + my $revision = $svk->info->{Revision} || ''; $revision = $1 if $info->{'Mirrored From'} =~ m{Rev\.\s+(\d+)}; $self->add_icon unless $icon_html; @@ -264,7 +305,7 @@ $error =~ s{at\s+(\S+)\s+line\s+(\d+)} {at $1 line $2}gsm; - $error =~ s{(via package ")([\w:]+)(")} + $error =~ s{(via (?:package) "?)([\w:]+)("?)} {$1$2$3}gsm; return $error; @@ -285,25 +326,70 @@ ; } +=head1 Status line + +=head2 add_status + + $self->add_status( { name => { some => 'data' } } ); + + $self->add_status( "append to last status popup" ); + +=cut + sub add_status { my ( $self, $data ) = @_; - push @status, $data; + push @status, { 'X' => [ $self->backtrace ] }; + if ( ref($data) ) { + push @status, $data; + } else { + if ( defined $status[ $#status ] ) { + $status[ $#status ]->{ '+' } = $data; + } else { + push @status, { '+' => $data }; + } + } } +=head2 clean_status + +Called at beginning of each request + + $self->clean_status; + +=cut + sub clean_status { - @status = (); + my ($self) = shift; + @head = ( 'static/frey.css' ); + @status = ( + { 'ClassBrowser' => Frey::ClassBrowser->new( usage_on_top => 0 )->as_markup }, + { 'Bookmarklets' => Frey::Bookmarklet->new->as_markup }, + { 'INC' => Frey::INC->new->as_markup }, + ); $icon_html = ''; } +=head2 status_parts + +Dump all status line parts + + $self->status_parts + +=cut + sub status_parts { warn "## status parts ", dump( map { keys %$_ } @status ); } +=for debug + sub DEMOLISH { my ( $self ) = @_; warn "## $self DEMOLISH status ", $#status + 1, " elements ", dump( map { keys %$_ } @status ) if @status; } +=cut + =head2 add_icon Frey::Foo->add_icon; # /static/icons/Frey/Foo.png @@ -318,10 +404,10 @@ $icon .= "/$variant" if $variant; my $path = 'static/icons/' . $icon . '.png'; if ( -e $path ) { - warn "# $class from $self icon_path $path"; + warn "# $class from $self icon_path $path" if $self->debug; return $path; } else { - warn "TODO: add $path icon for $class"; + $self->TODO( "add $path icon for $class" ); return undef; } } @@ -357,9 +443,9 @@ }; my $multiline_markers = { - '(' => '\)', + '(' => ')', '{' => '}', - '[' => '\]', + '[' => ']', '"' => '"', }; @@ -372,10 +458,12 @@ sub warnings_html { my ($self,$level) = shift; - $level ||= $self->debug; + $level ||= $self->debug, my $path = $self->log_path; - my $warnings; + my $max = 50; + my $pos = 0; + my @warnings = ( '' x $max ); # XXX circualar buffer for 50 lines my $line = 0; my $multiline_end; @@ -384,35 +472,92 @@ chomp; $line++; - if ( $multiline_end ) { - undef $multiline_end if m{^$multiline_end}; - next; - } - my $style = ''; - if ( m{^(#*)\s+} ) { +=for filter + + if ( $multiline_end ) { + if ( m{^\Q$multiline_end\E} || m{^\s.+\Q$multiline_end\E;$} ) { +# warn "## $line end of $multiline_end in '$_'\n"; + undef $multiline_end; + } else { +# warn "## $line skipped\n"; + } + } elsif ( m{^(#*)\s+} ) { my $l = $1 ? length($1) : 0; - $multiline_end = $multiline_markers->{$1} if m{($multiline_re)$}; - next if $l > $level; - warn "## multiline_end: $multiline_end $l > $level for '$_'" if $multiline_end; - undef $multiline_end; + if ( $l > $level ) { + undef $multiline_end; + $multiline_end = $multiline_markers->{$1} if m{($multiline_re)$}; +# warn "## $line start $1 .. $multiline_end level $l > $level for '$_'\n" if $multiline_end; + next; + } + +=cut + if ( m{^(#*)\s+} ) { # FIXME $style = $warn_colors->{$1} ? ' style="color:' . $warn_colors->{$1} . '"' : ''; - $warnings .= qq|$_ +$line
|; + my $msg = $self->html_escape( $_ ); + my $spacer = ' '; + if ( length($msg) > $self->html_dump_width ) { + $msg = substr( $msg, 0, $self->html_dump_width ); + $spacer = '…' + } + $warnings[ $pos++ % $max ] + = $msg +# = ( $style ? qq|$msg| : $msg ) + . $spacer + . qq|+$line
|; # FIXME should be but CSS hates me } } close($log) || die "can't close $path: $!"; + my $size = -s $path; + + my $warnings = join('', + map { $warnings[ ( $pos + $_ ) % $max ] || '' } 0 .. $max + ); + + my $s = length($warnings); + return - qq|warn| - . $self->editor_links( $warnings ) - . qq|| + # need to wrap into span so we can have links in warnings + qq|warn| + . $warnings +# . $self->editor_links( $warnings ) + . qq|| ; } + +=head2 backtrace + +Show backtrace with links to editor + + my @backtrace = $self->backtrace; + +=cut + +sub backtrace { + my ($self) = @_; + + my @backtrace; + foreach ( 0 .. 5 ) { + my ( + $package,$path,$line + # subroutine hasargs + # wantarray evaltext is_require + # hints bitmask hinthash + ) = caller($_) or last; + + push @backtrace, + qq|via $package at $path line $line|; + } + warn "# backtrace: ", dump( @backtrace ) if @backtrace; + return @backtrace; +} + 1;