--- trunk/lib/Frey/Server.pm	2008/06/29 12:55:39	19
+++ trunk/lib/Frey/Server.pm	2008/06/29 20:48:35	30
@@ -7,23 +7,26 @@
 use Continuity::REPL;
 use Data::Dump qw/dump/;
 
-use HTML;
+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;
 
-$server = Continuity->new(
-  port => 16001,
-  path_session => 1,
-  cookie_session => 'sid',
-  callback => \&main,
-);
-$server->debug_level( 2 );
+sub run {
+	$repl = Continuity::REPL->new;
+	$server = Continuity->new(
+	  port => 16001,
+	  path_session => 1,
+	  cookie_session => 'sid',
+	  callback => \&main,
+	);
+	$server->debug_level( 2 );
 
-$server->loop;
+	$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
@@ -91,12 +94,37 @@
 # 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;
-  }
+	my ($req) = @_;
+	my $templates = Template::Declare->templates;
+	while(1) {
+		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" );
+				$html = "Package $module not found";
+			} elsif ( ! $method ) {
+				$html = Frey::HTML->page( 'package-methods', $req, $module );
+			} elsif ( grep(/^\Q$method\E$/, @{ $templates->{$module} }) ) {
+				$html = Frey::HTML->page( $method, $req );
+			} else {
+				$req->conn->send_status_line( 404, "$module $method" );
+				$html = "Package $module doesn't have $method";
+			}
+		} else {
+			warn "fallback to status page\n";
+			$html = Frey::HTML->page( 'status' );
+		}
+
+		$req->print( $html );
+		warn ">> ",length( $html ), " bytes\n";
+		$req->next;
+	}
 }
 
+1;