--- trunk/lib/Frey/Web.pm 2008/11/19 03:36:24 448
+++ trunk/lib/Frey/Web.pm 2008/11/19 19:11:52 465
@@ -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->markup },
- { 'ClassBrowser' => Frey::ClassBrowser->new( usage_on_top => 0 )->markup },
+ { 'Bookmarklets' => Frey::Bookmarklet->new->as_markup },
+ { 'ClassBrowser' => Frey::ClassBrowser->new( usage_on_top => 0 )->as_markup },
] },
);
@@ -168,9 +170,15 @@
my $url = $self->request_url;
$url =~ s{\?reload=\d+}{};
- my $body = $a->{body} || $self->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 = '';
+ }
my $html = join("\n",
qq||,
@@ -198,11 +206,16 @@
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;
+
+ my @backtrace = $self->backtrace;
+ $error .= "\n\t" . join( "\n\t", @backtrace ) if @backtrace;
+
+ warn "ERROR: $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
|;
}