--- trunk/lib/Frey/Introspect.pm	2008/11/05 20:05:35	312
+++ trunk/lib/Frey/Introspect.pm	2008/11/18 12:02:57	407
@@ -8,6 +8,9 @@
 use File::Slurp;
 use List::Util;
 
+use PPI;
+use PPI::HTML;
+
 use lib 'lib';
 
 extends 'Frey::ClassLoader';
@@ -152,6 +155,7 @@
 	}
 
 	my $role_method;
+	my $role_attribute;
 
 	if ( $meta->can('roles') ) {
 		my $role_nr = 1;
@@ -159,7 +163,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,21 +175,22 @@
 
 	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>|
+		qq|<td class="m">$name</td>|
 	} $self->methods;
 
 	my @attributes;
 	if ( $meta->get_attribute_list ) {
 	@attributes = map {
-			my $attr = $meta->get_attribute($_);
+			my $name = $_;
+			my $attr = $meta->get_attribute($name);
+			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);
 			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;
 				
@@ -204,7 +210,13 @@
 				$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>|
+
+			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
 	}
 
@@ -218,20 +230,47 @@
 	$table .= qq|</table>|;
 
 	my $pod = Frey::Pod->new( class => $class )->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-introspect">$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',
+#		},
 	);
 
+	# 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;
+
+
+	use Frey::Run;
+	my $runnable = join("\n", map { qq|<a href="/$class/$_">$_</a>| } grep { $class->can($_) } Frey::Run->runnable );
+	$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>|,
+		),
+	};
+
 	return $html;
 }