--- trunk/lib/Frey/Server.pm 2008/07/14 21:22:43 121 +++ trunk/lib/Frey/Server.pm 2008/08/31 17:44:03 179 @@ -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|
|; + $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 { + { my $f; @@ -57,6 +91,8 @@ $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; }