--- trunk/lib/Frey/Introspect.pm	2008/07/13 19:46:10	120
+++ trunk/lib/Frey/Introspect.pm	2008/10/28 21:47:18	199
@@ -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,11 +109,11 @@
 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 sort @methods;
@@ -136,39 +138,45 @@
 sub html {
 	my ( $self, $request ) = @_;
 
-	while (1) {
-
-		my $js = $self->head_javascript;
-		$js .= << '__END_OF_JS__';
-<script type="text/javascript">
-joose.loadComponents("../lib")
-
-function $(id) {
-	return document.getElementById(id)
-}
+	$self->add_head( 'static/introspect.css' );
 
-</script>
-__END_OF_JS__
+	while (1) {
 
-		my ( $class, $meta, $is_role ) = $self->load_package;
+		my ( $meta, $is_role ) = $self->load_package;
 
 		my $package = $self->package;
 
 		my @methods;
-		@methods = map { qq|<td><a href="/~/$package/$_">$_</a></td>| } $self->methods if $class->can('meta');
+		@methods = map { qq|<td><a href="/~/$package/$_">$_</a></td>| } $self->methods;
 
 		my @attributes;
-		if ( $class->get_attribute_list ) {
+		if ( $meta->get_attribute_list ) {
 		@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 $attr = $meta->get_attribute($_);
+				my ( $before, $title, $after ) = ( '', '', '' );
+				( $before, $title, $after ) = ( '<b>', ' title="required"', '</b>' ) if $attr->is_required;
+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-popup">$check};
+							$after .= '<span>' . $attr->$getter->dump . '</span>' if $getter ne $check;
+							$after .= ' </span>';
+						}
+					}
+				}
+				qq|<td align="right">$before<a href="/~/$package/?$_">$_</a></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>Methods</th><th align="right">Attributes</th><th align="left">Properties</th></tr>|;
 		while ( @methods || @attributes ) {
 			my ($m,$a) = ( shift @methods, shift @attributes );
 			$m ||= '<td></td>';
@@ -179,22 +187,45 @@
 
 		my $classes =
 			qq|<div class="classes">| .
-			Frey::ClassBrowser->new->html_markup .
+			Frey::ClassBrowser->new->markup .
 			qq|</div>|;
 
-		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 ],
-					$table,
-					$classes,
-				],
-			]
+		my ( $superclasses, $roles ) = ( '<b>Role</b>', '' );
+		if ( ! $is_role ) {
+			if ( $meta->superclasses ) {
+				$superclasses = 'Superclasses: ' .
+					join(', ',
+						map {
+							my $name = $_->meta->name;
+							qq|<a class="frey-popup" href="/~/$name">$name<span>| . $_->meta->dump(2) . qq|</span></a>|;
+						}
+						#grep { $_ ne 'Moose::Object' }
+						$meta->superclasses
+					);
+			}
+		}
+
+		if ( $meta->can('roles') ) {
+			$roles = join(', ',
+				grep { ! m/\Q$package\E/ }	# skip me
+				map {
+					my $name = $_->name;
+					qq|<a class="frey-popup" href="/~/$name">$name<span>| . $name->meta->dump(2) . qq|</span></a>|;
+				}
+				$meta->calculate_all_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|,
+
 		);
 
 		$request->print($html);