--- trunk/lib/Frey/Introspect.pm 2008/11/18 13:52:26 409 +++ trunk/lib/Frey/Introspect.pm 2008/11/24 22:56:41 506 @@ -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,20 +94,11 @@ my $path = "static/blib/$filename"; write_file( $path, $out ); warn "# created $path\n"; - $self->path( $path ); return $out; } -=head1 OUTPUT GENERATION - -=head2 markup - - $o->markup; - -=cut - -sub markup { +sub as_markup { my ( $self ) = @_; $self->add_head( 'static/introspect.css' ); @@ -169,17 +156,17 @@ @attributes = map { my $name = $_; my $attr = $meta->get_attribute($name); - confess "$class attribute $name isn't blessed ",dump( $attr ) unless ref $attr; + 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; + ( $before, $title, $after ) = ( '', ' 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_documentation 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"; } else { @@ -191,7 +178,7 @@ } $after .= ' '; } - 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} }; @@ -211,7 +198,7 @@ } $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 $path = $self->class_path( $class ); @@ -237,26 +224,33 @@ # $source =~ s{class_methods( $class ); my $runnable = join("\n", - map { $class_method->{$_} ? qq|$_| : '' } grep { $class->can($_) } Frey::Run->runnable + 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