--- trunk/lib/Frey/Web.pm 2008/12/02 01:31:32 671
+++ trunk/lib/Frey/Web.pm 2008/12/02 18:29:01 685
@@ -86,7 +86,7 @@
$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
+# $dump =~ $self->html_links( $dump ); # FIXME include this
return "$dump
";
}
@@ -228,10 +228,7 @@
eval {
$body = $self->$run;
};
- $body
- = $self->error( $@ )
- . $self->dropdown( self => $self )
- if $@;
+ $body = $self->error( $@, '' ) if $@;
}
if ( $self->content_type !~ m{html} ) {
warn "# return only $self body ", $self->content_type;
@@ -307,34 +304,42 @@
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;
- # our backtrace
- $error =~ s{(via (?:package) "?)([\w:]+)("?)}
- {$1$2$3}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
-# $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;
}
@@ -355,14 +360,14 @@
if ( $error !~ m{\n$} ) {
if ( my @backtrace = $self->backtrace ) {
$error .= "\n\t" . join( "\n\t", @backtrace );
- $fatal = qq| class="fatal"|;
+ $fatal = qq| frey-fatal|;
}
}
warn "ERROR: $error\n";
return
qq|
| - . $self->editor_links( $error ) . + . $self->html_links( $error ) . qq|| ; } @@ -501,12 +506,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, @@ -561,11 +574,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 ); @@ -606,7 +615,7 @@ return # need to wrap editor link into span so we can have links in warnings qq|warn
|
- . $self->editor_links( $warnings )
+ . $self->html_links( $warnings )
. qq|
|
;
}
@@ -633,7 +642,7 @@
) = 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;
return @backtrace;