--- trunk/lib/Frey/Introspect.pm	2008/07/15 23:35:27	139
+++ trunk/lib/Frey/Introspect.pm	2008/11/01 01:38:13	227
@@ -129,17 +129,16 @@
 
 =head1 OUTPUT GENERATION
 
-=head2 html
+=head2 request
 
-  $o->html( $request );
+  $o->request( $request );
 
 =cut
 
-sub html {
+sub request {
 	my ( $self, $request ) = @_;
 
-	$self->add_css( 'static/introspect.css' );
-	warn "## css = ",dump( $self->css );
+	$self->add_head( 'static/introspect.css' );
 
 	while (1) {
 
@@ -148,7 +147,7 @@
 		my $package = $self->package;
 
 		my @methods;
-		@methods = map { qq|<td><a href="/~/$package/$_">$_</a></td>| } $self->methods;
+		@methods = map { qq|<td class="m">$_</td>| } $self->methods;
 
 		my @attributes;
 		if ( $meta->get_attribute_list ) {
@@ -156,11 +155,29 @@
 				my $attr = $meta->get_attribute($_);
 				my ( $before, $title, $after ) = ( '', '', '' );
 				( $before, $title, $after ) = ( '<b>', ' title="required"', '</b>' ) if $attr->is_required;
-				qq|<td>$before<a href="/~/$package/?$_">$_</a>$after</td>|
+warn $attr->dump(3);
+				foreach my $check ( qw/has_type_constraint has_handles is_weak_ref is_required is_lazy should_coerce should_auto_deref has_trigger has_documentation has_applied_traits/ ) {
+					my $getter;
+					
+					$getter = $check;
+					$getter =~ s/^has_//;
+					
+					if ( $attr->$check ) {
+						if ( $getter eq $check ) {
+							$after .= "$check";
+						} else {
+							$after .= qq{<span class="frey-popdown">$check};
+							$after .= '<code>' . $attr->$getter->dump . '</code>' if $getter ne $check;
+							$after .= '</span>';
+						}
+					}
+					$after .= ' ';
+				}
+				qq|<td class="a">$before $_</td><td>$after</td>|
 			} sort $meta->get_attribute_list
 		}
 
-		my $table = qq|<table><tr><th>Methods</th><th>Attributes</th></tr>|;
+		my $table = qq|<table class="frey-object-browser"><tr><th class="m">Methods</th><th class="a">Attributes</th><th class="p">Properties</th></tr>|;
 		while ( @methods || @attributes ) {
 			my ($m,$a) = ( shift @methods, shift @attributes );
 			$m ||= '<td></td>';
@@ -169,36 +186,45 @@
 		}
 		$table .= qq|</table>|;
 
-		my $classes =
-			qq|<div class="classes">| .
-			Frey::ClassBrowser->new->markup .
-			qq|</div>|;
-
-		my ( $superclasses, $roles ) = ( '', 'Role' );
+		my ( $superclasses, $roles ) = ( '<b>Role</b>', '' );
 		if ( ! $is_role ) {
 			if ( $meta->superclasses ) {
 				$superclasses = 'Superclasses: ' .
 					join(', ',
-						map { my $s = $_->meta->name; qq|<a href="/~/$s">$s</a>| }
+						map {
+							my $name = $_->meta->name;
+							qq|<a class="frey-popdown" href="/~/$name">$name<code>| . $_->meta->dump(2) . qq|</code></a>|;
+						}
 						#grep { $_ ne 'Moose::Object' }
 						$meta->superclasses
 					);
 			}
+		}
 
-			if ( $meta->can('roles') ) {
-				$roles = join(', ', map { my $r = $_->name; qq|<a href="/~/$r">$r</a>| } @{ $meta->roles } );
-				$roles = " with roles: $roles" if $roles;
-			}
+		if ( $meta->can('roles') ) {
+			$roles = join(', ',
+				grep { ! m/\Q$package\E/ }	# skip me
+				map {
+					my $name = $_->name;
+					qq|<a class="frey-popdown" href="/~/$name">$name<code>| . $name->meta->dump(2) . qq|</code></a>|;
+				}
+				$meta->calculate_all_roles
+			);
+			$roles = " with roles: $roles" if $roles;
 		}
 
 		my $pod = Frey::Pod->new( class => $package )->markup;
 
+		use Frey::Run;
+		my $execute = join("\n", map { qq|<a href="/$_/$package">$_</a>| } grep { $package->can($_) } Frey::Run->execute );
+		$execute = " execute: $execute" if $execute;
+
 		my $html = $self->page(
 			title => "Introspect $package",
 			body => qq|<h1>$package</h1>|
-				. qq|$superclasses\n$roles\n|
+				. qq|$superclasses\n$roles\n$execute\n|
 				. ( $pod ? qq|<a href="#___top" title="Skip to POD" style="font-size: 80%; color: #aaa;">&darr;pod&darr</a>| : '' )
-				. qq|$table\n$pod\n$classes|,
+				. qq|$table\n$pod|
 
 		);