--- trunk/lib/Frey/Introspect.pm	2008/07/11 19:19:42	100
+++ trunk/lib/Frey/Introspect.pm	2008/07/14 22:44:12	124
@@ -114,7 +114,7 @@
 	my @methods = grep { ! defined($attr->{$_}) } $class->get_method_list;
 	warn "# methods = ",dump( @methods ) if $self->debug;
 
-	return @methods;
+	return sort @methods;
 }
 
 use Frey::ClassLoader;
@@ -138,67 +138,55 @@
 
 	while (1) {
 
-		my $js = $self->head_javascript;
-		$js .= << '__END_OF_JS__';
-<script type="text/javascript">
-joose.loadComponents("../lib")
-
-function $(id) {
-	return document.getElementById(id)
-}
-
-</script>
-__END_OF_JS__
-
 		my ( $class, $meta, $is_role ) = $self->load_package;
 
-		my $methods;
-		if ( $class->can('meta') ) {
-			$methods = dom2html(
-				h2 => [ 'Methods' ],
-				ul => [
-					map { (
-						li => [ a => { href => '/~/' . $self->package . '/' . $_ } => [ $_ ] ]
-					) } $self->methods
-				]
-			);
-		} else {
-			$methods = '<b>not introspectable</b>';
-		}
+		my $package = $self->package;
+
+		my @methods;
+		@methods = map { qq|<td><a href="/~/$package/$_">$_</a></td>| } $self->methods if $class->can('meta');
 
-		my $attributes;
+		my @attributes;
 		if ( $class->get_attribute_list ) {
-			$attributes = dom2html(
-				h2 => [ 'Atrributes' ],
-				table => [
-					map {
-						my $attr = $class->get_attribute($_);
-						warn "## $_ ", $attr->is_required ? 'required' : 'optional';
-						( tr => [
-							td => [ a => { href => '/~/' . $self->package . '/' . $_ } => [ $_ ] ],
-							td => [ $attr->is_required ? ' <b>required</b>' : '' ],
-						] )
-					} $class->get_attribute_list
-				],
-			);
-		} else {
-			$attributes = '<b>no attributes</b>';
+		@attributes = map {
+				my $attr = $class->get_attribute($_);
+#				warn "## $_ ", $attr->is_required ? 'required' : 'optional';
+				qq|<td><a href="/~/$package/$_?">$_</a></td><td>| .
+				( $attr->is_required ? ' <b>required</b>' : '' ) .
+				qq|</td>|;
+			} sort $class->get_attribute_list
 		}
 
+		my $table = qq|<table><tr><th>Methods</th><th>Attributes</th></tr>|;
+		while ( @methods || @attributes ) {
+			my ($m,$a) = ( shift @methods, shift @attributes );
+			$m ||= '<td></td>';
+			$a ||= '<td></td>';
+			$table .= qq|<tr>$m$a</tr>|;
+		}
+		$table .= qq|</table>|;
 
-		my $html = dom2html(
-			html => [
-				head => [
-					link => { rel=>"stylesheet", href=>"/static/app.css", type=>"text/css", media=>"screen" },
-					$js,
-					title => [ 'Introspect ', $self->package ],
-				],
-				body => [
-					h1 => [ $self->package ],
-					$methods,
-					$attributes,
-				],
-			]
+		my $classes =
+			qq|<div class="classes">| .
+			Frey::ClassBrowser->new->markup .
+			qq|</div>|;
+
+		$self->add_css( 'static/introspect.css' );
+
+		warn "## css = ",dump( $self->css );
+
+		my $superclasses = 'Role';
+		$superclasses = 'Superclasses: ' . join(', ',
+			map {
+				my $s = $_->meta->name;
+				qq|<a href="/~/$s">$s</a>|
+			}
+			#grep { $_ ne 'Moose::Object' }
+			$meta->superclasses
+		) if ! $is_role && $meta->superclasses;
+	
+		my $html = $self->page(
+			title => "Introspect $package",
+			body => "<h1>$package</h1>$superclasses\n$table\n$classes",
 		);
 
 		$request->print($html);