--- trunk/lib/Frey/Server.pm	2008/06/30 07:13:35	36
+++ trunk/lib/Frey/Server.pm	2008/07/05 15:19:55	53
@@ -5,10 +5,12 @@
 
 use Continuity;
 #use Continuity::REPL;
+use Continuity::Widget::DomNode;
 use Data::Dump qw/dump/;
 
 use base 'Frey';
 use Frey::HTML;
+use Frey::ObjectBrowser;
 
 my @messages;    # Global (shared) list of messages
 my $got_message; # Flag to indicate that there is a new message to display
@@ -17,59 +19,51 @@
 
 #$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 => 1,
+	staticp => sub { $_[0]->url =~ m/\.(jpg|jpeg|gif|png|css|ico|js|html?)$/ },
 );
-$server->debug_level( 2 );
-sub run {
 
+sub run {
 	$server->loop;
 }
 
-my @callbacks;
-my $callback_count;
-
-sub gen_link {
-	my ($text, $code) = @_;
-	$callbacks[$callback_count++] = $code;
-	return qq{<a href="?cb=$callback_count">$text</a>};
-}
-
-sub process_links {
-	my $request = shift;
-	my $cb = $request->param('cb');
-	if (exists $callbacks[$cb]) {
-		$callbacks[$cb]->($request);
-		delete $callbacks[$cb];
-	}
-}
-
 # 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 ( $path =~ m!/~/([^/]+)(?:/([^/]*))?! ) {
+		my $f = Frey::Introspect->new( package => $1 );
+		$f->html( $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);
+	}
+
+	if($path =~ m!^/ob!) {
+		Frey::ObjectBrowser->new( req => $req )->html;
+	}
 
-  # 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
@@ -127,7 +121,7 @@
 				$req->conn->send_status_line( 404, "$module" );
 				$html = "Package $module not found";
 			} elsif ( ! $method ) {
-				$html = Frey::HTML->page( 'package-methods', $req, $module );
+				$html = Frey::HTML->page( 'package-templates', $req, $module );
 			} elsif ( grep(/^\Q$method\E$/, @{ $templates->{$module} }) ) {
 				$html = Frey::HTML->page( $method, $req );
 			} else {