--- trunk/lib/Frey/Server.pm	2008/10/31 22:39:48	216
+++ trunk/lib/Frey/Server.pm	2008/11/19 15:35:34	456
@@ -1,8 +1,9 @@
 package Frey::Server;
 
 use Moose;
-
+extends 'Frey';
 with 'Frey::Web';
+with 'Frey::Config';
 
 use Continuity;
 #use Continuity::REPL;
@@ -10,6 +11,8 @@
 
 #use Carp::REPL; ## XXX it would be nice, but it breaks error reporting too much
 use Frey::ClassLoader;
+use Frey::Run;
+use Frey::Editor;
 
 my @messages;    # Global (shared) list of messages
 my $got_message; # Flag to indicate that there is a new message to display
@@ -35,12 +38,12 @@
 sub run {
 	my ( $self, $port ) = @_;
 	$server = Continuity->new(
-		port => $port || 16001,
+		port => $port || $self->config->{port} || 16001,
 		path_session => 1,
 		cookie_session => 'sid',
 		callback => \&main,
 		debug_level => 2,
-		staticp => sub { $_[0]->url =~ m/\.(jpg|jpeg|gif|png|css|ico|js|html?|xml|json|ya?ml)(\?.*)?$/ },
+		staticp => sub { $_[0]->url =~ m/^(static|var).*\.(jpg|jpeg|gif|png|css|ico|js|html?|xml|json|ya?ml)(\?.*)?$/ },
 	);
 	$Module::Reload::Debug = 1; # auto if debug_level > 1
 	Frey::ClassLoader->new->load_all_classes();
@@ -58,40 +61,82 @@
 	my ($req) = @_;
 
 	my $path = $req->request->url->path;
-	warn "REQUEST: $path ",dump( $req->params ),"\n";
 
-	Module::Reload->check if $path =~ m!reload! || $req->param('reload');
+	eval {
+
+		#warn "REQUEST: $path ",dump( $req->params );
+
+		if ( $path =~ m!reload! || $req->param('reload') ) {
+			warn "# reload!";
+			Module::Reload->check;
+			Frey::Server->new->load_config;
+		}
 
-#	warn $req->request->header('User_Agent');
+#		warn $req->request->header('User_Agent');
+
+		my %params = $req->params;
+		my $html;
+
+		sub rest2class {
+			my $class = shift;
+			$class =~ s/-/::/; # sigh!
+			return $class;
+		}
 
-#	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|request)/([^/]+)(.*)! ) {
-			$f = Frey::Run->new( class => $2 );
+		my $editor = Frey::Editor->new;
+
+		# shared run params
+		my $run = {
+			request_url => $req->request->url,
+		};
+
+		if (
+			$path =~ m{/Frey[:-]+ObjectBrowser}
+		) {
+			$f = Frey::ObjectBrowser->new( fey_class => $params{class} );
+			$f->request( $req );
+		} elsif (
+			$path =~ m{/Frey[:-]+ObjectDesigner}
+		) {
+			$f = Frey::ObjectDesigner->new( fey_class => $params{class} );
+			$f->request( $req );
+		} elsif ( $path =~ $editor->url_regex ) {
+			$req->print( $editor->command( $path ) );
+			system( $editor->command( $path ) );
+			return;
+		} elsif (
+			$path =~ m{/([^/]+)/(as_\w+)/?([^/]+)?}
+		) {
+			my $class = rest2class $1;
+			warn "# run $path -> $class $2";
+			$run->{format} = $3 if $3;
+			$f = Frey::Run->new( class => $class, params => \%params, run => $2, %$run );
+		} elsif (
+			$path =~ m{/([^/]+)/?$}
+		) {
+			my $class = rest2class $1;
+			warn "# introspect $class";
+			$f = Frey::Run->new( class => 'Frey::Introspect', params => { class => $class }, %$run );
 		} else {
-			$f = Frey::Run->new( class => 'Frey::ClassBrowser' );
+			$f = Frey::Run->new( class => 'Frey::ClassBrowser', %$run );
 		}
-		$f->request( $req ) if $f;
 
-	};
+		if ( $f ) {
+			$req->print( $f->html );
+		} else {
+			warn "# can't call request on nothing!";
+		}
 
-	my $self = $req;
+	};
 
 	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>} );
+		$req->conn->send_error( 404 );	# FIXME this should probably be 500, but we can't ship page with it
+		$req->print( qq{<pre class="frey-error">$@<pre>} );
 #		Carp::REPL::repl;
-
 	}
 
 	# If this is a request for the pushtream, then give them that