--- trunk/lib/Frey/Server.pm	2008/07/08 12:20:08	60
+++ trunk/lib/Frey/Server.pm	2008/07/11 23:08:25	103
@@ -2,14 +2,13 @@
 
 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 Frey::ClassLoader;
 
 my @messages;    # Global (shared) list of messages
 my $got_message; # Flag to indicate that there is a new message to display
@@ -17,16 +16,18 @@
 use vars qw( $repl $server );
 
 #$repl = Continuity::REPL->new;
-$server = Continuity->new(
-	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?)$/ },
-);
 
 sub run {
+	my ( $self, $port ) = @_;
+	$server = Continuity->new(
+		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?)$/ },
+	);
+	Frey::ClassLoader->new->load_all_classes();
 	$server->loop;
 }
 
@@ -42,15 +43,46 @@
 	warn $req->request->header('User_Agent');
 #warn dump( $req );
 
-	if ( $path =~ m!/~/([^/]+)(?:/([^/]*))?! ) {
-		my $f = Frey::Introspect->new( package => $1 );
-		$f->html( $req );
-	}
+	eval {
+
+		if ( $path =~ m!/~/([^/]+)(?:/([^/]*))?! ) {
+			my $f = Frey::Introspect->new( package => $1 );
+			$f->html( $req );
+		}
+
+		if ( $path =~ m!/ob/([^/]+)(?:/([^/]*))?! ) {
+			my $f = Frey::ObjectBrowser->new( fey_class => $1 );
+			$f->html( $req );
+		}
+
+	};
+
+	if ( $@ ) {
+		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('rows') ?
+							( a => { href => '/ob/' . $package } => [ 'browse' ] ) : '',
+					] )
+				} $f->classes
+			],
+		);
+		$req->print( $classes );
 
-	if ( $path =~ m!/ob/([^/]+)(?:/([^/]*))?! ) {
-		my $f = Frey::ObjectBrowser->new;
-		$f->html( $req );
 	}
+
 	# If this is a request for the pushtream, then give them that
 	if($path =~ /pushstream/) {
 		pushstream($req);
@@ -61,20 +93,6 @@
 		send_message($req);
 	}
 
-	while ( 1 ) {
-		my $f = Frey->new;
-		my $classes = Continuity::Widget::DomNode->create(
-			ul => [
-				map {
-					warn dump( $_ );
-					my ( $package, $path ) = %$_;
-					( li => [ a => { href => '/~/' . $package . '/' } => [ $package ], " <tt>$path</tt>" ] )
-				} @{ $f->classes }
-			],
-		)->to_string;
-		$req->print( $classes );
-		$req->next;
-	}
 }
 
 # Here we accept a connection to the browser, and keep it open. Meanwhile we