--- trunk/lib/Frey/Introspect.pm	2008/11/05 19:57:49	310
+++ trunk/lib/Frey/Introspect.pm	2008/11/19 17:05:59	458
@@ -8,6 +8,9 @@
 use File::Slurp;
 use List::Util;
 
+use PPI;
+use PPI::HTML;
+
 use lib 'lib';
 
 extends 'Frey::ClassLoader';
@@ -100,34 +103,7 @@
 	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' );
@@ -152,6 +128,7 @@
 	}
 
 	my $role_method;
+	my $role_attribute;
 
 	if ( $meta->can('roles') ) {
 		my $role_nr = 1;
@@ -159,7 +136,8 @@
 			grep { ! m/\Q$class\E/ }	# skip me
 			map {
 				my $name = $_->name;
-				$role_method->{ $_ }->{$name} = $role_nr foreach $_->get_method_list;
+				$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>|;
 			}
 			$meta->calculate_all_roles
@@ -170,28 +148,30 @@
 
 	my @methods;
 	@methods = map {
-		my $method = $_;
-		if ( $role_method ) {
-			my ( $name, $nr ) = each %{ $role_method->{$_} };
-			$method .= qq|<sup title="$name">$nr</sup>|;
+		my $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">$method</td>|
-	} $self->methods;
+		qq|<td class="m">$name</td>|
+	} $self->class_methods( $class );
 
 	my @attributes;
 	if ( $meta->get_attribute_list ) {
-	@attributes = map {
-			my $attr = $meta->get_attribute($_);
+		@attributes = map {
+			my $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;
-warn $attr->dump(3);
+			( $before, $title, $after ) = ( '<b>', ' title="required"', '</b>' ) 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_documentation 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";
 					} else {
@@ -203,12 +183,18 @@
 				}
 				$after .= ' ';
 			}
-			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 $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>|
+		} $meta->get_attribute_list
 	}
 
-	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>|;
+	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>|;
 	while ( @methods || @attributes ) {
 		my ($m,$a) = ( shift @methods, shift @attributes );
 		$m ||= '<td></td>';
@@ -217,22 +203,49 @@
 	}
 	$table .= qq|</table>|;
 
-	my $pod = Frey::Pod->new( class => $class )->markup;
+	my $pod = Frey::Pod->new( class => $class )->as_markup;
+	$pod = $pod->{body} if ref($pod);
 
-	use Frey::Run;
-	my $execute = join("\n", map { qq|<a href="/$class/$_">$_</a>| } grep { $class->can($_) } Frey::Run->execute );
-	$execute = " execute: $execute" if $execute;
-
-	my $html = $self->page(
-		title => "Introspect $class",
-		body => qq|<h1>$class</h1>|
-			. qq|<div class="frey-object-browser">$superclasses\n$roles\n$execute\n|
-			. ( $pod ? qq|<a href="#___top" title="Skip to POD" style="font-size: 80%; color: #aaa;">&darr;pod&darr</a>| : '' )
-			. qq|$table\n$pod</div>|
+	my $path = $self->class_path( $class );
+	my $Document = PPI::Document->new( $path );
 
+	# Create a reusable syntax highlighter
+	my $Highlight = PPI::HTML->new(
+		line_numbers => 1,
+#		page => 1,
+#		colors => {
+#			line_number => '#CCCCCC',
+#			number      => '#990000',
+#		},
 	);
 
-	return $html;
+	# Spit out the HTML
+	my $source = $Highlight->html( $Document );
+
+	$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;
+
+
+	my $runnable = join("\n",
+		map {
+			qq|<a href="/$class/$_">$_</a>|
+		} $self->class_runnable( $class )
+	);
+	$runnable = " runnable: $runnable" if $runnable;
+
+	$self->title( $class );
+
+	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>| : '',
+		qq|$table\n$pod\n</div>\n|,
+		qq|<h1>Source</h1><a name="source"></a><div class="frey-source">$source</div>|,
+	);
 }
 
 =head1 SEE ALSO