--- trunk/lib/Frey/Introspect.pm	2008/11/05 19:57:49	310
+++ trunk/lib/Frey/Introspect.pm	2008/11/05 20:18:33	314
@@ -152,6 +152,7 @@
 	}
 
 	my $role_method;
+	my $role_attribute;
 
 	if ( $meta->can('roles') ) {
 		my $role_nr = 1;
@@ -159,7 +160,8 @@
 			grep { ! m/\Q$class\E/ }	# skip me
 			map {
 				my $name = $_->name;
-				$role_method->{ $_ }->{$name} = $role_nr foreach $_->get_method_list;
+				$role_method->{    $_ }->{$name} = $role_nr foreach $_->get_method_list;
+				$role_attribute->{ $_ }->{$name} = $role_nr foreach $_->get_attribute_list;
 				qq|<a class="frey-popdown" href="/$name">$name<code>| . $name->meta->dump(2) . qq|</code></a><sup>| . $role_nr++ . qq|</sup>|;
 			}
 			$meta->calculate_all_roles
@@ -170,18 +172,19 @@
 
 	my @methods;
 	@methods = map {
-		my $method = $_;
-		if ( $role_method ) {
-			my ( $name, $nr ) = each %{ $role_method->{$_} };
-			$method .= qq|<sup title="$name">$nr</sup>|;
+		my $name = $_;
+		if ( $role_method->{$name} ) {
+			my ( $role_name, $nr ) = each %{ $role_method->{$name} };
+			$name .= qq|<sup title="$role_name">$nr</sup>|;
 		}
-		qq|<td class="m">$method</td>|
+		qq|<td class="m">$name</td>|
 	} $self->methods;
 
 	my @attributes;
 	if ( $meta->get_attribute_list ) {
 	@attributes = map {
-			my $attr = $meta->get_attribute($_);
+			my $name = $_;
+			my $attr = $meta->get_attribute($name);
 			my ( $before, $title, $after ) = ( '', '', '' );
 			( $before, $title, $after ) = ( '<b>', ' title="required"', '</b>' ) if $attr->is_required;
 warn $attr->dump(3);
@@ -204,11 +207,17 @@
 				$after .= ' ';
 			}
 			my $type = $attr->has_type_constraint ? $attr->type_constraint->name : '';
-			qq|<td class="a">$before $_</td><td class="t">$type</td><td>$after</td>|
+
+			if ( $role_attribute->{$name} ) {
+				my ( $role_name, $nr ) = each %{ $role_attribute->{$name} };
+				$name .= qq|<sup title="$role_name">$nr</sup>|;
+			}
+
+			qq|<td class="a">$before $name</td><td class="t">$type</td><td>$after</td>|
 		} sort $meta->get_attribute_list
 	}
 
-	my $table = qq|<table class="frey-object-browser"><tr><th class="m">Methods</th><th class="a">Attributes</th><th>Type</th><th class="p">Properties</th></tr>|;
+	my $table = qq|<table class="frey-introspect"><tr><th class="m">Methods</th><th class="a">Attributes</th><th>Type</th><th class="p">Properties</th></tr>|;
 	while ( @methods || @attributes ) {
 		my ($m,$a) = ( shift @methods, shift @attributes );
 		$m ||= '<td></td>';
@@ -220,13 +229,13 @@
 	my $pod = Frey::Pod->new( class => $class )->markup;
 
 	use Frey::Run;
-	my $execute = join("\n", map { qq|<a href="/$class/$_">$_</a>| } grep { $class->can($_) } Frey::Run->execute );
-	$execute = " execute: $execute" if $execute;
+	my $runnable = join("\n", map { qq|<a href="/$class/$_">$_</a>| } grep { $class->can($_) } Frey::Run->runnable );
+	$runnable = " runnable: $runnable" if $runnable;
 
 	my $html = $self->page(
 		title => "Introspect $class",
 		body => qq|<h1>$class</h1>|
-			. qq|<div class="frey-object-browser">$superclasses\n$roles\n$execute\n|
+			. qq|<div class="frey-introspect">$superclasses\n$roles\n$runnable\n|
 			. ( $pod ? qq|<a href="#___top" title="Skip to POD" style="font-size: 80%; color: #aaa;">&darr;pod&darr</a>| : '' )
 			. qq|$table\n$pod</div>|