--- trunk/lib/Frey/Server.pm	2008/06/30 20:02:08	38
+++ trunk/lib/Frey/Server.pm	2008/07/17 18:00:55	158
@@ -1,14 +1,15 @@
 package Frey::Server;
 
-use strict;
-use warnings;
+use Moose;
+
+with 'Frey::Web';
 
 use Continuity;
 #use Continuity::REPL;
 use Data::Dump qw/dump/;
 
-use base 'Frey';
-use Frey::HTML;
+use Carp::REPL;
+use Frey::ClassLoader;
 
 my @messages;    # Global (shared) list of messages
 my $got_message; # Flag to indicate that there is a new message to display
@@ -16,15 +17,19 @@
 use vars qw( $repl $server );
 
 #$repl = Continuity::REPL->new;
-$server = Continuity->new(
-	port => 16001,
-	path_session => 1,
-	cookie_session => 'sid',
-	callback => \&main,
-	debug_level => 3,
-);
 
 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?)$/ },
+	);
+	$Module::Reload::Debug = 1;
+	Frey::ClassLoader->new->load_all_classes();
 	$server->loop;
 }
 
@@ -35,23 +40,60 @@
 	my ($req) = @_;
   
 	my $path = $req->request->url->path;
-	warn "REQUEST: $path\n";
+	warn "REQUEST: $path ",dump( $req->params ),"\n";
+
+	Module::Reload->check if $path =~ m!reload! || $req->param('reload');
+
+#	warn $req->request->header('User_Agent');
 
-	warn $req->request->header('User_Agent');
-#warn dump( $req );
+#	eval {
+	{
+
+		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;
+
+	};
+
+	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>} );
+		Carp::REPL::repl;	# FIXME if $self->debug
+
+	}
 
 	# If this is a request for the pushtream, then give them that
 	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);
 	}
 
-	# Otherwise, lets give them page
-	send_page($req);
 }
 
 # Here we accept a connection to the browser, and keep it open. Meanwhile we
@@ -91,40 +133,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) = @_;
-	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;