--- trunk/lib/Frey/Introspect.pm	2008/07/14 23:39:56	128
+++ trunk/lib/Frey/Introspect.pm	2008/11/26 19:43:03	543
@@ -8,31 +8,30 @@
 use File::Slurp;
 use List::Util;
 
+use PPI;
+use PPI::HTML;
+
 use lib 'lib';
 
-extends 'Frey';
+extends 'Frey::PPI';
 with 'Frey::Web';
 
-has 'package' => (
+has 'class' => (
 	is => 'rw',
 	isa => 'Str',
 	required => 1,
 );
 
-has 'path' => (
-	is => 'rw',
-);
-
 =head2 joose
 
-  my $js = $o->joose( 'Some::Package' );
+  my $js = $o->joose;
 
 =cut
 
 sub joose {
 	my ($self) = @_;
 
-	my ( $class, $meta, $is_role ) = $self->load_package;
+	my ( $meta, $is_role ) = $self->class_meta;
 
 	if ( ! $is_role ) {
 		my @superclasses = map{ $_->meta->name }
@@ -42,15 +41,17 @@
 
 	my $out;
 
-	my ( $m, $c ) = split(/::/, $class->name, 2);
+	my ( $m, $c ) = split(/::/, $self->class, 2);
 	my $filename = $m . '.' . ( $c ? "$c." : '' ) . 'js';
 
+	$c ||= '';
+
 	$out .= "Module(\"$m\", function (m) {\n\tClass(\"$c\", {\n\t\thas: {\n";
 
-	foreach ( $class->get_attribute_list ) {
+	foreach ( $meta->get_attribute_list ) {
 		$out .= "\t\t\t$_: {\n";
 
-		my $attr = $class->get_attribute($_);
+		my $attr = $meta->get_attribute($_);
 		my $is = $attr->_is_metadata;
 		$out .= "\t\t\t\tis: \"$is\",\n" if defined $is;
 		$out .= "\t\t\t\tlazy: true,\n" if $attr->is_lazy;
@@ -75,7 +76,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";
@@ -85,120 +86,168 @@
 	$out =~ s/,\n$/\n/;
 	$out .= "});\n";
 
-	$out .= "\nconsole.log( 'loaded " . $class->name . " from $filename' );\n";
+	$out .= "\nconsole.log( 'loaded " . $self->class . " from $filename' );\n";
 
-	warn "method_list = ",dump( $class->get_method_list ) if $self->debug;
+	warn "method_list = ",dump( $meta->get_method_list ) if $self->debug;
 
 #	print $out;
 	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 ( $class, $meta, $is_role ) = $self->load_package;
-
-	my $attr;
-	$attr->{$_}++ foreach $class->get_attribute_list;
-	my @methods = grep { ! defined($attr->{$_}) } $class->get_method_list;
-	warn "# methods = ",dump( @methods ) if $self->debug;
-
-	return sort @methods;
-}
-
-use Frey::ClassLoader;
-
-sub load_package {
-	my $self = shift;
-	return Frey::ClassLoader->load_package( $self->package );
-}
-
-
-=head1 OUTPUT GENERATION
-
-=head2 html
-
-  $o->html( $request );
+sub as_markup {
+	my ( $self ) = @_;
 
-=cut
+	$self->add_head( 'static/introspect.css' );
 
-sub html {
-	my ( $self, $request ) = @_;
+	my ( $meta, $is_role ) = $self->class_meta;
 
-	while (1) {
+	my $class = $self->class;
 
-		my ( $class, $meta, $is_role ) = $self->load_package;
+	my ( $superclasses, $roles ) = ( '<b>Role</b>', '' );
+	if ( ! $is_role ) {
+		if ( $meta->superclasses ) {
+			$superclasses = 'Superclasses: ' .
+				join(', ',
+					map {
+						my $name = $_->meta->name;
+						$self->dropdown( $name, $_->meta )
+					}
+					#grep { $_ ne 'Moose::Object' }
+					$meta->superclasses
+				);
+		}
+	}
 
-		my $package = $self->package;
+	my $role_method;
+	my $role_attribute;
 
-		my @methods;
-		@methods = map { qq|<td><a href="/~/$package/$_">$_</a></td>| } $self->methods if $class->can('meta');
+	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;
+				$self->dropdown( $name, $name->meta ) . qq|<sup>| . $role_nr++ . qq|</sup>|;
+			}
+			$meta->calculate_all_roles
+		);
+		$roles = qq| with roles: $roles| if $roles;
+	}
+	warn "# role_method ",dump( $role_method );
 
-		my @attributes;
-		if ( $class->get_attribute_list ) {
-		@attributes = map {
-				my $attr = $class->get_attribute($_);
-#				warn "## $_ ", $attr->is_required ? 'required' : 'optional';
-				qq|<td><a href="/~/$package/$_?">$_</a></td><td>| .
-				( $attr->is_required ? ' <b>required</b>' : '' ) .
-				qq|</td>|;
-			} sort $class->get_attribute_list
+	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->class_methods( $class );
 
-		my $table = qq|<table><tr><th>Methods</th><th>Attributes</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 @attributes;
+	if ( $meta->get_attribute_list ) {
+		@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->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->can($check) && $attr->$check ) {
+					if ( $getter eq $check ) {
+						$after .= "$check";
+					} else {
+						# we need our dump here instead of $attr->$getter->dump because default can return scalar
+						$after .= $self->dropdown( $check, $attr->$getter );
+					}
+				}
+				$after .= ' ';
+			}
+			my $type = $attr->can('has_type_constraint') && $attr->has_type_constraint ? $attr->type_constraint->name : '';
 
-		my $classes =
-			qq|<div class="classes">| .
-			Frey::ClassBrowser->new->markup .
-			qq|</div>|;
+			if ( $role_attribute->{$name} ) {
+				my ( $role_name, $nr ) = each %{ $role_attribute->{$name} };
+				$name .= qq|<sup title="$role_name">$nr</sup>|;
+			}
 
-		$self->add_css( 'static/introspect.css' );
+			qq|<td class="a">$before $name</td><td class="t">$type</td><td>$after</td>|
+		} $meta->get_attribute_list
+	}
 
-		warn "## css = ",dump( $self->css );
+	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>|;
+	}
+	$table .= qq|</table>|;
 
-		my $superclasses = 'Role';
-		$superclasses = 'Superclasses: ' . join(', ',
-			map {
-				my $s = $_->meta->name;
-				qq|<a href="/~/$s">$s</a>|
-			}
-			#grep { $_ ne 'Moose::Object' }
-			$meta->superclasses
-		) if ! $is_role && $meta->superclasses;
-
-		my $pod = Frey::Pod->new( class => $package )->markup;
-
-		my $html = $self->page(
-			title => "Introspect $package",
-			body => qq|<h1>$package</h1>|
-				. ( $pod ? qq|<a href="#___top" title="Skip to POD" style="font-size: 80%; color: #aaa;">&darr;pod&darr</a>  | : '' )
-				. qq|$superclasses\n$table\n$pod\n$classes|,
+	my $pod = Frey::Pod->new( class => $class )->as_markup;
+	$pod = $pod->{body} if ref($pod);
 
-		);
+	my $path = $self->class_path( $class );
+	my $Document = PPI::Document->new( $path );
 
-		$request->print($html);
-		warn "# >>> html ",length($html)," bytes\n";
-		$request->next;
+	# 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;
+
+	my $runnable = join("\n",
+		map {
+			qq|<a target="$class" href="/$class/$_">$_</a>|
+		} $self->class_runnable( $class )
+	);
+	$runnable = " runnable: $runnable" if $runnable;
+
+	$self->title( $class );
+
+	my $has_tests = '';
+	if ( my @tests = $self->has_tests ) {
+		$has_tests = 
+		'<br/>test' . ( $#tests > 0 ? 's' : '' ) . ': ' .	
+		join("\n", map {
+			qq|<a target="$class" href="/Frey::Test::Runner/as_markup?test=$_">$_</a>|
+		} @tests );
 	}
-	warn "# exit html";
+
+	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