--- trunk/lib/Frey/Dumper.pm	2008/11/16 15:19:54	355
+++ trunk/lib/Frey/Dumper.pm	2008/11/19 15:28:23	455
@@ -1,6 +1,7 @@
 package Frey::Dumper;
 use Moose;
 
+with 'Frey::Web';
 with 'Frey::Escape';
 
 use Data::Dump qw/dump/;
@@ -16,7 +17,7 @@
 	required => 1,
 );
 
-sub markup {
+sub as_markup {
 	my ($self) = @_;
 	qq|<div class="frey-dumper">| . $self->unroll( $self->data ) . qq|</div>|;
 }
@@ -25,25 +26,31 @@
 	my ($self,$data,$ref,$key) = @_;
 	my $out;
 	my $title = $ref ? qq| title="$ref"| : '';
+
+	$out .= qq|<li${title}>|;
+	my $mark = $key || '&diams;';
+	$out .= $ref && $ref !~ m{^(ARRAY|HASH)$} ? qq|<a href="/$ref" class="blessed" target="blessed" title="$ref">$mark</a>| : ( $key || '' );
+
 	if ( ref($data) eq 'ARRAY' ) {
-		$out .= "<li>$key &darr;</li>" if $key;
+		$out .= " &darr;</li>" if $key;
 		$out .= qq|<ol${title} start=0>\n|;
 		$out .= $self->unroll($_,ref($_)) foreach @$data;
 		$out .= "</ol>\n";
-	} elsif ( ref($data) eq 'HASH' ) {
-		$out .= "<li>$key &darr;</li>" if $key;
+	} elsif ( ref($data) && eval { %$data } ) {
+		$out .= " &darr;</li>" if $key;
 		$out .= qq|<ul${title}>\n|;
 		$out .= $self->unroll($data->{$_},ref($data->{$_}),$_) foreach keys %$data;
 		$out .= "</ul>\n";
 	} else {
-		$out .= qq|<li${title}>|;
-		$out .= "$key &rarr; " if $key;
-		if ( $data =~ m{<(\w+)>.+</\1>} ) {
-			$out .= qq|<div style="background: #eee; color: #000">$data</div></li>|;
+		$out .= " &rarr; " if $key;
+		if ( defined $data && $data =~ m{<(\w+).*>.+</\1>} ) {
+			$out .= qq|<div style="background: #eee; color: #000" title="HTML">$data</div></li>|;
 		} else {
 			$out .= "<span>" . $self->html_dump( $data ) . "</span></li>";
 		}
 	}
+	$out .= "</li>";
+
 	return $out;
 }