--- trunk/lib/Frey/Introspect.pm	2008/10/28 22:33:25	202
+++ trunk/lib/Frey/Introspect.pm	2008/11/18 11:53:58	406
@@ -8,12 +8,15 @@
 use File::Slurp;
 use List::Util;
 
+use PPI;
+use PPI::HTML;
+
 use lib 'lib';
 
-extends 'Frey';
+extends 'Frey::ClassLoader';
 with 'Frey::Web';
 
-has 'package' => (
+has 'class' => (
 	is => 'rw',
 	isa => 'Str',
 	required => 1,
@@ -32,7 +35,7 @@
 sub joose {
 	my ($self) = @_;
 
-	my ( $meta, $is_role ) = $self->load_package;
+	my ( $meta, $is_role ) = $self->class_meta;
 
 	if ( ! $is_role ) {
 		my @superclasses = map{ $_->meta->name }
@@ -42,7 +45,7 @@
 
 	my $out;
 
-	my ( $m, $c ) = split(/::/, $self->package, 2);
+	my ( $m, $c ) = split(/::/, $self->class, 2);
 	my $filename = $m . '.' . ( $c ? "$c." : '' ) . 'js';
 
 	$c ||= '';
@@ -77,7 +80,7 @@
 	$out .= "\t\t},\n\t\tmeta: Frey.HTML,
 		classMethods: {
 			renderHTML: function () {
-				return new Joose.SimpleRequest().getText(\"/~/" . $self->package . "\")
+				return new Joose.SimpleRequest().getText(\"/" . $self->class . "\")
 			},\n";
 
 	$out .= "\t\t},\n";
@@ -87,7 +90,7 @@
 	$out =~ s/,\n$/\n/;
 	$out .= "});\n";
 
-	$out .= "\nconsole.log( 'loaded " . $self->package . " from $filename' );\n";
+	$out .= "\nconsole.log( 'loaded " . $self->class . " from $filename' );\n";
 
 	warn "method_list = ",dump( $meta->get_method_list ) if $self->debug;
 
@@ -109,7 +112,7 @@
 sub methods {
 	my $self = shift;
 
-	my ( $meta, $is_role ) = $self->load_package;
+	my ( $meta, $is_role ) = $self->class_meta;
 
 	my $attr;
 	$attr->{$_}++ foreach $meta->get_attribute_list;
@@ -119,121 +122,156 @@
 	return sort @methods;
 }
 
-use Frey::ClassLoader;
-
-sub load_package {
-	my $self = shift;
-	return Frey::ClassLoader->load_package( $self->package );
-}
-
-
 =head1 OUTPUT GENERATION
 
-=head2 html
+=head2 markup
 
-  $o->html( $request );
+  $o->markup;
 
 =cut
 
-sub html {
-	my ( $self, $request ) = @_;
+sub markup {
+	my ( $self ) = @_;
 
 	$self->add_head( 'static/introspect.css' );
 
-	while (1) {
-
-		my ( $meta, $is_role ) = $self->load_package;
+	my ( $meta, $is_role ) = $self->class_meta;
 
-		my $package = $self->package;
+	my $class = $self->class;
 
-		my @methods;
-		@methods = map { qq|<td><a href="/~/$package/$_">$_</a></td>| } $self->methods;
-
-		my @attributes;
-		if ( $meta->get_attribute_list ) {
-		@attributes = map {
-				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>';
-						}
+	my ( $superclasses, $roles ) = ( '<b>Role</b>', '' );
+	if ( ! $is_role ) {
+		if ( $meta->superclasses ) {
+			$superclasses = 'Superclasses: ' .
+				join(', ',
+					map {
+						my $name = $_->meta->name;
+						qq|<a class="frey-popdown" href="/$name">$name<code>| . $_->meta->dump(2) . qq|</code></a>|;
 					}
-					$after .= ' ';
-				}
-				qq|<td align="right">$before<a href="/~/$package/?$_">$_</a></td><td>$after</td>|
-			} sort $meta->get_attribute_list
+					#grep { $_ ne 'Moose::Object' }
+					$meta->superclasses
+				);
 		}
+	}
 
-		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>';
-			$a ||= '<td></td>';
-			$table .= qq|<tr>$m$a</tr>|;
-		}
-		$table .= qq|</table>|;
+	my $role_method;
+	my $role_attribute;
 
-		my $classes =
-			qq|<div class="classes">| .
-			Frey::ClassBrowser->new->markup .
-			qq|</div>|;
-
-		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') ) {
+		my $role_nr = 1;
+		$roles = join(' ',
+			grep { ! m/\Q$class\E/ }	# skip me
+			map {
+				my $name = $_->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>|;
 			}
-		}
+			$meta->calculate_all_roles
+		);
+		$roles = qq| with roles: $roles| if $roles;
+	}
+	warn "# role_method ",dump( $role_method );
 
-		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 @methods;
+	@methods = map {
+		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">$name</td>|
+	} $self->methods;
 
-		my $pod = Frey::Pod->new( class => $package )->markup;
+	my @attributes;
+	if ( $meta->get_attribute_list ) {
+	@attributes = map {
+			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;
+			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 ( $getter eq $check ) {
+						$after .= "$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>';
+					}
+				}
+				$after .= ' ';
+			}
+			my $type = $attr->has_type_constraint ? $attr->type_constraint->name : '';
 
-		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|,
+			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
+	}
 
-		$request->print($html);
-		warn "# >>> html ",length($html)," bytes\n";
-		$request->next;
+	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>';
+		$a ||= '<td></td>';
+		$table .= qq|<tr>$m$a</tr>|;
 	}
-	warn "# exit html";
+	$table .= qq|</table>|;
+
+	my $pod = Frey::Pod->new( class => $class )->markup;
+	$pod = $pod->{body} if ref($pod);
+
+	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 href="/editor+$path+$2" title="edit $path +$2" target="editor">$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;
 }
 
 =head1 SEE ALSO