--- trunk/lib/Frey/Web.pm	2008/11/18 00:19:22	388
+++ trunk/lib/Frey/Web.pm	2008/11/18 16:39:13	417
@@ -1,13 +1,18 @@
 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;
 
+use Frey::Bookmarklet;
+use Frey::ClassBrowser;
+
 has 'head' => (
 	is => 'rw',
 	isa => 'ArrayRef[Str]',
@@ -19,12 +24,12 @@
 	isa => 'ArrayRef[HashRef[Str]]',
 	lazy => 1,
 	default => sub { [
-		{ 'Bookmarklets' => Frey::Bookmarklet->markup },
-		{ 'ClassBrowser' => Frey::ClassBrowser->markup },
+		{ 'Bookmarklets' => Frey::Bookmarklet->new->markup },
+		{ 'ClassBrowser' => Frey::ClassBrowser->new->markup },
 	] },
 );
 
-has 'urequest_url' => (
+has 'request_url' => (
 	is => 'rw',
 	isa => 'Uri', coerce => 1,
 	default => '/',
@@ -113,9 +118,6 @@
 
 =cut
 
-use Frey::Bookmarklet;
-use Frey::ClassBrowser;
-
 sub page {
 	my $self = shift;
 	my $a = {@_};
@@ -124,9 +126,18 @@
 
 	my $status_line = '';
 	foreach my $part ( @{ $self->status } ) {
+		confess "part not hash ",dump( $part ) unless ref($part) eq 'HASH';
 		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 +152,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 +165,13 @@
 }
 
 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" if $error !~ m{ at };
+	warn "WARN: $error\n";
+	$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;
 	return qq|<pre class="frey-error">$error</pre>|;
 }