--- trunk/lib/Frey/Server.pm	2008/08/31 17:44:03	179
+++ trunk/lib/Frey/Server.pm	2008/11/05 08:20:50	277
@@ -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,86 +40,72 @@
 		path_session => 1,
 		cookie_session => 'sid',
 		callback => \&main,
-		debug_level => 1,
+		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');
 
 #	warn $req->request->header('User_Agent');
 
-	sub run_markup {
-		my ( $req, $class ) = @_;
+	my %params = $req->params;
+	my $html;
 
-		my %params = $req->params;
-
-		my @required = 
-			grep {
-				defined $_ && !defined( $params{$_} )
-			}
-			map {
-				my $attr = $class->meta->get_attribute($_);
-				$attr->is_required && $_
-			} $class->meta->get_attribute_list;
-
-		warn "## required = ",dump( @required );
-		warn "## params = ",dump( %params );
-
-		my $html;
-
-		if ( @required ) {
-			$html = qq|<form method="post">|;
-			$html .= qq|<input type="text" name="$_">| foreach @required;
-			$html .= qq|<input type="submit" value="Run $class"></form>|;
-		} else {
-			my $o = $class->new( %params );
-			$o->depends if $o->can('depends');
-			$html = $o->markup;
-		}
-
-		warn ">>> markup $class ",length( $html ), " bytes\n";
-		return $html;
-	}
+	eval {
 
+		my $f;
 
-#	eval {
-	{
+		my $run_regexp = join('|', Frey::Run->execute );
 
-		my $f;
+		if ( $path =~ m!/Frey[:-]+ObjectBrowser! ) {
+			$f = Frey::ObjectBrowser->new( fey_class => $params{class} );
+			$f->request( $req );
+		} elsif ( $path =~ m!/Frey[:-]+ObjectDesigner! ) {
+			$f = Frey::ObjectDesigner->new( fey_class => $params{class} );
+			$f->request( $req );
+		} elsif ( $path =~ m!/Frey[:-]+Introspect! ) {
+			$f = Frey::Introspect->new( class => $params{class} );
+			$req->print( $f->markup );
+			undef $f;
+		} elsif ( $path =~ m!/([^/]+)/($run_regexp)! ) {
+			warn "# run $1 $2\n";
+			$f = Frey::Run->new( class => $1, params => \%params );
+		} else {
+			$f = Frey::Run->new( class => 'Frey::ClassBrowser' );
+		}
 
-		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/([^/]+)(.*)! ) {
-			$req->print( run_markup( $req, $1 )  );
+		if ( $f ) {
+			$req->print( $f->html );
 		} else {
-			$f = Frey::ClassBrowser->new;
+			warn "# can't call request on nothing!";
 		}
-		$f->html( $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;
 
 	}
 
@@ -113,10 +114,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);