--- trunk/lib/Frey/Introspect.pm 2008/12/04 17:55:27 717 +++ trunk/lib/Frey/Introspect.pm 2008/12/06 12:22:36 735 @@ -11,9 +11,8 @@ use PPI; use PPI::HTML; -use Frey::Pod; - use lib 'lib'; +use Frey::Pod; extends 'Frey::PPI'; with 'Frey::Web'; @@ -112,7 +111,7 @@ my $introspect_path = "var/introspect/$class.yaml"; $self->mkbasepath( $introspect_path ); - my $introspect = $self->load( $introspect_path ); + my $introspect; # FIXME update with = $self->load( $introspect_path ); my ( $superclasses, $roles ) = ( 'Role', '' ); if ( ! $is_role ) { @@ -121,7 +120,7 @@ join(', ', map { my $name = $_->meta->name; - $introspect->{superclass}->{$name}++; + $introspect->{superclass}->{$name} = {}; $self->dropdown( $name, $_->meta ) } #grep { $_ ne 'Moose::Object' } @@ -130,8 +129,8 @@ } } - my $role_method; - my $role_attribute; + my $method_from_role; + my $attribute_from_role; if ( $meta->can('roles') ) { my $role_nr = 1; @@ -139,41 +138,45 @@ grep { ! m/\Q$class\E/ } # skip me map { my $name = $_->name; - $introspect->{role}->{$name}++; - $role_method->{ $_ }->{$name} = $role_nr foreach $_->get_method_list; - $role_attribute->{ $_ }->{$name} = $role_nr foreach $_->get_attribute_list; + $introspect->{roles}->{$name} = {}; + $method_from_role->{ $_ }->{$name} = $role_nr foreach $_->get_method_list; + $attribute_from_role->{ $_ }->{$name} = $role_nr foreach $_->get_attribute_list; $self->dropdown( $name, $name->meta ) . qq|| . $role_nr++ . qq||; } $meta->calculate_all_roles ); $roles = qq| with roles: $roles| if $roles; } - warn "# role_method ",dump( $role_method ); + warn "# method_from_role ",dump( $method_from_role ); my @methods; @methods = map { my $name = $_; - $introspect->{method}->{$name}++; - if ( $role_method->{$name} ) { - my ( $role_name, $nr ) = each %{ $role_method->{$name} }; + if ( $method_from_role->{$name} ) { + my ( $role_name, $nr ) = each %{ $method_from_role->{$name} }; + $introspect->{methods}->{$name}->{role} = $role_name; $name .= qq|$nr|; + } else { + $introspect->{methods}->{$name} = {}; } qq|
Methods | Attributes | Type | Properties |
---|