--- trunk/lib/Frey/Server.pm 2008/07/05 19:00:10 55 +++ trunk/lib/Frey/Server.pm 2008/07/11 23:08:25 103 @@ -2,13 +2,13 @@ use Moose; +with 'Frey::Web'; + use Continuity; #use Continuity::REPL; -use Continuity::Widget::DomNode; use Data::Dump qw/dump/; -use Frey; -use Frey::Introspect; +use Frey::ClassLoader; my @messages; # Global (shared) list of messages my $got_message; # Flag to indicate that there is a new message to display @@ -16,16 +16,18 @@ use vars qw( $repl $server ); #$repl = Continuity::REPL->new; -$server = Continuity->new( - 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?)$/ }, -); sub run { + my ( $self, $port ) = @_; + $server = Continuity->new( + 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?)$/ }, + ); + Frey::ClassLoader->new->load_all_classes(); $server->loop; } @@ -41,9 +43,44 @@ warn $req->request->header('User_Agent'); #warn dump( $req ); - if ( $path =~ m!/~/([^/]+)(?:/([^/]*))?! ) { - my $f = Frey::Introspect->new( package => $1 ); - $f->html( $req ); + eval { + + if ( $path =~ m!/~/([^/]+)(?:/([^/]*))?! ) { + my $f = Frey::Introspect->new( package => $1 ); + $f->html( $req ); + } + + if ( $path =~ m!/ob/([^/]+)(?:/([^/]*))?! ) { + my $f = Frey::ObjectBrowser->new( fey_class => $1 ); + $f->html( $req ); + } + + }; + + if ( $@ ) { + warn $@; + #$req->conn->send_error( 404 ); # FIXME this should probably be 500, but we can't ship page with it + $req->print( qq{
$@} ); + + } else { + + my $f = Frey::ClassLoader->new; + my $classes = dom2html( + ul => [ + map { + warn dump( $_ ); + my $package = $_; + ( li => [ + a => { href => '/~/' . $package . '/' } => [ $package ], + ' ', $f->package_path( $package ), ' ', + $package->can('rows') ? + ( a => { href => '/ob/' . $package } => [ 'browse' ] ) : '', + ] ) + } $f->classes + ], + ); + $req->print( $classes ); + } # If this is a request for the pushtream, then give them that @@ -56,11 +93,6 @@ send_message($req); } - while ( 1 ) { - my $f = Frey->new; - $req->print( dump( $f->classes ) ); - $req->next; - } } # Here we accept a connection to the browser, and keep it open. Meanwhile we