--- trunk/lib/Frey/Server.pm	2008/07/13 19:46:10	120
+++ trunk/lib/Frey/Server.pm	2008/08/31 17:44:03	179
@@ -8,7 +8,7 @@
 #use Continuity::REPL;
 use Data::Dump qw/dump/;
 
-#use Carp::REPL;
+use Carp::REPL;
 use Frey::ClassLoader;
 
 my @messages;    # Global (shared) list of messages
@@ -26,7 +26,7 @@
 		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();
@@ -40,14 +40,48 @@
 	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!;
+	Module::Reload->check if $path =~ m!reload! || $req->param('reload');
 
-	warn $req->request->header('User_Agent');
-#warn dump( $req );
+#	warn $req->request->header('User_Agent');
 
-	eval {
+	sub run_markup {
+		my ( $req, $class ) = @_;
+
+		my %params = $req->params;
+
+		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;
+	}
+
+
+#	eval {
+	{
 
 		my $f;
 
@@ -57,6 +91,10 @@
 			$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;
 
@@ -66,13 +104,7 @@
 		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
-	} else {
-
-		$req->print(
-			qq|<h1>Classes</h1>\n<div class="sidebar"><a href="/reload">reload</a></div>| .
-			Frey::ClassBrowser->new->html_markup
-		);
+		Carp::REPL::repl;	# FIXME if $self->debug
 
 	}
 
@@ -80,7 +112,11 @@
 	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);