--- trunk/lib/Frey/Web.pm 2008/11/26 19:43:03 543 +++ trunk/lib/Frey/Web.pm 2008/11/28 15:07:03 588 @@ -1,9 +1,11 @@ package Frey::Web; use Moose::Role; +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; @@ -14,11 +16,8 @@ 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', @@ -81,12 +80,33 @@ $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 dom2html { -# warn "## dom2html ",dump( @_ ); - return Continuity::Widget::DomNode->create( @_ )->to_string; +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 { @@ -97,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 ) ? @@ -132,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"; } @@ -147,6 +167,17 @@ } +sub add_css { + my ($self,$css) = @_; + my ( $package, $path, $line ) = caller; + $self->add_head( qq| + + | ); +} + our $reload_counter = 0; @@ -165,29 +196,6 @@ our $icon_html; -sub popup { my $self = shift; $self->popup_dropdown('popup', @_); } -sub dropdown { my $self = shift; $self->popup_dropdown('dropdown', @_); } - -sub popup_dropdown { - my ( $self, $type, $name, $content, $full ) = @_; - - if ( ref($content) ) { - $content = $self->html_dump($content); -# my $l = length($content); -# $content = qq|$l bytes| if ! $full && $l > $self->dump_max_bytes; - } else { - $content = qq|$content|; - } - - warn "## $type [$name] = ", length( $content ), " bytes" if $self->debug; - - if ( $name =~ m{::} && ! $name =~ m{<(\w+).+?/\1>} ) { - return qq|$name $content\n|; - } else { - return qq|$name $content\n|; - } -} - sub page { my $self = shift; my $a = {@_}; @@ -198,10 +206,6 @@ my $status_line = ''; - unshift @status, { 'ClassBrowser' => Frey::ClassBrowser->new( usage_on_top => 0 )->as_markup }; -# unshift @status, { 'Bookmarklets' => Frey::Bookmarklet->new->as_markup }; - unshift @status, { 'INC' => Frey::INC->new->as_markup }; - foreach my $part ( @status ) { foreach my $name ( keys %$part ) { $status_line .= $self->popup( $name, $part->{$name} ); @@ -235,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; @@ -300,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; @@ -321,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 @@ -354,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; } } @@ -411,7 +461,9 @@ $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; @@ -422,6 +474,8 @@ my $style = ''; +=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"; @@ -438,6 +492,9 @@ next; } +=cut + if ( m{^(#*)\s+} ) { # FIXME + $style = $warn_colors->{$1} ? ' style="color:' . $warn_colors->{$1} . '"' : ''; @@ -448,17 +505,30 @@ $msg = substr( $msg, 0, $self->html_dump_width ); $spacer = '…' } - $msg =~ s{^\s}{ }g; - $warnings .= qq|$msg$spacer+$line
|; + $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|| ; } @@ -484,7 +554,7 @@ ) = caller($_) or last; push @backtrace, - qq|via $package from $path $path|; + qq|via $package at $path line $line|; } warn "# backtrace: ", dump( @backtrace ) if @backtrace; return @backtrace;