--- trunk/lib/Frey/Server.pm	2008/07/16 14:14:18	142
+++ branches/mojo/lib/Frey/Server.pm	2008/11/01 13:06:31	228
@@ -8,8 +8,9 @@
 #use Continuity::REPL;
 use Data::Dump qw/dump/;
 
-use Carp::REPL;
+#use Carp::REPL; ## XXX it would be nice, but it breaks error reporting too much
 use Frey::ClassLoader;
+use Frey::Run;
 
 my @messages;    # Global (shared) list of messages
 my $got_message; # Flag to indicate that there is a new message to display
@@ -18,6 +19,20 @@
 
 #$repl = Continuity::REPL->new;
 
+=head1 NAME
+
+Frey::Server - Continuity based server for Frey
+
+=head2 DESCRIPTION
+
+This is one of pissible server implementations for Frey. In it's current stage, it's also most complete one.
+
+=head2 run
+
+  $o->run( $optional_port );
+
+=cut
+
 sub run {
 	my ( $self, $port ) = @_;
 	$server = Continuity->new(
@@ -25,22 +40,26 @@
 		path_session => 1,
 		cookie_session => 'sid',
 		callback => \&main,
-		debug_level => 1,
-		staticp => sub { $_[0]->url =~ m/\.(jpg|jpeg|gif|png|css|ico|js|html?)$/ },
+		debug_level => 2,
+		staticp => sub { $_[0]->url =~ m/\.(jpg|jpeg|gif|png|css|ico|js|html?|xml|json|ya?ml)(\?.*)?$/ },
 	);
-	$Module::Reload::Debug = 1;
+	$Module::Reload::Debug = 1; # auto if debug_level > 1
 	Frey::ClassLoader->new->load_all_classes();
 	$server->loop;
 }
 
-# This is the main entrypoint. We are looking for one of three things -- a
-# pushstream, a sent message, or a request for the main HTML. We delegate each
-# of these cases, none of which will return (they all loop forever).
+=head2 main
+
+This is simple dispatcher for our server. Currently it's in flux and
+documented only in source code.
+
+=cut
+
 sub main {
 	my ($req) = @_;
-  
+
 	my $path = $req->request->url->path;
-	warn "REQUEST: $path ",dump( $req->params ),"\n";
+	#warn "REQUEST: $path ",dump( $req->params );
 
 	Module::Reload->check if $path =~ m!reload! || $req->param('reload');
 
@@ -51,26 +70,31 @@
 
 		my $f;
 
+		my $run_regexp = join('|', Frey::Run->execute );
+
 		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!/pod/([^/]+)(.*)! ) {
-			$f = Frey::Pod->new( class => $1 );
+		} elsif ( $path =~ m!/($run_regexp)/([^/]+)(.*)! ) {
+			warn "# run $1 $2\n";
+			$f = Frey::Run->new( class => $2 );
 		} else {
-			$f = Frey::ClassBrowser->new;
+			$f = Frey::Run->new( class => 'Frey::ClassBrowser' );
 		}
-		$f->html( $req ) if $f;
+		$f->request( $req ) if $f;
 
 	};
 
+	my $self = $req;
+
 	if ( $@ ) {
 		warn $@;
-		#$req->conn->send_error( 404 );	# FIXME this should probably be 500, but we can't ship page with it
+		$req->conn->send_error( 404 );	# FIXME this should probably be 500, but we can't ship page with it
 		$req->print( qq{<pre class="error">$@<pre>} );
-		Carp::REPL::repl;	# FIXME if $self->debug
+#		Carp::REPL::repl;
 
 	}
 
@@ -79,10 +103,6 @@
 		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);