--- trunk/lib/Frey/ClassLoader.pm 2008/11/27 21:01:39 559 +++ trunk/lib/Frey/ClassLoader.pm 2008/12/02 01:06:46 668 @@ -8,6 +8,7 @@ =cut extends 'Frey'; +with 'Frey::Session'; use Data::Dump qw/dump/; use File::Find; @@ -35,7 +36,7 @@ $class =~ s{\.pm$}{}; $class =~ s{/}{::}g; if ( $class =~ m{Mojo} ) { - warn "# skip Mojo class $class"; + $self->TODO( "Mojo support" ); return; } $class_path->{ $class } = $_; @@ -167,7 +168,7 @@ sub class_runnable { my ( $self, $class ) = @_; - my @methods = grep { m{^as_} } $self->class_methods( $class ); + my @methods = grep { m{^as_} || m{_as_} } $self->class_methods( $class ); return @methods if wantarray; return \@methods; } @@ -209,9 +210,29 @@ } } +our $syntax_checked_last; + sub new_frey_class { my ( $self, $class, $params ) = @_; - my $instance = $class->new( %$params ); + my $instance; + + my $path = $self->class_path( $class ); + if ( $syntax_checked_last->{$class} != -C $path ) { + my $syntax = `perl -Ilib -wc $path 2>&1`; + warn "# syntax: $syntax"; + $syntax_checked_last->{$class} = -C $class; + } + + if ( $class->meta->isa('Moose::Meta::Role') ) { + $instance = Frey->new; + Frey::Web->meta->apply( $instance ); + warn "new_frey_class $class role with Frey::Web"; + } else { + $params->{request_url} = $self->request_url; + $instance = $class->new( %$params ) or confess "can't $class->new".dump( %$params ); + warn "new_frey_class $class"; + } + if ( $instance->can('data') && ! $instance->can('as_data') ) { Frey::Role::as_data->meta->apply( $instance ); warn "# apply as_data role to $class"; @@ -221,7 +242,12 @@ warn "# apply as_sponge role to $class"; } - $self->add_status({ $class => $params }) if $self->can('add_status'); + if ( ! $instance->can('add_status') ) { + Frey::Web->meta->apply( $instance ); + warn "# apply Frey::Web role to $class"; + } + + $self->add_status({ $class => $params }); return $instance; }