--- trunk/lib/Frey/Introspect.pm 2008/11/05 19:57:49 310
+++ trunk/lib/Frey/Introspect.pm 2008/11/18 12:55:32 408
@@ -8,6 +8,9 @@
use File::Slurp;
use List::Util;
+use PPI;
+use PPI::HTML;
+
use lib 'lib';
extends 'Frey::ClassLoader';
@@ -100,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
@@ -152,6 +136,7 @@
}
my $role_method;
+ my $role_attribute;
if ( $meta->can('roles') ) {
my $role_nr = 1;
@@ -159,7 +144,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|$name| . $name->meta->dump(2) . qq|
| . $role_nr++ . qq||;
}
$meta->calculate_all_roles
@@ -170,21 +156,22 @@
my @methods;
@methods = map {
- my $method = $_;
- if ( $role_method ) {
- my ( $name, $nr ) = each %{ $role_method->{$_} };
- $method .= qq|$nr|;
+ my $name = $_;
+ if ( $role_method->{$name} ) {
+ my ( $role_name, $nr ) = each %{ $role_method->{$name} };
+ $name .= qq|$nr|;
}
- qq|
$method | |
- } $self->methods;
+ qq|$name | |
+ } $self->class_methods( $class );
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 ) = ( '', ' title="required"', '' ) 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,11 +191,17 @@
$after .= ' ';
}
my $type = $attr->has_type_constraint ? $attr->type_constraint->name : '';
- qq|$before $_ | $type | $after | |
+
+ if ( $role_attribute->{$name} ) {
+ my ( $role_name, $nr ) = each %{ $role_attribute->{$name} };
+ $name .= qq|$nr|;
+ }
+
+ qq|$before $name | $type | $after | |
} sort $meta->get_attribute_list
}
- my $table = qq|Methods | Attributes | Type | Properties |
|;
+ my $table = qq|Methods | Attributes | Type | Properties |
|;
while ( @methods || @attributes ) {
my ($m,$a) = ( shift @methods, shift @attributes );
$m ||= ' | ';
@@ -218,20 +211,47 @@
$table .= qq|
|;
my $pod = Frey::Pod->new( class => $class )->markup;
+ $pod = $pod->{body} if ref($pod);
- use Frey::Run;
- my $execute = join("\n", map { qq|$_| } grep { $class->can($_) } Frey::Run->execute );
- $execute = " execute: $execute" if $execute;
-
- my $html = $self->page(
- title => "Introspect $class",
- body => qq|$class
|
- . qq|$superclasses\n$roles\n$execute\n|
- . ( $pod ? qq|
↓pod&darr| : '' )
- . qq|$table\n$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{(\s*)(\d+)(:\s*)}{$1$2$3}g;
+
+ # strip page html
+# $source =~ s{^.*]+>}{}s;
+# $source =~ s{$_| } grep { $class->can($_) } Frey::Run->runnable );
+ $runnable = " runnable: $runnable" if $runnable;
+
+ my $html = {
+ title => $class,
+ body => join("\n",
+ qq|$class
|,
+ qq|$superclasses\n$roles\n$runnable\n|,
+ $pod ? qq|
pod| : '',
+ $source ? qq|
source| : '',
+ qq|$table\n$pod\n
\n|,
+ qq|Source
$source
|,
+ ),
+ };
+
return $html;
}