--- trunk/lib/Frey/Introspect.pm	2008/07/11 19:19:42	100
+++ trunk/lib/Frey/Introspect.pm	2008/07/15 23:35:27	139
@@ -25,14 +25,14 @@
 
 =head2 joose
 
-  my $js = $o->joose( 'Some::Package' );
+  my $js = $o->joose;
 
 =cut
 
 sub joose {
 	my ($self) = @_;
 
-	my ( $class, $meta, $is_role ) = $self->load_package;
+	my ( $meta, $is_role ) = $self->load_package;
 
 	if ( ! $is_role ) {
 		my @superclasses = map{ $_->meta->name }
@@ -42,15 +42,17 @@
 
 	my $out;
 
-	my ( $m, $c ) = split(/::/, $class->name, 2);
+	my ( $m, $c ) = split(/::/, $self->package, 2);
 	my $filename = $m . '.' . ( $c ? "$c." : '' ) . 'js';
 
+	$c ||= '';
+
 	$out .= "Module(\"$m\", function (m) {\n\tClass(\"$c\", {\n\t\thas: {\n";
 
-	foreach ( $class->get_attribute_list ) {
+	foreach ( $meta->get_attribute_list ) {
 		$out .= "\t\t\t$_: {\n";
 
-		my $attr = $class->get_attribute($_);
+		my $attr = $meta->get_attribute($_);
 		my $is = $attr->_is_metadata;
 		$out .= "\t\t\t\tis: \"$is\",\n" if defined $is;
 		$out .= "\t\t\t\tlazy: true,\n" if $attr->is_lazy;
@@ -85,9 +87,9 @@
 	$out =~ s/,\n$/\n/;
 	$out .= "});\n";
 
-	$out .= "\nconsole.log( 'loaded " . $class->name . " from $filename' );\n";
+	$out .= "\nconsole.log( 'loaded " . $self->package . " from $filename' );\n";
 
-	warn "method_list = ",dump( $class->get_method_list ) if $self->debug;
+	warn "method_list = ",dump( $meta->get_method_list ) if $self->debug;
 
 #	print $out;
 	my $path = "static/blib/$filename";
@@ -107,14 +109,14 @@
 sub methods {
 	my $self = shift;
 
-	my ( $class, $meta, $is_role ) = $self->load_package;
+	my ( $meta, $is_role ) = $self->load_package;
 
 	my $attr;
-	$attr->{$_}++ foreach $class->get_attribute_list;
-	my @methods = grep { ! defined($attr->{$_}) } $class->get_method_list;
+	$attr->{$_}++ foreach $meta->get_attribute_list;
+	my @methods = grep { ! defined($attr->{$_}) } $meta->get_method_list;
 	warn "# methods = ",dump( @methods ) if $self->debug;
 
-	return @methods;
+	return sort @methods;
 }
 
 use Frey::ClassLoader;
@@ -136,69 +138,68 @@
 sub html {
 	my ( $self, $request ) = @_;
 
+	$self->add_css( 'static/introspect.css' );
+	warn "## css = ",dump( $self->css );
+
 	while (1) {
 
-		my $js = $self->head_javascript;
-		$js .= << '__END_OF_JS__';
-<script type="text/javascript">
-joose.loadComponents("../lib")
+		my ( $meta, $is_role ) = $self->load_package;
 
-function $(id) {
-	return document.getElementById(id)
-}
+		my $package = $self->package;
 
-</script>
-__END_OF_JS__
+		my @methods;
+		@methods = map { qq|<td><a href="/~/$package/$_">$_</a></td>| } $self->methods;
 
-		my ( $class, $meta, $is_role ) = $self->load_package;
+		my @attributes;
+		if ( $meta->get_attribute_list ) {
+		@attributes = map {
+				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>|
+			} sort $meta->get_attribute_list
+		}
 
-		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 $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 $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>';
+		my $classes =
+			qq|<div class="classes">| .
+			Frey::ClassBrowser->new->markup .
+			qq|</div>|;
+
+		my ( $superclasses, $roles ) = ( '', 'Role' );
+		if ( ! $is_role ) {
+			if ( $meta->superclasses ) {
+				$superclasses = 'Superclasses: ' .
+					join(', ',
+						map { my $s = $_->meta->name; qq|<a href="/~/$s">$s</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;
+			}
 		}
 
+		my $pod = Frey::Pod->new( class => $package )->markup;
+
+		my $html = $self->page(
+			title => "Introspect $package",
+			body => qq|<h1>$package</h1>|
+				. qq|$superclasses\n$roles\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|,
 
-		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,
-				],
-			]
 		);
 
 		$request->print($html);