--- trunk/lib/Frey/Introspect.pm 2008/07/15 14:56:28 134
+++ trunk/lib/Frey/Introspect.pm 2008/10/31 17:27:39 211
@@ -25,14 +25,14 @@
=head2 joose
- my $js = $o->joose( 'Some::Package' );
+ my $js = $o->joose;
=cut
sub joose {
my ($self) = @_;
- my ( $class, $meta, $is_role ) = $self->load_package;
+ my ( $meta, $is_role ) = $self->load_package;
if ( ! $is_role ) {
my @superclasses = map{ $_->meta->name }
@@ -42,15 +42,17 @@
my $out;
- my ( $m, $c ) = split(/::/, $class->name, 2);
+ my ( $m, $c ) = split(/::/, $self->package, 2);
my $filename = $m . '.' . ( $c ? "$c." : '' ) . 'js';
+ $c ||= '';
+
$out .= "Module(\"$m\", function (m) {\n\tClass(\"$c\", {\n\t\thas: {\n";
- foreach ( $class->get_attribute_list ) {
+ foreach ( $meta->get_attribute_list ) {
$out .= "\t\t\t$_: {\n";
- my $attr = $class->get_attribute($_);
+ my $attr = $meta->get_attribute($_);
my $is = $attr->_is_metadata;
$out .= "\t\t\t\tis: \"$is\",\n" if defined $is;
$out .= "\t\t\t\tlazy: true,\n" if $attr->is_lazy;
@@ -85,9 +87,9 @@
$out =~ s/,\n$/\n/;
$out .= "});\n";
- $out .= "\nconsole.log( 'loaded " . $class->name . " from $filename' );\n";
+ $out .= "\nconsole.log( 'loaded " . $self->package . " from $filename' );\n";
- warn "method_list = ",dump( $class->get_method_list ) if $self->debug;
+ warn "method_list = ",dump( $meta->get_method_list ) if $self->debug;
# print $out;
my $path = "static/blib/$filename";
@@ -107,11 +109,11 @@
sub methods {
my $self = shift;
- my ( $class, $meta, $is_role ) = $self->load_package;
+ my ( $meta, $is_role ) = $self->load_package;
my $attr;
- $attr->{$_}++ foreach $class->get_attribute_list;
- my @methods = grep { ! defined($attr->{$_}) } $class->get_method_list;
+ $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;
@@ -136,26 +138,46 @@
sub html {
my ( $self, $request ) = @_;
+ $self->add_head( 'static/introspect.css' );
+
while (1) {
- my ( $class, $meta, $is_role ) = $self->load_package;
+ my ( $meta, $is_role ) = $self->load_package;
my $package = $self->package;
my @methods;
- @methods = map { qq|
$_ | | } $self->methods if $class->can('meta');
+ @methods = map { qq|$_ | | } $self->methods;
my @attributes;
- if ( $class->get_attribute_list ) {
+ if ( $meta->get_attribute_list ) {
@attributes = map {
- my $attr = $class->get_attribute($_);
+ my $attr = $meta->get_attribute($_);
my ( $before, $title, $after ) = ( '', '', '' );
- ( $before, $title, $after ) = ( '', ' title="required"', '' ) if $attr->can('is_required') && $attr->is_required;
- qq|$before$_$after | |
- } sort $class->get_attribute_list
+ ( $before, $title, $after ) = ( '', ' title="required"', '' ) if $attr->is_required;
+warn $attr->dump(3);
+ foreach my $check ( qw/has_type_constraint has_handles is_weak_ref is_required is_lazy should_coerce should_auto_deref has_trigger has_documentation has_applied_traits/ ) {
+ my $getter;
+
+ $getter = $check;
+ $getter =~ s/^has_//;
+
+ if ( $attr->$check ) {
+ if ( $getter eq $check ) {
+ $after .= "$check";
+ } else {
+ $after .= qq{$check};
+ $after .= '' . $attr->$getter->dump . '
' if $getter ne $check;
+ $after .= '';
+ }
+ }
+ $after .= ' ';
+ }
+ qq|$before$_ | $after | |
+ } sort $meta->get_attribute_list
}
- my $table = qq|Methods | Attributes |
|;
+ my $table = qq|Methods | Attributes | Properties |
|;
while ( @methods || @attributes ) {
my ($m,$a) = ( shift @methods, shift @attributes );
$m ||= ' | ';
@@ -164,30 +186,31 @@
}
$table .= qq|
|;
- my $classes =
- qq|| .
- Frey::ClassBrowser->new->markup .
- qq|
|;
-
- $self->add_css( 'static/introspect.css' );
-
- warn "## css = ",dump( $self->css );
-
- my ( $superclasses, $roles ) = ( '', 'Role' );
+ my ( $superclasses, $roles ) = ( 'Role', '' );
if ( ! $is_role ) {
if ( $meta->superclasses ) {
$superclasses = 'Superclasses: ' .
join(', ',
- map { my $s = $_->meta->name; qq|$s| }
+ map {
+ my $name = $_->meta->name;
+ qq|$name| . $_->meta->dump(2) . qq|
|;
+ }
#grep { $_ ne 'Moose::Object' }
$meta->superclasses
);
}
+ }
- if ( $meta->can('roles') ) {
- $roles = join(', ', map { my $r = $_->name; qq|$r| } @{ $meta->roles } );
- $roles = " with roles: $roles" if $roles;
- }
+ if ( $meta->can('roles') ) {
+ $roles = join(', ',
+ grep { ! m/\Q$package\E/ } # skip me
+ map {
+ my $name = $_->name;
+ qq||;
+ }
+ $meta->calculate_all_roles
+ );
+ $roles = " with roles: $roles" if $roles;
}
my $pod = Frey::Pod->new( class => $package )->markup;
@@ -197,7 +220,7 @@
body => qq|$package
|
. qq|$superclasses\n$roles\n|
. ( $pod ? qq|↓pod&darr| : '' )
- . qq|$table\n$pod\n$classes|,
+ . qq|$table\n$pod|,
);