--- trunk/lib/Frey/Web.pm	2008/11/30 19:21:52	648
+++ trunk/lib/Frey/Web.pm	2008/12/02 01:49:49	674
@@ -7,7 +7,7 @@
 
 #use Continuity::Widget::DomNode;
 use Data::Dump qw/dump/;
-use Carp qw/confess cluck/;
+use Carp qw/confess cluck carp/;
 use File::Slurp;
 
 use Frey::Bookmarklet;
@@ -26,7 +26,7 @@
 	isa => 'Uri', coerce => 1,
 	required => 1,
 	default => sub {
-		cluck "undefined request_url";
+		carp "undefined request_url";
 		'/';
 	},
 );
@@ -225,7 +225,10 @@
 	if ( ! $body ) {
 		my $run = $a->{run} || 'as_markup';
 		warn "# no body, invoke $self->$run on ", ref($self);
-		$body = $self->$run;
+		eval {
+			$body = $self->$run;
+		};
+		$body = $self->error( $@, '' ) if $@;
 	}
 	if ( $self->content_type !~ m{html} ) {
 		warn "# return only $self body ", $self->content_type;
@@ -314,25 +317,47 @@
 
 #	$error =~ s[(bless\({\s+.+?\s+},\s+)("[^"]+")(\) at)][<span class="frey-dropdown">$1<code>$2</code>$3</span>]gs; # FIXME insert bless hiding back
 
+	# perl's backtrace
 	$error =~ s{at\s+(\S+)\s+line\s+(\d+)}
 		{at <a target="editor" href="/editor+$1+$2">$1</a> line $2}gsm;
 
-	$error =~ s{(via (?:package) "?)([\w:]+)("?)}
-		{$1<a target="editor" href="/editor+$2+1">$2</a>$3}gsm;
+	$error =~ s{(via (?:package)\s+"?)([\w:]+)("?)}
+		{$1<a target="$2" href="/$2">$2</a>$3}gsm;
+
+	# method error messages
+#	$error =~ s{(method ")(\w+)"}
+#		{$1<a target="/Frey::Shell::Grep?pattern=$2">$2</a>"}gsm; # FIXME replace with link to Frey::Introspect data
+
+	# anything that looks like "Class::Name"
+	$error =~ s{"(\w+(?:::\w+)+)"}
+		{"<a target="$1" href="/$1">$1</a>"}gsm;
 
 	return $error;
 }
 
+=head2 error
+
+This method will return error to browser and backtrace unless
+error message ends with LF C<\n> just like L<warn>
+
+=cut
+
 sub error {
 	my $self = shift;
 	my $error = join(" ", @_);
 
-	my @backtrace = $self->backtrace;
-	$error .= "\n\t" . join( "\n\t", @backtrace ) if @backtrace;
+	my $fatal = '';
+
+	if ( $error !~ m{\n$} ) {
+		if ( my @backtrace = $self->backtrace ) {
+			$error .= "\n\t" . join( "\n\t", @backtrace );
+			$fatal = qq| class="fatal"|;
+		}
+	}
 
 	warn "ERROR: $error\n";
 	return
-		qq|<pre class="frey-error">|
+		qq|<pre class="frey-error$fatal">|
 		. $self->editor_links( $error ) .
 		qq|</pre>|
 		;
@@ -373,11 +398,10 @@
 sub clean_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 }, 
+		{ 'ClassBrowser' => Frey::ClassBrowser->new( usage_on_top => 0 )->as_markup },
+		{ 'Bookmarklets' => Frey::Bookmarklet->new->as_markup },
+		{ 'INC' => Frey::INC->new->as_markup }, 
 	);
 	$icon_html = '';
 }
@@ -462,9 +486,13 @@
 	'"' => '"',
 };
 
+=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 || die "no log_path?";
 }
@@ -472,6 +500,9 @@
 our $last_log_pos  = 0;
 our $last_log_line = 0;
 
+our $pwd = `pwd`;
+chomp $pwd;
+
 sub warnings_html {
 	my ($self,$level) = shift;
 	$level ||= $self->debug,
@@ -528,6 +559,10 @@
 			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 $spacer = ' ';
 			my $real_msg = expand( $msg );
 			if ( length($real_msg) > $self->html_dump_width ) {
@@ -594,7 +629,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;