--- trunk/lib/Frey/Introspect.pm 2008/11/18 11:53:58 406 +++ trunk/lib/Frey/Introspect.pm 2008/11/18 13:52:26 409 @@ -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,13 +162,14 @@ $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 ref $attr; warn "## attr $name ref ",ref( $attr ) if $self->debug; my ( $before, $title, $after ) = ( '', '', '' ); ( $before, $title, $after ) = ( '', ' title="required"', '' ) if $attr->is_required; @@ -217,7 +199,7 @@ } qq|$before $name$type$after| - } sort $meta->get_attribute_list + } $meta->get_attribute_list } my $table = qq||; @@ -248,7 +230,7 @@ # Spit out the HTML my $source = $Highlight->html( $Document ); - $source =~ s{(\s*)(\d+)(:\s*)}{$1$2$3}g; + $source =~ s{(\s*)(\d+)(:\s*)}{$1$2$3}g; # strip page html # $source =~ s{^.*]+>}{}s; @@ -256,7 +238,10 @@ 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 = {
MethodsAttributesTypeProperties