--- trunk/lib/Frey/Introspect.pm 2008/11/05 19:13:01 308 +++ trunk/lib/Frey/Introspect.pm 2008/11/05 19:57:49 310 @@ -136,8 +136,47 @@ my $class = $self->class; + my ( $superclasses, $roles ) = ( 'Role', '' ); + if ( ! $is_role ) { + if ( $meta->superclasses ) { + $superclasses = 'Superclasses: ' . + join(', ', + map { + my $name = $_->meta->name; + qq|$name| . $_->meta->dump(2) . qq||; + } + #grep { $_ ne 'Moose::Object' } + $meta->superclasses + ); + } + } + + my $role_method; + + if ( $meta->can('roles') ) { + my $role_nr = 1; + $roles = join(' ', + grep { ! m/\Q$class\E/ } # skip me + map { + my $name = $_->name; + $role_method->{ $_ }->{$name} = $role_nr foreach $_->get_method_list; + qq|$name| . $name->meta->dump(2) . qq|| . $role_nr++ . qq||; + } + $meta->calculate_all_roles + ); + $roles = qq| with roles: $roles| if $roles; + } + warn "# role_method ",dump( $role_method ); + my @methods; - @methods = map { qq|$_| } $self->methods; + @methods = map { + my $method = $_; + if ( $role_method ) { + my ( $name, $nr ) = each %{ $role_method->{$_} }; + $method .= qq|$nr|; + } + qq|$method| + } $self->methods; my @attributes; if ( $meta->get_attribute_list ) { @@ -178,33 +217,6 @@ } $table .= qq||; - my ( $superclasses, $roles ) = ( 'Role', '' ); - if ( ! $is_role ) { - if ( $meta->superclasses ) { - $superclasses = 'Superclasses: ' . - join(', ', - map { - my $name = $_->meta->name; - qq|$name| . $_->meta->dump(2) . qq||; - } - #grep { $_ ne 'Moose::Object' } - $meta->superclasses - ); - } - } - - if ( $meta->can('roles') ) { - $roles = join(', ', - grep { ! m/\Q$class\E/ } # skip me - map { - my $name = $_->name; - qq|$name| . $name->meta->dump(2) . qq||; - } - $meta->calculate_all_roles - ); - $roles = " with roles: $roles" if $roles; - } - my $pod = Frey::Pod->new( class => $class )->markup; use Frey::Run; @@ -214,9 +226,9 @@ my $html = $self->page( title => "Introspect $class", body => qq|

$class

| - . qq|$superclasses\n$roles\n$execute\n| + . qq|
$superclasses\n$roles\n$execute\n| . ( $pod ? qq|↓pod&darr| : '' ) - . qq|$table\n$pod| + . qq|$table\n$pod
| );