--- trunk/lib/Frey/Dumper.pm	2008/11/06 20:25:04	325
+++ trunk/lib/Frey/Dumper.pm	2008/11/06 20:56:44	327
@@ -1,6 +1,8 @@
 package Frey::Dumper;
 use Moose;
 
+with 'Frey::Escape';
+
 use Data::Dump qw/dump/;
 
 =head1 NAME
@@ -16,30 +18,29 @@
 
 sub markup {
 	my ($self) = @_;
+	qq|<div class="frey-dumper">| . $self->unroll( $self->data ) . qq|</div>|;
+}
 
-	sub unroll {
-		my ($data,$ref,$key) = @_;
-		my $out;
-		my $title = $ref ? qq| title="$ref"| : '';
-		if ( ref($data) eq 'ARRAY' ) {
-			$out .= "<li>$key</li>" if $key;
-			$out .= qq|<ol${title}>\n|;
-			$out .= unroll($_,ref($_)) foreach @$data;
-			$out .= "</ol>\n";
-		} elsif ( ref($data) ) {
-			$out .= "<li>$key</li>" if $key;
-			$out .= qq|<ul${title}>\n|;
-			$out .= unroll($data->{$_},ref($data->{$_}),$_) foreach keys %$data;
-			$out .= "</ul>\n";
-		} else {
-			$out .= qq|<li${title}>|;
-			$out .= "$key &rarr; " if $key;
-			$out .= dump( $data ) . "</li>";
-		}
-		return $out;
+sub unroll {
+	my ($self,$data,$ref,$key) = @_;
+	my $out;
+	my $title = $ref ? qq| title="$ref"| : '';
+	if ( ref($data) eq 'ARRAY' ) {
+		$out .= "<li>$key &darr;</li>" if $key;
+		$out .= qq|<ol${title} start=0>\n|;
+		$out .= $self->unroll($_,ref($_)) foreach @$data;
+		$out .= "</ol>\n";
+	} elsif ( ref($data) ) {
+		$out .= "<li>$key &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;
+		$out .= "<span>" . $self->html_dump( $data ) . "</span></li>";
 	}
-
-	unroll( $self->data );
+	return $out;
 }
 
 1;