--- trunk/lib/Frey/Introspect.pm 2008/07/13 18:51:29 119
+++ trunk/lib/Frey/Introspect.pm 2008/07/13 19:46:10 120
@@ -114,7 +114,7 @@
my @methods = grep { ! defined($attr->{$_}) } $class->get_method_list;
warn "# methods = ",dump( @methods ) if $self->debug;
- return @methods;
+ return sort @methods;
}
use Frey::ClassLoader;
@@ -152,39 +152,35 @@
my ( $class, $meta, $is_role ) = $self->load_package;
- my $methods;
- if ( $class->can('meta') ) {
- $methods = dom2html(
- ul => [
- map { (
- li => [ a => { href => '/~/' . $self->package . '/' . $_ } => [ $_ ] ]
- ) } $self->methods
- ]
- );
- $methods = "
Methods
$methods" if $methods;
- } else {
- $methods = 'not introspectable';
- }
+ my $package = $self->package;
+
+ my @methods;
+ @methods = map { qq|$_ | | } $self->methods if $class->can('meta');
- my $attributes;
+ my @attributes;
if ( $class->get_attribute_list ) {
- $attributes = dom2html(
- table => [
- map {
- my $attr = $class->get_attribute($_);
- warn "## $_ ", $attr->is_required ? 'required' : 'optional';
- ( tr => [
- td => [ a => { href => '/~/' . $self->package . '/' . $_ } => [ $_ ] ],
- td => [ $attr->is_required ? ' required' : '' ],
- ] )
- } $class->get_attribute_list
- ],
- );
- $attributes = "Attributes
$attributes" if $attributes;
- } else {
- $attributes = 'no attributes';
+ @attributes = map {
+ my $attr = $class->get_attribute($_);
+# warn "## $_ ", $attr->is_required ? 'required' : 'optional';
+ qq|$_ | | .
+ ( $attr->is_required ? ' required' : '' ) .
+ qq| | |;
+ } sort $class->get_attribute_list
+ }
+
+ my $table = qq|Methods | Attributes |
|;
+ while ( @methods || @attributes ) {
+ my ($m,$a) = ( shift @methods, shift @attributes );
+ $m ||= ' | ';
+ $a ||= ' | ';
+ $table .= qq|$m$a
|;
}
+ $table .= qq|
|;
+ my $classes =
+ qq|| .
+ Frey::ClassBrowser->new->html_markup .
+ qq|
|;
my $html = dom2html(
html => [
@@ -195,8 +191,8 @@
],
body => [
h1 => [ $self->package ],
- $methods,
- $attributes,
+ $table,
+ $classes,
],
]
);