--- trunk/lib/Frey/Server.pm 2008/07/17 21:07:16 162 +++ trunk/lib/Frey/Server.pm 2008/08/31 17:44:03 179 @@ -46,6 +46,40 @@ # warn $req->request->header('User_Agent'); + 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|
|; + $html .= qq|| foreach @required; + $html .= qq|
|; + } 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 { { @@ -57,14 +91,8 @@ $f = Frey::ObjectBrowser->new( fey_class => $1 ); } elsif ( $path =~ m!/od/([^/]+)(.*)! ) { $f = Frey::ObjectDesigner->new( fey_class => $1 ); - } elsif ( $path =~ m!/pod/([^/]+)(.*)! ) { - $f = Frey::Pod->new( class => $1 ); } elsif ( $path =~ m!/markup/([^/]+)(.*)! ) { - my $o = $1->new( $req->params ); - $o->depends if $o->can('depends'); - my $html = $o->markup( $req->params ); - warn ">>> markup $1 ",length( $html ), " bytes\n"; - $req->print( $html ); + $req->print( run_markup( $req, $1 ) ); } else { $f = Frey::ClassBrowser->new; }