--- trunk/lib/Frey/Introspect.pm	2008/12/05 17:34:42	727
+++ trunk/lib/Frey/Introspect.pm	2008/12/06 00:43:28	733
@@ -11,9 +11,8 @@
 use PPI;
 use PPI::HTML;
 
-use Frey::Pod;
-
 use lib 'lib';
+use Frey::Pod;
 
 extends 'Frey::PPI';
 with 'Frey::Web';
@@ -121,7 +120,7 @@
 				join(', ',
 					map {
 						my $name = $_->meta->name;
-						$introspect->{superclass}->{$name}++;
+						$introspect->{superclass}->{$name} = {};
 						$self->dropdown( $name, $_->meta )
 					}
 					#grep { $_ ne 'Moose::Object' }
@@ -130,8 +129,8 @@
 		}
 	}
 
-	my $role_method;
-	my $role_attribute;
+	my $method_from_role;
+	my $attribute_from_role;
 
 	if ( $meta->can('roles') ) {
 		my $role_nr = 1;
@@ -139,24 +138,26 @@
 			grep { ! m/\Q$class\E/ }	# skip me
 			map {
 				my $name = $_->name;
-				$introspect->{role}->{$name}++;
-				$role_method->{    $_ }->{$name} = $role_nr foreach $_->get_method_list;
-				$role_attribute->{ $_ }->{$name} = $role_nr foreach $_->get_attribute_list;
+				$introspect->{roles}->{$name} = {};
+				$method_from_role->{    $_ }->{$name} = $role_nr foreach $_->get_method_list;
+				$attribute_from_role->{ $_ }->{$name} = $role_nr foreach $_->get_attribute_list;
 				$self->dropdown( $name, $name->meta ) . qq|<sup>| . $role_nr++ . qq|</sup>|;
 			}
 			$meta->calculate_all_roles
 		);
 		$roles = qq| with roles: $roles| if $roles;
 	}
-	warn "# role_method ",dump( $role_method );
+	warn "# method_from_role ",dump( $method_from_role );
 
 	my @methods;
 	@methods = map {
 		my $name = $_;
-		$introspect->{method}->{$name}++;
-		if ( $role_method->{$name} ) {
-			my ( $role_name, $nr ) = each %{ $role_method->{$name} };
+		if ( $method_from_role->{$name} ) {
+			my ( $role_name, $nr ) = each %{ $method_from_role->{$name} };
+			$introspect->{methods}->{$name}->{role} = $role_name;
 			$name .= qq|<sup title="$role_name">$nr</sup>|;
+		} else {
+			$introspect->{methods}->{$name} = {};
 		}
 		qq|<td class="m">$name</td>|
 	} sort $self->class_methods( $class );
@@ -165,15 +166,17 @@
 	if ( $meta->get_attribute_list ) {
 		@attributes = map {
 			my $name = $_;
-			$introspect->{attribute}->{$name}++;
+			$introspect->{attribute}->{$name} = {}; 
 			my $html_name = $name;
 			my $attr = $meta->get_attribute($name);
 			confess "$class attribute $name isn't blessed ",dump( $attr ) unless blessed $attr;
 			warn "## attr $name ref ",ref( $attr ) if $self->debug;
 
 			my ( $title, $properties ) = ( '', '' );
-			( $html_name, $title ) = ( "<b>$name</b>", ' title="required"' )
-				if $attr->can('is_required') && $attr->is_required;
+			if ( $attr->can('is_required') && $attr->is_required ) {
+				( $html_name, $title ) = ( "<b>$name</b>", ' title="required"' );
+				$introspect->{attribute}->{$name}->{required} = 1;
+			}
 
 			foreach my $check ( qw/has_type_constraint has_handles is_weak_ref is_required is_lazy should_coerce should_auto_deref has_default has_trigger has_applied_traits/ ) {
 				my $getter;
@@ -193,8 +196,8 @@
 			}
 			my $type = $attr->can('has_type_constraint') && $attr->has_type_constraint ? $attr->type_constraint->name : '';
 
-			if ( $role_attribute->{$name} ) {
-				my ( $role_name, $nr ) = each %{ $role_attribute->{$name} };
+			if ( $attribute_from_role->{$name} ) {
+				my ( $role_name, $nr ) = each %{ $attribute_from_role->{$name} };
 				$name .= qq|<sup title="$role_name">$nr</sup>|;
 			}
 
@@ -241,7 +244,7 @@
 
 	my $runnable = join("\n",
 		map {
-			$introspect->{runnable}->{$_}++;
+			$introspect->{runnable}->{$_} = {};
 			my $short = $_;
 			$short =~ s{_as_(?:markup|data|sponge)$}{};
 			qq|<a target="$class" href="/$class/$_" title="/$class/$_">$short</a>|