$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
+our $re_html = qr{<(?:!--|(\w+)|[^>]+)/?>}s; # relaxed html check for one semi-valid tag
sub popup_dropdown {
my ( $self, $type, $name, $content, $full ) = @_;
@@ -98,7 +105,7 @@
$content =~ s{([^<]+
)}{$1} && $self->TODO("code wrapped in span");
- warn "## $type [$name] = ", length( $content ), " bytes" if $self->debug;
+ warn "## $type [$name] = ", length( $content ), " bytes"; # if $self->debug; # FIXME
if ( $name =~ m{::} && $name !~ $re_html ) {
return qq|$name $content\n|;
@@ -109,9 +116,11 @@
}
}
-sub _inline_path {
+sub _inline {
my ( $self, $path ) = @_;
- -s $path < $self->inline_smaller_than;
+ return unless defined $path;
+ warn "# _inline $path";
+ -e $path && -s $path < $self->inline_smaller_than && -s $path;
}
sub _head_html {
@@ -120,12 +129,14 @@
foreach my $path ( @head ) {
$path =~ s!^/!!;
if ( $path =~ m/\.js$/ ) {
- $out .= $self->_inline_path( $path ) ?
- qq|| :
+ my $size;
+ $out .= $size = _inline( $path ) ?
+ qq|| :
qq||;
} elsif ( $path =~ m/\.css$/ ) {
- $out .= $self->_inline_path( $path ) ?
- qq|| :
+ my $size;
+ $out .= $size = _inline( $path ) ?
+ qq|| :
qq||;
} elsif ( $path =~ m{<.+>}s ) {
$out .= $path;
@@ -167,15 +178,53 @@
}
+sub _add_css_js {
+ my ( $self, $what, $content ) = @_;
+
+ my $tag = $what eq 'css' ? 'style' : 'script';
+ my $type = $what eq 'css' ? 'text/css' : 'text/javascript';
+ my $head;
+
+ my ( $package, $path, $line ) = caller(1);
+
+ if ( $content =~ m{\.(js|css)} ) {
+ $content = "/$content" if -e $content;
+ if ( $content =~ $re_html ) {
+ $head = qq|
+ $content
+
+ |;
+ } elsif ( $what eq 'js' ) {
+ $head = qq|
+ <$tag type="$type" src="$content">
+ /* $what via $package at $path line $line */
+ $tag>
+ |;
+ } else {
+ $head = qq|
+
+
+ |;
+ }
+ } else {
+ $head = qq|
+ <$tag type="$type">
+ /* via $package at $path line $line */
+ $content
+ $tag>
+ |;
+ };
+ $self->add_head( $head );
+}
+
sub add_css {
my ($self,$css) = @_;
- my ( $package, $path, $line ) = caller;
- $self->add_head( qq|
-
- | );
+ $self->_add_css_js( 'css', $css );
+}
+
+sub add_js {
+ my ($self,$js) = @_;
+ $self->_add_css_js( 'js', $js );
}
our $reload_counter = 0;
@@ -216,7 +265,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
@@ -235,7 +288,7 @@
qq|
reload
- $exit
+ $exit
|;
@@ -291,39 +344,81 @@
qq|>$class|;
}
-=head2 editor_links
+=head2 html_links
Create HTML links to editor for perl error message
- my $html = $self->editor_links( $error )
+ my $html = $self->html_links( $error )
=cut
-sub editor_links {
+sub html_links {
my ( $self, $error ) = @_;
+ $error = $self->strip_full_path( $error );
+
+# $error =~ s[(bless\({\s+.+?\s+},\s+)("[^"]+")(\) at)][$1$2
$3]gs; # FIXME insert bless hiding back
+
+ # perl's backtrace
$error =~ s{at\s+(\S+)\s+line\s+(\d+)}
- {at $1 line $2}gsm;
+ {at $1 line $2}gsm;
+
+ $error =~ s{(via (?:package)\s+"?)([\w:]+)("?)}
+ {$1$2$3}gsm
+ || # or anything that looks like "Class::Name"
+ $error =~ s{"(\w+(?:::\w+)+)"}
+ {"$1"}gsm;
+
+ # method error messages
+ # FIXME replace with link to Frey::Introspect data
+ $error =~ s{(method ")(\w+)(" via)}
+ {$1$2$3}gsm;
+
+ # link paths to editor
+ $error =~ s{((?:lib|t)/[\S]+)\s+(\d+\s+bytes)}
+ {$1}gsm;
- $error =~ s{(via (?:package) "?)([\w:]+)("?)}
- {$1$2$3}gsm;
+ $error =~ s{(class ")([\w:]+)(")}
+ {$1$2$3}gsm;
return $error;
}
+sub html_self {
+ my $self = shift;
+ my $html = $self;
+ $html =~ s{([\w:]+)=}{$1=}gsm;
+ return $html;
+}
+
+=head2 error
+
+This method will return error to browser and backtrace unless
+error message ends with LF C<\n> just like L| - . $self->editor_links( $error ) . - qq|| - ; + $self->add_icon('error'); + $error = $self->html_links( $error ); + return qq|
$error $backtrace| ; } =head1 Status line @@ -362,9 +457,9 @@ my ($self) = shift; @head = ( 'static/frey.css' ); @status = ( - { 'ClassBrowser' => Frey::ClassBrowser->new( usage_on_top => 0 )->as_markup }, + { 'ClassBrowser' => Frey::Class::Browser->new( usage_sort => 1, usage_on_top => 0 )->as_markup }, { 'Bookmarklets' => Frey::Bookmarklet->new->as_markup }, - { 'INC' => Frey::INC->new->as_markup }, + { 'INC' => Frey::INC->new->as_markup }, ); $icon_html = ''; } @@ -399,24 +494,39 @@ sub icon_path { my ($self,$class,$variant) = @_; - my $icon = $class; - $icon =~ s{::}{/}g; - $icon .= "/$variant" if $variant; - my $path = 'static/icons/' . $icon . '.png'; - if ( -e $path ) { - warn "# $class from $self icon_path $path" if $self->debug; - return $path; - } else { - $self->TODO( "add $path icon for $class" ); + + sub icon_exists { + my $class = shift; + $class =~ s{::}{/}g; + $class .= "/$variant" if $variant; + my $icon_path = 'static/icons/' . $class . '.png'; + return $icon_path if -e $icon_path; + return; + } + + my $path = icon_exists( $class ); + if ( ! $path ) { + my $super_class = $class; + while ( $super_class =~ s{::[^:]+$}{} && ! $path ) { + $path = icon_exists( $super_class ) unless $super_class eq 'Frey'; # don't default on Frey icon + } + } + + if ( ! $path ) { + $self->TODO( "add icon for $class" . ( $variant ? " variant $variant" : '' ) ); return undef; } + + warn "# $class from $self icon_path $path" if $self->debug; + return $path; } sub add_icon { my ($self,$variant) = @_; - my $class = ref($self); - $class = $self->class if $self->can('class'); + my $class = $self->class if $self->can('class'); + #$class ||= $self->title; + $class ||= ref($self); my $icon_path = $self->icon_path( $class, $variant ) || return; $icon_html .= qq||; @@ -449,29 +559,61 @@ '"' => '"', }; +=for later + my $multiline_re = '[\\' . join('\\', keys %$multiline_markers ) . ']'; warn "## multiline markers ", dump( $multiline_markers ), " -> $multiline_re"; +=cut + sub log_path { - $Frey::Bootstrap::log_path || warn "no log_path?"; + $Frey::Bootstrap::log_path || die "no log_path?"; } +our $pwd = `pwd`; +chomp $pwd; + +sub strip_full_path { + my ($self, $msg) = @_; + # Mojo seems to expand warn messages to full path which is annoying + $msg =~ s{/[^/]+/\.\./}{/}gs; + $msg =~ s{$pwd/*}{}gs; + return $msg; +} + +our $last_log_pos = 0; +our $last_log_line = 0; + sub warnings_html { my ($self,$level) = shift; $level ||= $self->debug, my $path = $self->log_path; - my $max = 50; + my $max = 30; my $pos = 0; my @warnings = ( '' x $max ); # XXX circualar buffer for 50 lines - my $line = 0; + my $line = $last_log_line; my $multiline_end; - open(my $log, '<', $path) || die "can't open $path: $!"; + # 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: $!"; + seek($log, $last_log_pos, 0) || warn "can't seek: $!"; while(<$log>) { chomp; $line++; + next if m{^\s+(Mojo|Class::MOP|Moose)::}; + my $style = ''; =for filter @@ -493,42 +635,52 @@ } =cut - if ( m{^(#*)\s+} ) { # FIXME + if ( m{^(#*)} ) { - $style = $warn_colors->{$1} - ? ' style="color:' . $warn_colors->{$1} . '"' - : ''; + my $level = $1; + my $msg = $self->strip_full_path( $_ ); - my $msg = $self->html_escape( $_ ); my $spacer = ' '; - if ( length($msg) > $self->html_dump_width ) { - $msg = substr( $msg, 0, $self->html_dump_width ); + 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 = '…' } - $warnings[ $pos++ % $max ] - = $msg -# = ( $style ? qq|$msg| : $msg ) - . $spacer - . qq|+$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;
}
}
+ $last_log_pos = tell($log);
+ $last_log_line = $line;
+ warn "log has $line lines tell position $last_log_pos";
close($log) || die "can't close $path: $!";
my $size = -s $path;
- my $warnings = join('',
- map { $warnings[ ( $pos + $_ ) % $max ] || '' } 0 .. $max
+ my $warnings = join("",
+ map { $warnings[ ( $pos + $_ ) % $max ] || '' } 0 .. ( $max - 1 )
);
my $s = length($warnings);
return
- # need to wrap into span so we can have links in warnings
+ # need to wrap editor link into span so we can have links in warnings
qq|warn|
- . $warnings
-# . $self->editor_links( $warnings )
- . qq|
|
+ . $self->html_links( $warnings )
+ . qq|
|
;
}
@@ -545,7 +697,7 @@
my ($self) = @_;
my @backtrace;
- foreach ( 0 .. 5 ) {
+ foreach ( 1 .. 5 ) { # 0 = backtrace
my (
$package,$path,$line
# subroutine hasargs
@@ -554,10 +706,45 @@
) = caller($_) or last;
push @backtrace,
- qq|via $package at $path line $line|;
+ qq|via "$package" at $path line $line|;
}
- warn "# backtrace: ", dump( @backtrace ) if @backtrace;
+ #warn "# backtrace: ", dump( @backtrace ) if @backtrace;
return @backtrace;
}
+=head2 checkbox
+
+Generate checkbox html markup from some attribute
+
+ my $html = $self->checkbox('attribute_name', $value);
+
+=cut
+
+sub checkbox {
+ my ($self,$name,$value) = @_;
+ my $checked = '';
+ my $all_checkboxes = eval { $self->$name };
+ warn "ERROR tried to get checkbox value for '$name' which is unknown: $@" if $@;
+ $all_checkboxes = [ $all_checkboxes ] unless ref($all_checkboxes) eq 'ARRAY'; # sigh, too chatty
+ $checked = ' checked' if grep { defined $_ && $_ eq $value } @$all_checkboxes;
+ warn "# checkbox $name $value $checked\t", $self->dump( $self->$name );
+ qq||;
+}
+
+=head2 strip
+
+Strip whitespace around content
+
+ my $stripped = strip(' no more whitespace around this ');
+
+=cut
+
+sub strip {
+ my $t = shift;
+ $t =~ s{^\s+}{}gs;
+ $t =~ s{>\s+<}{><}gs;
+ $t =~ s{\s+$}{}gs;
+ return $t;
+}
+
1;