--- trunk/lib/Frey/Web.pm 2008/11/26 18:02:38 540 +++ trunk/lib/Frey/Web.pm 2008/11/28 00:30:03 577 @@ -1,11 +1,11 @@ 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; @@ -16,11 +16,7 @@ use Frey::SVK; -has 'head' => ( - is => 'rw', - isa => 'ArrayRef[Str]', - default => sub { [ 'static/frey.css' ] }, -); +our @head = ( 'static/frey.css' ); has 'request_url' => ( is => 'rw', @@ -49,21 +45,22 @@ is => 'rw', isa => 'Int', default => 4096, - documentation => 'Maximum dump size sent to browser before truncation', + documentation => 'maximum dump size sent to browser before truncation', ); has 'inline_smaller_than' => ( is => 'rw', isa => 'Int', default => 10240, - documentation => 'Inline JavaScript and CSS to reduce round-trips', + documentation => 'inline JavaScript and CSS to reduce round-trips', ); -has 'chop_warning' => ( +has 'html_dump_width' => ( + documentation => 'crop longer lines in dumps', is => 'rw', isa => 'Int', - default => 80, - documentation => 'Crop lines longer', +# required => 1, # FIXME we can't have required fields with defaults because Frey::Action isn't smart enough and asks for them + default => 128, ); my %escape = ('<'=>'<', '>'=>'>', '&'=>'&', '"'=>'"'); @@ -76,13 +73,34 @@ } sub html_dump { - my $self = shift; - $self->html_escape( 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; + 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*}; + + warn "## $type [$name] = ", length( $content ), " bytes" if $self->debug; + + if ( $name =~ m{::} && $name !~ $re_html ) { + return qq|$name $content\n|; + } else { + return qq|$name $content\n|; + } } sub _inline_path { @@ -93,7 +111,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 ) ? @@ -128,11 +146,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"; } @@ -143,6 +161,17 @@ } +sub add_css { + my ($self,$css) = @_; + my ( $package, $path, $line ) = caller; + $self->add_head( qq| + + | ); +} + our $reload_counter = 0; @@ -161,21 +190,6 @@ our $icon_html; -sub popup { - my ( $self, $name, $content, $full ) = @_; - - if ( ref($content) ) { - $content = '' . dump($content) . ''; - my $l = length($content); - $content = qq|$l bytes| if ! $full && $l > $self->dump_max_bytes; - } else { - $content = qq|$content|; - } - - warn "## popup [$name] = ", length( $content ), " bytes" if $self->debug; - return qq|$name $content\n|; -} - sub page { my $self = shift; my $a = {@_}; @@ -223,8 +237,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; @@ -309,25 +324,61 @@ ; } +=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; + if ( ref($data) ) { + push @status, $data; + } else { + $status[ $#status ]->{added} = $data; + } } +=head2 clean_status + +Called at beginning of each request + + $self->clean_status; + +=cut + sub clean_status { + my ($self) = shift; + @head = (); @status = (); $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 @@ -342,10 +393,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; } } @@ -432,8 +483,8 @@ my $msg = $self->html_escape( $_ ); my $spacer = ' '; - if ( length($msg) > $self->chop_warning ) { - $msg = substr( $msg, 0, $self->chop_warning ); + if ( length($msg) > $self->html_dump_width ) { + $msg = substr( $msg, 0, $self->html_dump_width ); $spacer = '…' } $msg =~ s{^\s}{ }g; @@ -450,4 +501,32 @@ ; } + +=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 $package at $path line $line|; + } + warn "# backtrace: ", dump( @backtrace ) if @backtrace; + return @backtrace; +} + 1;