--- trunk/lib/Frey/Server.pm	2008/11/05 08:21:03	292
+++ trunk/lib/Frey/Server.pm	2008/11/18 17:12:09	421
@@ -1,8 +1,9 @@
 package Frey::Server;
 
 use Moose;
-
+extends 'Frey';
 with 'Frey::Web';
+with 'Frey::Config';
 
 use Continuity;
 #use Continuity::REPL;
@@ -11,6 +12,7 @@
 #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
@@ -36,7 +38,7 @@
 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,
@@ -79,7 +81,13 @@
 
 		my $f;
 
-		my $run_regexp = join('|', Frey::Run->execute );
+		my $run_regexp = join('|', Frey::Run->runnable );
+		my $editor = Frey::Editor->new;
+
+		# shared run params
+		my $run = {
+			request_url => $req->request->url,
+		};
 
 		if (
 			$path =~ m{/Frey[:-]+ObjectBrowser}
@@ -91,20 +99,25 @@
 		) {
 			$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{/([^/]+)/($run_regexp)}
+			$path =~ m{/([^/]+)/($run_regexp)/?([^/]+)?}
 		) {
 			my $class = rest2class $1;
-			warn "# run $class $2\n";
-			$f = Frey::Run->new( class => $class, params => \%params );
+			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 } );
+			$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 );
 		}
 
 		if ( $f ) {
@@ -120,7 +133,7 @@
 	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->print( qq{<pre class="frey-error">$@<pre>} );
 #		Carp::REPL::repl;
 
 	}