--- trunk/lib/Frey/Introspect.pm 2008/07/05 19:00:10 55 +++ trunk/lib/Frey/Introspect.pm 2008/07/15 13:58:07 133 @@ -2,18 +2,16 @@ use Moose; use Carp; -use Class::MOP; -use Moose::Meta::Role; -use Moose::Meta::Class; -use Scalar::Util qw/blessed/; +#use Moose::Meta::Role; +#use Moose::Meta::Class; use Data::Dump qw/dump/; use File::Slurp; use List::Util; -use Continuity::Widget::DomNode; use lib 'lib'; extends 'Frey'; +with 'Frey::Web'; has 'package' => ( is => 'rw', @@ -25,45 +23,6 @@ is => 'rw', ); -=head2 load_package - - my ( $class, $meta, $is_role ) = $o->load_package( 'Some::Package' ); - -=cut - -sub load_package { - my ( $self ) = @_; - - my $package = $self->package; - - #intercept role application so we can accurately generate - #method and attribute information for the parent class. - #this is fragile, but there is not better way that i am aware of - my $rmeta = Moose::Meta::Role->meta; - $rmeta->make_mutable if $rmeta->is_immutable; - my $original_apply = $rmeta->get_method("apply")->body; - $rmeta->remove_method("apply"); - my @roles_to_apply; - $rmeta->add_method("apply", sub{push(@roles_to_apply, [@_])}); - #load the package with the hacked Moose::Meta::Role - eval { Class::MOP::load_class($package); }; - confess "Failed to load package ${package} $@" if $@; - - my $meta = $package->meta; - - my ($class, $is_role); - if($package->meta->isa('Moose::Meta::Role')){ - $is_role = 1; - # we need to apply the role to a class to be able to properly introspect it - $class = Moose::Meta::Class->create_anon_class; - $original_apply->($meta, $class); - } else { - #roles don't have superclasses ... - $class = $meta; - } - return ( $class, $meta, $is_role ); -} - =head2 joose my $js = $o->joose( 'Some::Package' ); @@ -78,7 +37,7 @@ if ( ! $is_role ) { my @superclasses = map{ $_->meta->name } grep { $_ ne 'Moose::Object' } $meta->superclasses; - warn "superclasses ",dump( @superclasses ); + warn "superclasses ",dump( @superclasses ) if $self->debug; } my $out; @@ -116,7 +75,7 @@ $out .= "\t\t},\n\t\tmeta: Frey.HTML, classMethods: { renderHTML: function () { - return new Joose.SimpleRequest().getText(\"/~/${m}::${c}\") + return new Joose.SimpleRequest().getText(\"/~/" . $self->package . "\") },\n"; $out .= "\t\t},\n"; @@ -128,10 +87,7 @@ $out .= "\nconsole.log( 'loaded " . $class->name . " from $filename' );\n"; - warn $class->dump(2); - - warn "method_list = ",dump( $class->get_method_list ); - warn dump( map{ $class->get_method($_)->name } sort $class->get_method_list ); + warn "method_list = ",dump( $class->get_method_list ) if $self->debug; # print $out; my $path = "static/blib/$filename"; @@ -156,11 +112,19 @@ my $attr; $attr->{$_}++ foreach $class->get_attribute_list; my @methods = grep { ! defined($attr->{$_}) } $class->get_method_list; - warn "# methods = ",dump( @methods ); + warn "# methods = ",dump( @methods ) if $self->debug; + + return sort @methods; +} + +use Frey::ClassLoader; - return @methods; +sub load_package { + my $self = shift; + return Frey::ClassLoader->load_package( $self->package ); } + =head1 OUTPUT GENERATION =head2 html @@ -169,87 +133,68 @@ =cut -our @javascript = ( qw' -../lib/Joose.js -'); - sub html { my ( $self, $request ) = @_; while (1) { - my $js = Continuity::Widget::DomNode->create( - map { - ( script => { type => 'text/javascript', src => $_ } ) - } @javascript - )->to_string; - - $js .= << '__END_OF_JS__'; - -__END_OF_JS__ + my ( $class, $meta, $is_role ) = $self->load_package; - warn "# >>> js\n$js\n"; + my $package = $self->package; - my $methods; + my @methods; + @methods = map { qq|
Methods | Attributes | '; + $a ||= ' | '; + $table .= qq| |
---|---|