$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; # FIXME
+
+ if ( $name =~ m{::} && $name !~ $re_html ) {
+ return qq|$name $content\n|;
+ } elsif ( $name =~ s{^\s*($name $content\n|;
+ }
}
sub _inline_path {
@@ -91,15 +123,15 @@
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 ) ?
- qq|| :
+ qq|| :
qq||;
} elsif ( $path =~ m/\.css$/ ) {
$out .= $self->_inline_path( $path ) ?
- qq|| :
+ qq|| :
qq||;
} elsif ( $path =~ m{<.+>}s ) {
$out .= $path;
@@ -126,11 +158,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";
}
@@ -141,6 +173,17 @@
}
+sub add_css {
+ my ($self,$css) = @_;
+ my ( $package, $path, $line ) = caller;
+ $self->add_head( qq|
+
+ | );
+}
+
our $reload_counter = 0;
@@ -159,21 +202,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 = {@_};
@@ -184,9 +212,6 @@
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 ) {
$status_line .= $self->popup( $name, $part->{$name} );
@@ -197,7 +222,11 @@
$url =~ s{\?reload=\d+}{};
my $body = $a->{body};
- $body ||= $self->as_markup if $self->can('as_markup');
+ if ( ! $body ) {
+ my $run = $a->{run} || 'as_markup';
+ warn "# no body, invoke $self->$run on ", ref($self);
+ $body = $self->$run;
+ }
if ( $self->content_type !~ m{html} ) {
warn "# return only $self body ", $self->content_type;
return $body
@@ -208,8 +237,6 @@
$status_line .= $self->warnings_html;
- $status_line .= $self->popup( INC => { %INC }, 1 );
-
my ($exit,$description) = ('exit','stop server');
($exit,$description) = ('restart','restart server')
if $ENV{FREY_RESTART}; # tune labels on exit link
@@ -222,8 +249,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;
@@ -284,10 +312,12 @@
sub editor_links {
my ( $self, $error ) = @_;
+# $error =~ s[(bless\({\s+.+?\s+},\s+)("[^"]+")(\) at)][$1$2
$3]gs; # FIXME insert bless hiding back
+
$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;
@@ -308,25 +338,71 @@
;
}
+=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' );
+ my $params = { request_url => $self->request_url };
+ @status = (
+ { 'ClassBrowser' => Frey::ClassBrowser->new( %$params, usage_on_top => 0 )->as_markup },
+ { 'Bookmarklets' => Frey::Bookmarklet->new( %$params )->as_markup },
+ { 'INC' => Frey::INC->new( %$params )->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
@@ -341,10 +417,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;
}
}
@@ -390,7 +466,7 @@
warn "## multiline markers ", dump( $multiline_markers ), " -> $multiline_re";
sub log_path {
- $Frey::Bootstrap::log_path || warn "no log_path?";
+ $Frey::Bootstrap::log_path || die "no log_path?";
}
sub warnings_html {
@@ -398,17 +474,34 @@
$level ||= $self->debug,
my $path = $self->log_path;
- my $warnings;
+ my $max = 30;
+ my $pos = 0;
+ my @warnings = ( '' x $max ); # XXX circualar buffer for 50 lines
my $line = 0;
my $multiline_end;
+ # XXX do we really want to do this every time?
+ my $css = qq|/* short css classes for levels */\n|;
+ my $level_to_class;
+ foreach ( keys %$warn_colors ) {
+ my $l = length($_);
+ my $class = 'l' . $l;
+ $css .= qq|.$class { color: $warn_colors->{$_} }\n|;
+ $level_to_class->{ $_ } = $class;
+ }
+ $self->add_css( $css );
+
open(my $log, '<', $path) || die "can't open $path: $!";
while(<$log>) {
chomp;
$line++;
+ next if m{^\s+(Mojo|Class::MOP|Moose)::};
+
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";
@@ -425,28 +518,80 @@
next;
}
- $style = $warn_colors->{$1}
- ? ' style="color:' . $warn_colors->{$1} . '"'
- : '';
+=cut
+ if ( m{^(#*)} ) {
+
+ my $level = $1;
+ my $msg = $_;
- my $msg = $self->html_escape( $_ );
my $spacer = ' ';
- if ( length($msg) > $self->chop_warning ) {
- $msg = substr( $msg, 0, $self->chop_warning );
+ my $real_msg = expand( $msg );
+ if ( length($real_msg) > $self->html_dump_width ) {
+
+ $real_msg = substr( $msg, 0, $self->html_dump_width );
+ $msg = unexpand( $real_msg );
$spacer = '…'
}
- $msg =~ s{^\s}{ }g;
- $warnings .= qq|$msg$spacer+$line but CSS hates me
+
+ $msg = $self->html_escape( $msg );
+
+ if ( my $class = $level_to_class->{ $level } ) {
+ $msg = qq|$msg|;
+ }
+
+ #$msg .= $spacer . qq|$line\n|;
+ $msg = qq|$line$msg|
+ . ( $spacer ? $spacer : '' )
+ . "\n"; # XXX needs this
+
+ $warnings[ $pos++ % $max ] = $msg;
}
}
+ warn "log has $line lines tell position ",tell($log);
close($log) || die "can't close $path: $!";
+ my $size = -s $path;
+
+ my $warnings = join("",
+ map { $warnings[ ( $pos + $_ ) % $max ] || '' } 0 .. ( $max - 1 )
+ );
+
+ my $s = length($warnings);
+
return
- qq|warn|
+ # need to wrap editor link into span so we can have links in warnings
+ qq|warn|
. $self->editor_links( $warnings )
- . qq|
|
+ . 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;