--- trunk/lib/Frey/Server.pm	2008/06/29 16:24:41	23
+++ trunk/lib/Frey/Server.pm	2008/06/30 20:02:08	38
@@ -4,53 +4,54 @@
 use warnings;
 
 use Continuity;
-use Continuity::REPL;
+#use Continuity::REPL;
 use Data::Dump qw/dump/;
 
 use base 'Frey';
-
 use Frey::HTML;
 
 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;
 
+#$repl = Continuity::REPL->new;
 $server = Continuity->new(
-  port => 16001,
-  path_session => 1,
-  cookie_session => 'sid',
-  callback => \&main,
+	port => 16001,
+	path_session => 1,
+	cookie_session => 'sid',
+	callback => \&main,
+	debug_level => 3,
 );
-$server->debug_level( 2 );
 
-$server->loop;
+sub run {
+	$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);
-  }
+	# 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);
+	# Otherwise, lets give them page
+	send_page($req);
 }
 
 # Here we accept a connection to the browser, and keep it open. Meanwhile we
@@ -99,25 +100,31 @@
 		warn "param = ",dump($req->param);
 		my $path = $req->request->url->path;
 
+		my $html;
+
 		if ( $path =~ m/::/ ) {
 			my ( undef, $module, $method ) = split(m!/!, $path, 3);
 
 			if ( ! defined( $templates->{$module} ) ) {
 				$req->conn->send_status_line( 404, "$module" );
-				$req->print("Package $module not found");
+				$html = "Package $module not found";
+			} elsif ( ! $method ) {
+				$html = Frey::HTML->page( 'package-methods', $req, $module );
 			} elsif ( grep(/^\Q$method\E$/, @{ $templates->{$module} }) ) {
-				$req->print( Frey::HTML->page( $method, $req ) );
+				$html = Frey::HTML->page( $method, $req );
 			} else {
 				$req->conn->send_status_line( 404, "$module $method" );
-				$req->print("Package $module doesn't have $method");
+				$html = "Package $module doesn't have $method";
 			}
 		} else {
-			my $html = Frey::HTML->page( 'status' );
-			$req->print( $html );
-			warn ">> ",length( $html ), " bytes\n";
+			warn "fallback to status page\n";
+			$html = Frey::HTML->page( 'status' );
 		}
+
+		$req->print( $html );
+		warn ">> ",length( $html ), " bytes\n";
 		$req->next;
-		Module::Refresh->refresh;
 	}
 }
 
+1;