--- trunk/lib/Frey/Web.pm 2008/11/19 16:53:13 457 +++ trunk/lib/Frey/Web.pm 2008/11/20 11:56:41 473 @@ -1,6 +1,8 @@ package Frey::Web; use Moose::Role; +with 'Frey::Backtrace'; + use Frey::Types; use Continuity::Widget::DomNode; @@ -22,8 +24,8 @@ isa => 'ArrayRef[HashRef[Str]]', lazy => 1, default => sub { [ - { 'Bookmarklets' => Frey::Bookmarklet->new->as_markup }, { 'ClassBrowser' => Frey::ClassBrowser->new( usage_on_top => 0 )->as_markup }, + { 'Bookmarklets' => Frey::Bookmarklet->new->as_markup }, ] }, ); @@ -168,9 +170,28 @@ my $url = $self->request_url; $url =~ s{\?reload=\d+}{}; - my $body = $a->{body} || $self->as_markup; - return $body if $self->content_type !~ m{html}; - $body ||= ''; + my $body = $a->{body}; + $body ||= $self->as_markup if $self->can('as_markup'); + if ( $self->content_type !~ m{html} ) { + warn "# return only $self body ", $self->content_type; + return $body + } elsif ( ! defined $body ) { + warn "# no body"; + $body = ''; + } + + $status_line + .= qq|warn| + . $self->editor_links( join("", $self->warnings ) ) + . qq|| + if $self->warnings; + + my $right = + qq| + + $url + + |; my $html = join("\n", qq||, @@ -183,8 +204,8 @@ $body
Frey $Frey::VERSION - $url $status_line + $right
|, @@ -195,15 +216,31 @@ return $html; } +sub editor_links { + my ( $self, $error ) = @_; + + $error =~ s{at\s+(\S+)\s+line\s+(\d+)} + {at $1 line $2}gsm; + + $error =~ s{(via package ")([\w:]+)(")} + {$1$2$3}gsm; + + return $error; +} + sub error { my $self = shift; my $error = join(" ", @_); - my ($package, $filename, $line) = caller; - $error .= " at $filename line $line" if $error !~ m{ at }; - warn "WARN: $error\n"; - $error =~ s{at\s+(\S+)\s+line\s+(\d+)}{at $1 line $2}gsm; - $error =~ s{(via package ")([\w:]+)(")}{$1$2$3}gsm; - return qq|
$error
|; + + my @backtrace = $self->backtrace; + $error .= "\n\t" . join( "\n\t", @backtrace ) if @backtrace; + + warn "ERROR: $error\n"; + return + qq|
|
+		. $self->editor_links( $error ) .
+		qq|
| + ; } 1;