--- trunk/lib/Frey/Mojo.pm 2009/03/12 20:56:04 1045 +++ trunk/lib/Frey/Mojo.pm 2009/04/22 22:01:06 1046 @@ -9,6 +9,7 @@ use lib 'lib'; use Frey::Server; +use Frey::CouchAPI; use Data::Dump qw/dump/; @@ -26,7 +27,7 @@ $self->log->level('error'); $self->log->path(undef); - warn "# home ", $self->home; +# warn "# home ", $self->home; $self->static->root( './' ); @@ -43,22 +44,25 @@ use base 'Mojo::Transaction'; sub app { my $self = shift; - warn "## $self app ", @_; +# warn "## $self app ", @_; $self; } sub log { my $self = shift; - warn "## $self log ",@_; +# warn "## $self log ",@_; return $self; } sub debug { my $self = shift; - warn "## $self debug ",@_; + warn "## ",@_, $/; return $self; } } bless $tx, 'Fake::App'; + # rewrite URL + Frey::CouchAPI->rewrite_urls( $tx ); + if ( $self->static->dispatch($tx) ) { # warn "# static ",dump( $tx ); return $tx; @@ -74,7 +78,16 @@ my $url = $tx->req->url->to_string; my $params = $tx->req->params->to_hash; - warn "# url $url params ",dump($params); + my $referer = $tx->req->content->headers->header('Referer'); + my $ajax = $tx->req->content->headers->header('X-Requested-With'); + warn "# referer $referer\n"; + warn "# headers = ", dump( $tx->req->content->headers ); + + if ( $referer =~ m{/_utils} || $ajax =~ m{XMLHttpRequest}i ) { + return Frey::CouchAPI->dispatch( $tx ); + } + + warn "# url $url from $referer params ",dump($params); my $request = $server->request( $url, $params ); # fetch body