--- trunk/lib/Frey/Server.pm	2008/06/29 12:55:39	19
+++ trunk/lib/Frey/Server.pm	2008/07/11 19:19:42	100
@@ -1,54 +1,98 @@
 package Frey::Server;
 
-use strict;
-use warnings;
+use Moose;
+
+with 'Frey::Web';
 
 use Continuity;
-use Continuity::REPL;
+#use Continuity::REPL;
 use Data::Dump qw/dump/;
 
-use HTML;
+use Frey;
+use Frey::Introspect;
+use Frey::ObjectBrowser;
 
 my @messages;    # Global (shared) list of messages
 my $got_message; # Flag to indicate that there is a new message to display
 
 use vars qw( $repl $server );
-$repl = Continuity::REPL->new;
 
-$server = Continuity->new(
-  port => 16001,
-  path_session => 1,
-  cookie_session => 'sid',
-  callback => \&main,
-);
-$server->debug_level( 2 );
+#$repl = Continuity::REPL->new;
 
-$server->loop;
+sub run {
+	$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?)$/ },
+	);
+	$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).
 sub main {
-  my ($req) = @_;
+	my ($req) = @_;
   
-  my $path = $req->request->url->path;
-  warn "REQUEST: $path\n";
+	my $path = $req->request->url->path;
+	warn "REQUEST: $path\n";
 
 	warn $req->request->header('User_Agent');
 #warn dump( $req );
 
-  # If this is a request for the pushtream, then give them that
-  if($path =~ /pushstream/) {
-	pushstream($req);
-  }
+	eval {
+
+		if ( $path =~ m!/~/([^/]+)(?:/([^/]*))?! ) {
+			my $f = Frey::Introspect->new( package => $1 );
+			$f->html( $req );
+		}
+
+		if ( $path =~ m!/ob/([^/]+)(?:/([^/]*))?! ) {
+			my $f = Frey::ObjectBrowser->new;
+			$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, $path ) = %$_;
+					( li => [
+						a => { href => '/~/' . $package . '/' } => [ $package ],
+						' ',
+						a => { href => '/ob/' . $package } => [ 'browse' ],
+						" <tt>$path</tt>"
+					] )
+				} @{ $f->classes }
+			],
+		);
+		$req->print( $classes );
+
+	}
+
+	# If this is a request for the pushtream, then give them that
+	if($path =~ /pushstream/) {
+		pushstream($req);
+	}
   
-  # If they are sending us a message, we give them a thread for that too
-  if($path =~ /sendmessage/) {
-	send_message($req);
-  }
+	# If they are sending us a message, we give them a thread for that too
+	if($path =~ /sendmessage/) {
+		send_message($req);
+	}
 
-  # Otherwise, lets give them page
-  send_page($req);
 }
 
 # Here we accept a connection to the browser, and keep it open. Meanwhile we
@@ -88,15 +132,4 @@
   }
 }
 
-# This isn't a pushstream, nor a new message. It is just the main page. We loop
-# in case they ask for it multiple times :)
-sub send_page {
-  my ($req) = @_;
-  while(1) {
-	warn "param = ",dump($req->param);
-	$req->print( HTML->view( 'status' ) );
-    $req->next;
-	Module::Refresh->refresh;
-  }
-}
-
+1;