--- trunk/lib/Frey/Introspect.pm	2008/11/17 18:42:51	380
+++ trunk/lib/Frey/Introspect.pm	2008/11/18 12:55:32	408
@@ -103,25 +103,6 @@
 	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
@@ -181,17 +162,16 @@
 			$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 {
 			my $name = $_;
 			my $attr = $meta->get_attribute($name);
-			warn "## ref attr: ",ref( $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);
 			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;
 				
@@ -233,11 +213,12 @@
 	my $pod = Frey::Pod->new( class => $class )->markup;
 	$pod = $pod->{body} if ref($pod);
 
-	my $Document = PPI::Document->new( $self->class_path( $class ) );
+	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,
+		line_numbers => 1,
 #		page => 1,
 #		colors => {
 #			line_number => '#CCCCCC',
@@ -248,22 +229,26 @@
 	# 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 href="#___top" title="Skip to POD" class="frey-skip">pod</a>| : '' )
-			, qq|<a href="#source" title="Skip to source" class="frey-skip">source</a>|
-			, qq|$table\n$pod\n</div>\n|
-			, qq|<h1>Source</h1><a name="source"></a><div class="frey-source">$source</div>|
+		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>|,
 		),
 	};