--- trunk/lib/Frey/Introspect.pm	2008/11/18 11:53:58	406
+++ trunk/lib/Frey/Introspect.pm	2008/12/01 23:28:27	662
@@ -11,10 +11,13 @@
 use PPI;
 use PPI::HTML;
 
+use Frey::Pod;
+
 use lib 'lib';
 
-extends 'Frey::ClassLoader';
+extends 'Frey::PPI';
 with 'Frey::Web';
+with 'Frey::Storage';
 
 has 'class' => (
 	is => 'rw',
@@ -22,10 +25,6 @@
 	required => 1,
 );
 
-has 'path' => (
-	is => 'rw',
-);
-
 =head2 joose
 
   my $js = $o->joose;
@@ -98,39 +97,11 @@
 	my $path = "static/blib/$filename";
 	write_file( $path, $out );
 	warn "# created $path\n";
-	$self->path( $path );
 
 	return $out;
 }
 
-=head2 methods
-
-  my @methods = $o->methods;
-
-=cut
-
-sub methods {
-	my $self = shift;
-
-	my ( $meta, $is_role ) = $self->class_meta;
-
-	my $attr;
-	$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;
-}
-
-=head1 OUTPUT GENERATION
-
-=head2 markup
-
-  $o->markup;
-
-=cut
-
-sub markup {
+sub as_markup {
 	my ( $self ) = @_;
 
 	$self->add_head( 'static/introspect.css' );
@@ -139,6 +110,10 @@
 
 	my $class = $self->class;
 
+	my $introspect_path = "var/introspect/$class.yaml";
+	$self->mkbasepath( $introspect_path );
+	my $introspect = $self->load( $introspect_path );
+
 	my ( $superclasses, $roles ) = ( '<b>Role</b>', '' );
 	if ( ! $is_role ) {
 		if ( $meta->superclasses ) {
@@ -146,7 +121,8 @@
 				join(', ',
 					map {
 						my $name = $_->meta->name;
-						qq|<a class="frey-popdown" href="/$name">$name<code>| . $_->meta->dump(2) . qq|</code></a>|;
+						$introspect->{superclass}->{$name}++;
+						$self->dropdown( $name, $_->meta )
 					}
 					#grep { $_ ne 'Moose::Object' }
 					$meta->superclasses
@@ -163,9 +139,10 @@
 			grep { ! m/\Q$class\E/ }	# skip me
 			map {
 				my $name = $_->name;
+				$introspect->{role}->{$name}++;
 				$role_method->{    $_ }->{$name} = $role_nr foreach $_->get_method_list;
 				$role_attribute->{ $_ }->{$name} = $role_nr foreach $_->get_attribute_list;
-				qq|<a class="frey-popdown" href="/$name">$name<code>| . $name->meta->dump(2) . qq|</code></a><sup>| . $role_nr++ . qq|</sup>|;
+				$self->dropdown( $name, $name->meta ) . qq|<sup>| . $role_nr++ . qq|</sup>|;
 			}
 			$meta->calculate_all_roles
 		);
@@ -176,48 +153,55 @@
 	my @methods;
 	@methods = map {
 		my $name = $_;
+		$introspect->{method}->{$name}++;
 		if ( $role_method->{$name} ) {
 			my ( $role_name, $nr ) = each %{ $role_method->{$name} };
 			$name .= qq|<sup title="$role_name">$nr</sup>|;
 		}
 		qq|<td class="m">$name</td>|
-	} $self->methods;
+	} $self->class_methods( $class );
 
 	my @attributes;
 	if ( $meta->get_attribute_list ) {
-	@attributes = map {
+		@attributes = map {
 			my $name = $_;
+			$introspect->{attribute}->{$name}++;
+			my $html_name = $name;
 			my $attr = $meta->get_attribute($name);
+			confess "$class attribute $name isn't blessed ",dump( $attr ) unless blessed $attr;
 			warn "## attr $name ref ",ref( $attr ) if $self->debug;
-			my ( $before, $title, $after ) = ( '', '', '' );
-			( $before, $title, $after ) = ( '<b>', ' title="required"', '</b>' ) if $attr->is_required;
-			foreach my $check ( qw/has_type_constraint has_handles is_weak_ref is_required is_lazy should_coerce should_auto_deref has_default has_trigger has_documentation has_applied_traits/ ) {
+
+			my ( $title, $properties ) = ( '', '' );
+			( $html_name, $title ) = ( "<b>$name</b>", ' title="required"' )
+				if $attr->can('is_required') && $attr->is_required;
+
+			foreach my $check ( qw/has_type_constraint has_handles is_weak_ref is_required is_lazy should_coerce should_auto_deref has_default has_trigger has_applied_traits/ ) {
 				my $getter;
 				
 				$getter = $check;
 				$getter =~ s/^has_//;
 				
-				if ( $attr->$check ) {
+				if ( $attr->can($check) && $attr->$check ) {
 					if ( $getter eq $check ) {
-						$after .= "$check";
+						$properties .= "$check";
 					} else {
-						$after .= qq{<span class="frey-popdown">$check};
-						# we need dump here instead of $attr->$getter->dump because default can return scalar
-						$after .= '<code>' . dump( $attr->$getter ) . '</code>' if $getter ne $check;
-						$after .= '</span>';
+						# we need our dump here instead of $attr->$getter->dump because default can return scalar
+						$properties .= $self->dropdown( $check, $attr->$getter );
 					}
 				}
-				$after .= ' ';
+				$properties .= ' ';
 			}
-			my $type = $attr->has_type_constraint ? $attr->type_constraint->name : '';
+			my $type = $attr->can('has_type_constraint') && $attr->has_type_constraint ? $attr->type_constraint->name : '';
 
 			if ( $role_attribute->{$name} ) {
 				my ( $role_name, $nr ) = each %{ $role_attribute->{$name} };
 				$name .= qq|<sup title="$role_name">$nr</sup>|;
 			}
 
-			qq|<td class="a">$before $name</td><td class="t">$type</td><td>$after</td>|
-		} sort $meta->get_attribute_list
+			eval { $properties = $attr->documentation . ' ' . $properties };
+
+			qq|<td class="a">$html_name</td><td class="t">$type</td><td>$properties</td>|
+		} $meta->get_attribute_list
 	}
 
 	my $table = qq|<table class="frey-introspect"><tr><th class="m">Methods</th><th class="a">Attributes</th><th>Type</th><th class="p">Properties</th></tr>|;
@@ -229,7 +213,7 @@
 	}
 	$table .= qq|</table>|;
 
-	my $pod = Frey::Pod->new( class => $class )->markup;
+	my $pod = Frey::Pod->new( class => $class, request_url => $self->request_url )->as_markup;
 	$pod = $pod->{body} if ref($pod);
 
 	my $path = $self->class_path( $class );
@@ -248,30 +232,45 @@
 	# Spit out the HTML
 	my $source = $Highlight->html( $Document );
 
-	$source =~ s{(<span.*?line_number.*>\s*)(\d+)(:\s*</span>)}{$1<a href="/editor+$path+$2" title="edit $path +$2" target="editor">$2</a>$3}g;
+	$source =~ s{(<span.*?line_number.*>\s*)(\d+)(:\s*</span>)}{$1<a target="editor" href="/editor+$path+$2">$2</a>$3}g;
 
 	# strip page html
 #	$source =~ s{^.*<body[^>]+>}{}s;
 #	$source =~ s{</body.*$}{}s;
 
-
-	use Frey::Run;
-	my $runnable = join("\n", map { qq|<a href="/$class/$_">$_</a>| } grep { $class->can($_) } Frey::Run->runnable );
+	my $runnable = join("\n",
+		map {
+			$introspect->{runnable}->{$_}++;
+			my $short = $_;
+			$short =~ s{_as_(?:markup|data|sponge)$}{};
+			qq|<a target="$class" href="/$class/$_" title="/$class/$_">$short</a>|
+		} $self->class_runnable( $class )
+	);
 	$runnable = " runnable: $runnable" if $runnable;
 
-	my $html = {
-		title => $class,
-		body => join("\n",
-			qq|<h1>$class</h1>|,
-			qq|<div class="frey-introspect">$superclasses\n$roles\n$runnable\n|,
-			$pod    ? qq|<a class="frey-skip" href="#___top" title="Skip to POD"    >pod</a>|    : '',
-			$source ? qq|<a class="frey-skip" href="#source" title="Skip to source" >source</a>| : '',
-			qq|$table\n$pod\n</div>\n|,
-			qq|<h1>Source</h1><a name="source"></a><div class="frey-source">$source</div>|,
-		),
-	};
+	$self->store( $introspect_path, $introspect );
+
+	$self->title( $class );
 
-	return $html;
+	my $has_tests = '';
+	my @tests = grep { defined $_ } $self->has_tests;
+	if ( @tests ) {
+		$has_tests = 
+		'<br/>test' . ( $#tests > 0 ? 's' : '' ) . ': ' .	
+		join("\n", map {
+			qq|<a target="$class" href="/Frey::Test::Runner/as_markup?test=$_">$_</a>|
+		} @tests );
+	}
+
+	return join("\n",
+		qq|<h1>$class</h1>|,
+		qq|<div class="frey-introspect">$superclasses\n$roles\n$runnable\n|,
+		$pod    ? qq|<a class="frey-skip" href="#___top" title="Skip to POD"    >pod</a>|    : '',
+		$source ? qq|<a class="frey-skip" href="#source" title="Skip to source" >source</a>| : '',
+		$has_tests,
+		qq|$table\n$pod\n</div>\n|,
+		qq|<h1>Source</h1><a name="source"></a><div class="frey-source">$source</div>|,
+	);
 }
 
 =head1 SEE ALSO