--- trunk/lib/Frey/Server.pm	2008/07/08 16:18:13	64
+++ trunk/lib/Frey/Server.pm	2008/08/31 17:44:03	179
@@ -2,14 +2,14 @@
 
 use Moose;
 
+with 'Frey::Web';
+
 use Continuity;
 #use Continuity::REPL;
-use Continuity::Widget::DomNode;
 use Data::Dump qw/dump/;
 
-use Frey;
-use Frey::Introspect;
-use Frey::ObjectBrowser;
+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
@@ -19,14 +19,17 @@
 #$repl = Continuity::REPL->new;
 
 sub run {
+	my ( $self, $port ) = @_;
 	$server = Continuity->new(
-		port => 16001,
+		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?)$/ },
+		staticp => sub { $_[0]->url =~ m/\.(jpg|jpeg|gif|png|css|ico|js|html?|xml|json|ya?ml)(\?.*)?$/ },
 	);
+	$Module::Reload::Debug = 1;
+	Frey::ClassLoader->new->load_all_classes();
 	$server->loop;
 }
 
@@ -37,46 +40,88 @@
 	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');
+
+	sub run_markup {
+		my ( $req, $class ) = @_;
 
-	warn $req->request->header('User_Agent');
-#warn dump( $req );
+		my %params = $req->params;
 
-	if ( $path =~ m!/~/([^/]+)(?:/([^/]*))?! ) {
-		my $f = Frey::Introspect->new( package => $1 );
-		$f->html( $req );
+		my @required = 
+			grep {
+				defined $_ && !defined( $params{$_} )
+			}
+			map {
+				my $attr = $class->meta->get_attribute($_);
+				$attr->is_required && $_
+			} $class->meta->get_attribute_list;
+
+		warn "## required = ",dump( @required );
+		warn "## params = ",dump( %params );
+
+		my $html;
+
+		if ( @required ) {
+			$html = qq|<form method="post">|;
+			$html .= qq|<input type="text" name="$_">| foreach @required;
+			$html .= qq|<input type="submit" value="Run $class"></form>|;
+		} else {
+			my $o = $class->new( %params );
+			$o->depends if $o->can('depends');
+			$html = $o->markup;
+		}
+
+		warn ">>> markup $class ",length( $html ), " bytes\n";
+		return $html;
 	}
 
-	if ( $path =~ m!/ob/([^/]+)(?:/([^/]*))?! ) {
-		my $f = Frey::ObjectBrowser->new;
-		$f->html( $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!/markup/([^/]+)(.*)! ) {
+			$req->print( run_markup( $req, $1 )  );
+		} 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);
 	}
 
-	my $f = Frey->new;
-	my $classes = Continuity::Widget::DomNode->create(
-		ul => [
-			map {
-				warn dump( $_ );
-				my ( $package, $path ) = %$_;
-				( li => [
-					a => { href => '/~/' . $package . '/' } => [ $package ],
-					' ',
-					a => { href => '/ob/' . $package } => [ 'browse' ],
-					" <tt>$path</tt>"
-				] )
-			} @{ $f->classes }
-		],
-	)->to_string;
-	$req->print( $classes );
 }
 
 # Here we accept a connection to the browser, and keep it open. Meanwhile we