--- trunk/lib/Frey/Introspect.pm	2008/11/05 08:20:59	288
+++ trunk/lib/Frey/Introspect.pm	2008/11/05 19:13:01	308
@@ -10,7 +10,7 @@
 
 use lib 'lib';
 
-extends 'Frey';
+extends 'Frey::ClassLoader';
 with 'Frey::Web';
 
 has 'class' => (
@@ -32,7 +32,7 @@
 sub joose {
 	my ($self) = @_;
 
-	my ( $meta, $is_role ) = $self->load_class;
+	my ( $meta, $is_role ) = $self->class_meta;
 
 	if ( ! $is_role ) {
 		my @superclasses = map{ $_->meta->name }
@@ -77,7 +77,7 @@
 	$out .= "\t\t},\n\t\tmeta: Frey.HTML,
 		classMethods: {
 			renderHTML: function () {
-				return new Joose.SimpleRequest().getText(\"/Frey-Introspect?class=" . $self->class . "\")
+				return new Joose.SimpleRequest().getText(\"/" . $self->class . "\")
 			},\n";
 
 	$out .= "\t\t},\n";
@@ -109,7 +109,7 @@
 sub methods {
 	my $self = shift;
 
-	my ( $meta, $is_role ) = $self->load_class;
+	my ( $meta, $is_role ) = $self->class_meta;
 
 	my $attr;
 	$attr->{$_}++ foreach $meta->get_attribute_list;
@@ -119,14 +119,6 @@
 	return sort @methods;
 }
 
-use Frey::ClassLoader;
-
-sub load_class {
-	my $self = shift;
-	return Frey::ClassLoader->load_package( $self->class );
-}
-
-
 =head1 OUTPUT GENERATION
 
 =head2 markup
@@ -140,7 +132,7 @@
 
 	$self->add_head( 'static/introspect.css' );
 
-	my ( $meta, $is_role ) = $self->load_class;
+	my ( $meta, $is_role ) = $self->class_meta;
 
 	my $class = $self->class;
 
@@ -172,11 +164,12 @@
 				}
 				$after .= ' ';
 			}
-			qq|<td class="a">$before $_</td><td>$after</td>|
+			my $type = $attr->has_type_constraint ? $attr->type_constraint->name : '';
+			qq|<td class="a">$before $_</td><td class="t">$type</td><td>$after</td>|
 		} sort $meta->get_attribute_list
 	}
 
-	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>|;
+	my $table = qq|<table class="frey-object-browser"><tr><th class="m">Methods</th><th class="a">Attributes</th><th>Type</th><th class="p">Properties</th></tr>|;
 	while ( @methods || @attributes ) {
 		my ($m,$a) = ( shift @methods, shift @attributes );
 		$m ||= '<td></td>';
@@ -192,7 +185,7 @@
 				join(', ',
 					map {
 						my $name = $_->meta->name;
-						qq|<a class="frey-popdown" href="/Frey-Introspect?class=$name">$name<code>| . $_->meta->dump(2) . qq|</code></a>|;
+						qq|<a class="frey-popdown" href="/$name">$name<code>| . $_->meta->dump(2) . qq|</code></a>|;
 					}
 					#grep { $_ ne 'Moose::Object' }
 					$meta->superclasses
@@ -205,7 +198,7 @@
 			grep { ! m/\Q$class\E/ }	# skip me
 			map {
 				my $name = $_->name;
-				qq|<a class="frey-popdown" href="/Frey-Introspect?class=$name">$name<code>| . $name->meta->dump(2) . qq|</code></a>|;
+				qq|<a class="frey-popdown" href="/$name">$name<code>| . $name->meta->dump(2) . qq|</code></a>|;
 			}
 			$meta->calculate_all_roles
 		);