--- trunk/lib/Frey/Introspect.pm 2008/11/18 12:02:57 407
+++ trunk/lib/Frey/Introspect.pm 2008/11/18 16:54:10 418
@@ -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,23 +162,24 @@
$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 $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;
+ ( $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 {
@@ -209,7 +191,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} };
@@ -217,7 +199,7 @@
}
qq|$before $name | $type | $after | |
- } sort $meta->get_attribute_list
+ } $meta->get_attribute_list
}
my $table = qq|Methods | Attributes | Type | Properties |
|;
@@ -256,22 +238,22 @@
use Frey::Run;
- my $runnable = join("\n", map { qq|$_| } grep { $class->can($_) } Frey::Run->runnable );
+ my $class_method = $self->class_methods( $class );
+ my $runnable = join("\n",
+ map { $class_method->{$_} ? qq|$_| : '' } 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
|,
- ),
- };
+ $self->title( $class );
- return $html;
+ return 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
|,
+ );
}
=head1 SEE ALSO