--- trunk/lib/Frey/Introspect.pm 2008/07/14 21:22:43 121 +++ trunk/lib/Frey/Introspect.pm 2008/11/05 08:20:50 277 @@ -13,7 +13,7 @@ extends 'Frey'; with 'Frey::Web'; -has 'package' => ( +has 'class' => ( is => 'rw', isa => 'Str', required => 1, @@ -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_class; 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->class, 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; @@ -75,7 +77,7 @@ $out .= "\t\t},\n\t\tmeta: Frey.HTML, classMethods: { renderHTML: function () { - return new Joose.SimpleRequest().getText(\"/~/" . $self->package . "\") + return new Joose.SimpleRequest().getText(\"/Frey-Introspect?class=" . $self->class . "\") },\n"; $out .= "\t\t},\n"; @@ -85,9 +87,9 @@ $out =~ s/,\n$/\n/; $out .= "});\n"; - $out .= "\nconsole.log( 'loaded " . $class->name . " from $filename' );\n"; + $out .= "\nconsole.log( 'loaded " . $self->class . " 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_class; 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; @@ -119,71 +121,112 @@ use Frey::ClassLoader; -sub load_package { +sub load_class { my $self = shift; - return Frey::ClassLoader->load_package( $self->package ); + return Frey::ClassLoader->load_package( $self->class ); } =head1 OUTPUT GENERATION -=head2 html +=head2 markup - $o->html( $request ); + $o->markup; =cut -sub html { - my ( $self, $request ) = @_; +sub markup { + my ( $self ) = @_; - while (1) { + $self->add_head( 'static/introspect.css' ); - my ( $class, $meta, $is_role ) = $self->load_package; + my ( $meta, $is_role ) = $self->load_class; - my $package = $self->package; + my $class = $self->class; - my @methods; - @methods = map { qq|$_| } $self->methods if $class->can('meta'); - - my @attributes; - if ( $class->get_attribute_list ) { - @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 @methods; + @methods = map { qq|$_| } $self->methods; + + my @attributes; + if ( $meta->get_attribute_list ) { + @attributes = map { + my $attr = $meta->get_attribute($_); + my ( $before, $title, $after ) = ( '', '', '' ); + ( $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||; + while ( @methods || @attributes ) { + my ($m,$a) = ( shift @methods, shift @attributes ); + $m ||= ''; + $a ||= ''; + $table .= qq|$m$a|; + } + $table .= qq|
MethodsAttributesProperties
|; - my $table = qq||; - while ( @methods || @attributes ) { - my ($m,$a) = ( shift @methods, shift @attributes ); - $m ||= ''; - $a ||= ''; - $table .= qq|$m$a|; + 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 + ); } - $table .= qq|
MethodsAttributes
|; + } - my $classes = - qq|
| . - Frey::ClassBrowser->new->markup . - qq|
|; + 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; + } - $self->add_css( 'static/introspect.css' ); + my $pod = Frey::Pod->new( class => $class )->markup; - warn "## css = ",dump( $self->css ); + use Frey::Run; + my $execute = join("\n", map { qq|$_| } grep { $class->can($_) } Frey::Run->execute ); + $execute = " execute: $execute" if $execute; + + my $html = $self->page( + title => "Introspect $class", + body => qq|

$class

| + . qq|$superclasses\n$roles\n$execute\n| + . ( $pod ? qq|↓pod&darr| : '' ) + . qq|$table\n$pod| - my $html = $self->page( - title => "Introspect $package", - body => "

$package

\n$table\n$classes", - ); + ); - $request->print($html); - warn "# >>> html ",length($html)," bytes\n"; - $request->next; - } - warn "# exit html"; + return $html; } =head1 SEE ALSO