--- trunk/lib/Frey/Web.pm	2008/11/18 00:19:22	388
+++ trunk/lib/Frey/Web.pm	2008/11/18 01:45:44	397
@@ -1,11 +1,13 @@
 package Frey::Web;
 use Moose::Role;
 
+#with 'Frey::Escape';
+
 use Frey::Types;
 
 use Continuity::Widget::DomNode;
 use Data::Dump qw/dump/;
-use Carp qw/confess cluck/;
+use Carp qw/confess/;
 use File::Slurp;
 
 has 'head' => (
@@ -24,7 +26,7 @@
 	] },
 );
 
-has 'urequest_url' => (
+has 'request_url' => (
 	is => 'rw',
 	isa => 'Uri', coerce => 1,
 	default => '/',
@@ -125,8 +127,16 @@
 	my $status_line = '';
 	foreach my $part ( @{ $self->status } ) {
 		foreach my $name ( keys %$part ) {
-			warn "### part [$name] = ", length( $part->{name} ), " bytes" if $self->debug;
-			$status_line .= qq|<span class="frey-popup">$name<span>| . $part->{$name} . qq|</span></span>|;
+			my $content = $part->{$name};
+			if ( ref($content) ) {
+				$content = '<code>' . dump($content) . '</code>';
+				my $l = length($content);
+				$content = qq|<span>$l bytes</span>| if $l > 1024;
+			} else {
+				$content = qq|<span>$content</span>|;
+			}
+			warn "### part [$name] = ", length( $content ), " bytes" if $self->debug;
+			$status_line .= qq|<span class="frey-popup">$name $content</span>\n|;
 		}
 	}
 
@@ -141,7 +151,7 @@
 		qq|
 		<div class="frey-status-line">
 			<a href="/">Frey</a> $Frey::VERSION
-			<a href="?reload=$reload_counter"><code>| . $self->urequest_url . qq|</code></a>
+			<a href="?reload=$reload_counter"><code>| . $self->request_url . qq|</code></a>
 			$status_line
 		</div>
 	    </body></html>
@@ -154,9 +164,12 @@
 }
 
 sub error {
-	my ( $self, $error ) = @_;
-	cluck $error;
-	$error =~ s{at\s+(\S+)\s+line\s+(\d+)}{ <a href="/editor$1+$2" target="editor">$1</a> line $2}gsm;
+	my $self = shift;
+	my $error = join(" ", @_);
+	my ($package, $filename, $line) = caller;
+	$error .= " at $filename line $line";
+	warn "WARN: $error\n";
+	$error =~ s{at\s+(\S+)\s+line\s+(\d+)}{at <a href="/editor$1+$2" target="editor">$1</a> line $2}gsm;
 	return qq|<pre class="frey-error">$error</pre>|;
 }