--- trunk/lib/Frey/Server.pm 2008/07/11 19:19:42 100 +++ trunk/lib/Frey/Server.pm 2008/07/13 17:41:13 114 @@ -8,9 +8,8 @@ #use Continuity::REPL; use Data::Dump qw/dump/; -use Frey; -use Frey::Introspect; -use Frey::ObjectBrowser; +#use Carp::REPL; +use Frey::ClassLoader; my @messages; # Global (shared) list of messages my $got_message; # Flag to indicate that there is a new message to display @@ -20,14 +19,17 @@ #$repl = Continuity::REPL->new; sub run { + my ( $self, $port ) = @_; $server = Continuity->new( - port => 16001, + port => $port || 16001, path_session => 1, cookie_session => 'sid', callback => \&main, debug_level => 1, staticp => sub { $_[0]->url =~ m/\.(jpg|jpeg|gif|png|css|ico|js|html?)$/ }, ); + $Module::Reload::Debug = 1; + Frey::ClassLoader->new->load_all_classes(); $server->loop; } @@ -45,15 +47,16 @@ eval { - if ( $path =~ m!/~/([^/]+)(?:/([^/]*))?! ) { - my $f = Frey::Introspect->new( package => $1 ); - $f->html( $req ); - } + my $f; - if ( $path =~ m!/ob/([^/]+)(?:/([^/]*))?! ) { - my $f = Frey::ObjectBrowser->new; - $f->html( $req ); + if ( $path =~ m!/~/([^/]+)(.*)! ) { + $f = Frey::Introspect->new( package => $1 ); + } elsif ( $path =~ m!/ob/([^/]+)(.*)! ) { + $f = Frey::ObjectBrowser->new( fey_class => $1 ); + } elsif ( $path =~ m!/od/([^/]+)(.*)! ) { + $f = Frey::ObjectDesigner->new( fey_class => $1 ); } + $f->html( $req ) if $f; }; @@ -61,25 +64,24 @@ warn $@; #$req->conn->send_error( 404 ); # FIXME this should probably be 500, but we can't ship page with it $req->print( qq{
$@} ); - +# Carp::REPL::repl; # FIXME if $self->debug } else { my $f = Frey::ClassLoader->new; my $classes = dom2html( - ul => [ + table => [ map { warn dump( $_ ); - my ( $package, $path ) = %$_; - ( li => [ - a => { href => '/~/' . $package . '/' } => [ $package ], - ' ', - a => { href => '/ob/' . $package } => [ 'browse' ], - " $path" + my $package = $_; + ( tr => [ + td => [ a => { href => '/~/' . $package, title => $f->package_path( $package ) } => [ $package ] ], + td => [ $package->can('meta') ? ( a => { href => '/od/' . $package } => [ 'design' ] ) : '' ], + td => [ $package->can('collection') ? ( a => { href => '/ob/' . $package } => [ 'collection' ] ) : '' ], ] ) - } @{ $f->classes } + } $f->classes ], ); - $req->print( $classes ); + $req->print( "Classes
$classes" ); }