--- trunk/lib/Frey/Introspect.pm 2008/11/18 00:55:56 393
+++ trunk/lib/Frey/Introspect.pm 2008/11/28 18:31:28 599
@@ -13,7 +13,7 @@
use lib 'lib';
-extends 'Frey::ClassLoader';
+extends 'Frey::PPI';
with 'Frey::Web';
has 'class' => (
@@ -22,10 +22,6 @@
required => 1,
);
-has 'path' => (
- is => 'rw',
-);
-
=head2 joose
my $js = $o->joose;
@@ -98,39 +94,11 @@
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 ( $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
-
- $o->markup;
-
-=cut
-
-sub markup {
+sub as_markup {
my ( $self ) = @_;
$self->add_head( 'static/introspect.css' );
@@ -146,7 +114,7 @@
join(', ',
map {
my $name = $_->meta->name;
- qq|$name| . $_->meta->dump(2) . qq|
|;
+ $self->dropdown( $name, $_->meta )
}
#grep { $_ ne 'Moose::Object' }
$meta->superclasses
@@ -165,7 +133,7 @@
my $name = $_->name;
$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||;
+ $self->dropdown( $name, $name->meta ) . qq|| . $role_nr++ . qq||;
}
$meta->calculate_all_roles
);
@@ -181,43 +149,48 @@
$name .= qq|$nr|;
}
qq|
$name | |
- } $self->methods;
+ } $self->class_methods( $class );
my @attributes;
if ( $meta->get_attribute_list ) {
- @attributes = map {
+ @attributes = map {
my $name = $_;
+ my $html_name = $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 ) = ( '', ' title="required"', '' ) 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 ( $title, $properties ) = ( '', '' );
+ ( $html_name, $title ) = ( "$name", ' title="required"' )
+ 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_applied_traits/ ) {
my $getter;
$getter = $check;
$getter =~ s/^has_//;
- if ( $attr->$check ) {
+ if ( $attr->can($check) && $attr->$check ) {
if ( $getter eq $check ) {
- $after .= "$check";
+ $properties .= "$check";
} else {
- $after .= qq{$check};
- # we need dump here instead of $attr->$getter->dump because default can return scalar
- $after .= '' . dump( $attr->$getter ) . '
' if $getter ne $check;
- $after .= '';
+ # we need our dump here instead of $attr->$getter->dump because default can return scalar
+ $properties .= $self->dropdown( $check, $attr->$getter );
}
}
- $after .= ' ';
+ $properties .= ' ';
}
- my $type = $attr->has_type_constraint ? $attr->type_constraint->name : '';
+ my $type = $attr->can('has_type_constraint') && $attr->has_type_constraint ? $attr->type_constraint->name : '';
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
+ eval { $properties = $attr->documentation . ' ' . $properties };
+
+ qq|$html_name | $type | $properties | |
+ } $meta->get_attribute_list
}
my $table = qq|Methods | Attributes | Type | Properties |
|;
@@ -229,14 +202,15 @@
}
$table .= qq|
|;
- my $pod = Frey::Pod->new( class => $class )->markup;
+ my $pod = Frey::Pod->new( class => $class )->as_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',
@@ -247,26 +221,39 @@
# 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 );
+ my $runnable = join("\n",
+ map {
+ qq|$_|
+ } $self->class_runnable( $class )
+ );
$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
|,
- ),
- };
+ $self->title( $class );
- return $html;
+ my $has_tests = '';
+ if ( my @tests = $self->has_tests ) {
+ $has_tests =
+ '
test' . ( $#tests > 0 ? 's' : '' ) . ': ' .
+ join("\n", map {
+ qq|$_|
+ } @tests );
+ }
+
+ return join("\n",
+ qq|$class
|,
+ qq|$superclasses\n$roles\n$runnable\n|,
+ $pod ? qq|
pod| : '',
+ $source ? qq|
source| : '',
+ $has_tests,
+ qq|$table\n$pod\n
\n|,
+ qq|Source
$source
|,
+ );
}
=head1 SEE ALSO