--- trunk/lib/Frey/Server.pm 2008/07/08 16:18:13 64 +++ trunk/lib/Frey/Server.pm 2008/08/31 18:02:50 180 @@ -2,14 +2,14 @@ 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::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 @@ -19,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?)$/ }, + staticp => sub { $_[0]->url =~ m/\.(jpg|jpeg|gif|png|css|ico|js|html?|xml|json|ya?ml)(\?.*)?$/ }, ); + $Module::Reload::Debug = 1; + Frey::ClassLoader->new->load_all_classes(); $server->loop; } @@ -37,46 +40,62 @@ my ($req) = @_; my $path = $req->request->url->path; - warn "REQUEST: $path\n"; + warn "REQUEST: $path ",dump( $req->params ),"\n"; + + Module::Reload->check if $path =~ m!reload! || $req->param('reload'); + +# warn $req->request->header('User_Agent'); + + sub run_markup { + my ( $req, $class ) = @_; - warn $req->request->header('User_Agent'); -#warn dump( $req ); + my %params = $req->params; - if ( $path =~ m!/~/([^/]+)(?:/([^/]*))?! ) { - my $f = Frey::Introspect->new( package => $1 ); - $f->html( $req ); } - if ( $path =~ m!/ob/([^/]+)(?:/([^/]*))?! ) { - my $f = Frey::ObjectBrowser->new; - $f->html( $req ); + +# eval { + { + + my $f; + + 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 ); + } elsif ( $path =~ m!/markup/([^/]+)(.*)! ) { + $f = Frey::Run->new( class => $1 ); + } else { + $f = Frey::ClassBrowser->new; + } + $f->html( $req ) if $f; + + }; + + if ( $@ ) { + 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 + } + # If this is a request for the pushtream, then give them that if($path =~ /pushstream/) { pushstream($req); } - + + if ( $path =~ m/die/ ) { + Carp::REPL::repl; # FIXME if $self->debug + } + # If they are sending us a message, we give them a thread for that too if($path =~ /sendmessage/) { send_message($req); } - my $f = Frey->new; - my $classes = Continuity::Widget::DomNode->create( - ul => [ - map { - warn dump( $_ ); - my ( $package, $path ) = %$_; - ( li => [ - a => { href => '/~/' . $package . '/' } => [ $package ], - ' ', - a => { href => '/ob/' . $package } => [ 'browse' ], - " $path" - ] ) - } @{ $f->classes } - ], - )->to_string; - $req->print( $classes ); } # Here we accept a connection to the browser, and keep it open. Meanwhile we