--- trunk/lib/Frey/Introspect.pm 2008/11/05 19:57:49 310
+++ trunk/lib/Frey/Introspect.pm 2008/11/16 16:36:53 358
@@ -152,6 +152,7 @@
}
my $role_method;
+ my $role_attribute;
if ( $meta->can('roles') ) {
my $role_nr = 1;
@@ -159,7 +160,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,18 +172,20 @@
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 | |
+ qq|$name | |
} $self->methods;
my @attributes;
if ( $meta->get_attribute_list ) {
@attributes = map {
- my $attr = $meta->get_attribute($_);
+ my $name = $_;
+ my $attr = $meta->get_attribute($name);
+ warn "## ref attr: ",ref( $attr );
my ( $before, $title, $after ) = ( '', '', '' );
( $before, $title, $after ) = ( '', ' title="required"', '' ) if $attr->is_required;
warn $attr->dump(3);
@@ -204,11 +208,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 ||= ' | ';
@@ -220,17 +230,17 @@
my $pod = Frey::Pod->new( class => $class )->markup;
use Frey::Run;
- my $execute = join("\n", map { qq|$_| } grep { $class->can($_) } Frey::Run->execute );
- $execute = " execute: $execute" if $execute;
+ my $runnable = join("\n", map { qq|$_| } grep { $class->can($_) } Frey::Run->runnable );
+ $runnable = " runnable: $runnable" if $runnable;
- my $html = $self->page(
+ my $html = {
title => "Introspect $class",
body => qq|$class
|
- . qq|$superclasses\n$roles\n$execute\n|
+ . qq|
$superclasses\n$roles\n$runnable\n|
. ( $pod ? qq|
↓pod&darr| : '' )
. qq|$table\n$pod
|
- );
+ };
return $html;
}