--- trunk/lib/Frey/Server.pm	2008/10/31 22:39:48	216
+++ trunk/lib/Frey/Server.pm	2008/11/05 08:21:03	292
@@ -10,6 +10,7 @@
 
 #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
@@ -58,29 +59,59 @@
 	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');
 
-#	eval {
-	{
+	my %params = $req->params;
+	my $html;
+
+	sub rest2class {
+		my $class = shift;
+		$class =~ s/-/::/; # sigh!
+		return $class;
+	}
+
+
+	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|request)/([^/]+)(.*)! ) {
-			$f = Frey::Run->new( class => $2 );
+		my $run_regexp = join('|', Frey::Run->execute );
+
+		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{/([^/]+)/($run_regexp)}
+		) {
+			my $class = rest2class $1;
+			warn "# run $class $2\n";
+			$f = Frey::Run->new( class => $class, params => \%params );
+		} elsif (
+			$path =~ m{/([^/]+)/?$}
+		) {
+			my $class = rest2class $1;
+			warn "# introspect $class";
+			$f = Frey::Run->new( class => 'Frey::Introspect', params => { class => $class } );
 		} else {
 			$f = Frey::Run->new( class => 'Frey::ClassBrowser' );
 		}
-		$f->request( $req ) if $f;
+
+		if ( $f ) {
+			$req->print( $f->html );
+		} else {
+			warn "# can't call request on nothing!";
+		}
 
 	};
 
@@ -88,7 +119,7 @@
 
 	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;