+
reload
$exit
@@ -259,10 +312,24 @@
$self->add_icon unless $icon_html;
+ my $title = undef
+ || $a->{title}
+ || $self->title
+ || ref($self)
+ ;
+
+# $title =~ s{(\w)\w+::}{$1:}g; # XXX compress names of classes
+
+ $self->add_css(qq|
+ body {
+ padding-bottom: 3em; /* don't overlap status line */
+ }
+ |);
+
my $html = join("\n",
qq||,
$self->_head_html,
- '' . ( $self->title || $a->{title} || ref($self) ) . '',
+ qq|$title|,
'',
( $icon_html || '' ),
( $a->{head} || '' ),
@@ -304,37 +371,53 @@
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;
+ {$1$2$3}gsm
+ || # or anything that looks like "Class::Name"
+ $error =~ s{"(\w+(?:::\w+)+)"}
+ {"$1"}gsm;
# method error messages
-# $error =~ s{(method ")(\w+)"}
-# {$1$2"}gsm; # FIXME replace with link to Frey::Introspect data
+ # 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;
- # anything that looks like "Class::Name"
- $error =~ s{"(\w+(?:::\w+)+)"}
- {"$1"}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
@@ -347,20 +430,22 @@
my $error = join(" ", @_);
my $fatal = '';
+ my $backtrace = '';
if ( $error !~ m{\n$} ) {
if ( my @backtrace = $self->backtrace ) {
- $error .= "\n\t" . join( "\n\t", @backtrace );
- $fatal = qq| class="fatal"|;
+ $backtrace =
+ "\n" . $self->html_self . "->error backtrace\n\t"
+ . $self->html_links( join( "\n\t", @backtrace ) )
+ ;
+ $fatal = qq| frey-fatal|;
}
}
warn "ERROR: $error\n";
- return
- qq||
- . $self->editor_links( $error ) .
- qq|
|
- ;
+ $self->add_icon('error');
+ $error = $self->html_links( $error );
+ return qq|$error $backtrace
| ;
}
=head1 Status line
@@ -375,8 +460,8 @@
sub add_status {
my ( $self, $data ) = @_;
- push @status, { 'X' => [ $self->backtrace ] };
- if ( ref($data) ) {
+ die "no data" unless $data;
+ if ( ref $data ) {
push @status, $data;
} else {
if ( defined $status[ $#status ] ) {
@@ -399,7 +484,7 @@
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 },
);
@@ -436,24 +521,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||;
@@ -497,12 +597,20 @@
$Frey::Bootstrap::log_path || die "no log_path?";
}
-our $last_log_pos = 0;
-our $last_log_line = 0;
-
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,
@@ -557,11 +665,7 @@
if ( m{^(#*)} ) {
my $level = $1;
- my $msg = $_;
-
- # Mojo seems to expand warn messages to full path which is annoying
- $msg =~ s{/[^/]+/\.\./}{/}gs;
- $msg =~ s{$pwd/*}{}gs;
+ my $msg = $self->strip_full_path( $_ );
my $spacer = ' ';
my $real_msg = expand( $msg );
@@ -602,7 +706,7 @@
return
# need to wrap editor link into span so we can have links in warnings
qq||
;
}
@@ -620,7 +724,7 @@
my ($self) = @_;
my @backtrace;
- foreach ( 0 .. 5 ) {
+ foreach ( 1 .. 5 ) { # 0 = backtrace
my (
$package,$path,$line
# subroutine hasargs
@@ -635,4 +739,39 @@
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;