--- trunk/lib/Frey/Server.pm	2008/07/13 12:22:14	106
+++ trunk/lib/Frey/Server.pm	2008/07/17 18:00:55	158
@@ -8,6 +8,7 @@
 #use Continuity::REPL;
 use Data::Dump qw/dump/;
 
+use Carp::REPL;
 use Frey::ClassLoader;
 
 my @messages;    # Global (shared) list of messages
@@ -27,6 +28,7 @@
 		debug_level => 1,
 		staticp => sub { $_[0]->url =~ m/\.(jpg|jpeg|gif|png|css|ico|js|html?)$/ },
 	);
+	$Module::Reload::Debug = 1;
 	Frey::ClassLoader->new->load_all_classes();
 	$server->loop;
 }
@@ -38,22 +40,35 @@
 	my ($req) = @_;
   
 	my $path = $req->request->url->path;
-	warn "REQUEST: $path\n";
+	warn "REQUEST: $path ",dump( $req->params ),"\n";
 
-	warn $req->request->header('User_Agent');
-#warn dump( $req );
+	Module::Reload->check if $path =~ m!reload! || $req->param('reload');
 
-	eval {
+#	warn $req->request->header('User_Agent');
 
-		if ( $path =~ m!/~/([^/]+)(?:/([^/]*))?! ) {
-			my $f = Frey::Introspect->new( package => $1 );
-			$f->html( $req );
-		}
+#	eval {
+	{
 
-		if ( $path =~ m!/ob/([^/]+)(?:/([^/]*))?! ) {
-			my $f = Frey::ObjectBrowser->new( fey_class => $1 );
-			$f->html( $req );
+		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!/pod/([^/]+)(.*)! ) {
+			$f = Frey::Pod->new( class => $1 );
+		} elsif ( $path =~ m!/markup/([^/]+)(.*)! ) {
+			my $o = $1->new( $req->params );
+			$o->depends if $o->can('depends');
+			my $html = $o->markup( $req->params );
+			warn ">>> markup $1 ",length( $html ), " bytes\n";
+			$req->print( $html );
+		} else {
+			$f = Frey::ClassBrowser->new;
 		}
+		$f->html( $req ) if $f;
 
 	};
 
@@ -61,25 +76,7 @@
 		warn $@;
 		#$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>} );
-
-	} else {
-
-		my $f = Frey::ClassLoader->new;
-		my $classes = dom2html(
-			ul => [
-				map {
-					warn dump( $_ );
-					my $package = $_;
-					( li => [
-						a => { href => '/~/' . $package . '/' } => [ $package ],
-						' <tt>', $f->package_path( $package ), '</tt> ',
-						$package->can('collection') ?
-							( a => { href => '/ob/' . $package } => [ 'collection' ] ) : '',
-					] )
-				} $f->classes
-			],
-		);
-		$req->print( $classes );
+		Carp::REPL::repl;	# FIXME if $self->debug
 
 	}
 
@@ -87,7 +84,11 @@
 	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);