X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=angular-server.pl;h=ba1cc101f376a7688152f3ee31bace5537210fb4;hb=12cc2ae2b8a866efee4e23a9856ed5e0ec6faa4e;hp=29db13a075e59c2476ceed26eff23a23497d9c55;hpb=e115ad28d9d1ce09a48afa1e2af7d3912ff412fa;p=angular-drzb

diff --git a/angular-server.pl b/angular-server.pl
index 29db13a..ba1cc10 100755
--- a/angular-server.pl
+++ b/angular-server.pl
@@ -6,7 +6,8 @@ use Time::HiRes;
 use Clone qw(clone);
 use Mojo::UserAgent;
 
-our $VERSION = '0.3';
+our $VERSION = `git describe`;
+chomp $VERSION;
 
 sub new_uuid { Time::HiRes::time * 100000 }
 
@@ -68,6 +69,16 @@ helper locale => sub {
 	return $locale{ $lang } || "MISSING $lang $_[1]";
 };
 
+helper ip => sub {
+	my $self = shift;
+	return
+		$self->req->headers->header('X-Forwarded-For')
+		|| $self->req->headers->header('X-Real-IP')
+		|| $self->tx->{remote_address}
+	;
+};
+
+
 get '/js/services.js' => sub {
 	my $self = shift;
 	$self->stash( VERSION => $VERSION );
@@ -95,6 +106,12 @@ get '/lang/:lang/.template' => sub {
 	$self->render( $self->stash('template') , lang => $self->stash('lang') );
 };
 
+get '/lang/:lang/template/*template' => sub { # angular-ui templates
+	my $self = shift;
+	my $path = '/lib/angular-ui/bootstrap/template/' . $self->stash('template');
+	warn "# render_static $path";
+	$self->render_static( $path );
+};
 
 get '/data/' => sub {
 	my $self = shift;
@@ -174,6 +191,12 @@ any [ 'post' ] => '/data/:database/:entity' => sub {
 		$json->{entity} = $entity;
 		warn "NEW $id\n";
 	}
+
+	$json->{x_audit} = {
+		t  => Time::HiRes::time,
+		ip => $self->ip(),
+	};
+
 	warn "## $database $entity $id body ",dump($self->req->body, $json);
 
 	my $new = _couchdb_put "/$database/$entity.$id" => $json;
@@ -193,6 +216,8 @@ any [ 'post' ] => '/data/:database/:entity' => sub {
 
 # CouchDB proxy for _design _view
 
+our $view_cache;
+
 get '/:database/_design/:design/_view/:view' => sub {
 	my $self = shift;
 	my $format = $self->param('format');
@@ -200,6 +225,19 @@ get '/:database/_design/:design/_view/:view' => sub {
 	if ( my $param = $self->req->url->query->clone->remove('callback')->remove('format')->to_string ) {
 		$url .= '?' . $param
 	}
+
+	if ( exists $view_cache->{$url}->{time} ) {
+		if ( time() - $view_cache->{$url}->{time} < 60 ) {
+			warn "HIT CouchDB cache $url";
+			$view_cache->{$url}->{hit}++;
+			return _render_jsonp( $self, $view_cache->{$url}->{json} );
+		} else {
+			warn "REFRESH CouchDB cache $url";
+			$view_cache->{$url}->{refresh}++;
+		}
+	} else {
+		$view_cache->{$url}->{miss}++;
+	}
 	warn "CouchDB proxy $url";
 	my $json = _couchdb_get($url);
 
@@ -213,10 +251,12 @@ get '/:database/_design/:design/_view/:view' => sub {
 				organizations => {
 					map    => q| function(doc) {
 if ( doc.user.organization != '' ) {
-  emit(doc.user.organization, 1);
+  if ( doc.user.organization )
+    emit(doc.user.organization, 1);
   if ( doc.user.persons ) {
     doc.user.persons.forEach( function(person) {
-      emit(person.organization, 1);
+      if ( person.organization )
+        emit(person.organization, 1);
     });
   }
 }
@@ -232,6 +272,12 @@ if ( doc.user.organization != '' ) {
 	if ( $format eq 'key_array' ) { # array of keys sorted by value
 		$json->{rows} = [ map { $_->{key} } sort { $b->{value} <=> $a->{value} } @{ $json->{rows} } ];
 	}
+
+	$view_cache->{$url}->{time} = time();
+	$view_cache->{$url}->{json} = $json;
+
+	warn "# view_cache ",dump($view_cache);
+
 	_render_jsonp( $self, $json );
 };
 
@@ -247,13 +293,13 @@ hook after_dispatch => sub {
 
 	return if $self->res->headers->header('ETag');
 
-	my $our_etag = Mojo::ByteStream->new($body)->md5_sum;
+	my $our_etag = Mojo::ByteStream->new($body . $VERSION)->md5_sum;
 	$self->res->headers->header('ETag' => $our_etag);
 
 	my $browser_etag = $self->req->headers->header('If-None-Match');
 	return unless $browser_etag && $browser_etag eq $our_etag;
 
-	$self->app->log->info("HTTP cache hit ", dump( $self->req->url->to_string ), $our_etag );
+	$self->app->log->debug("HTTP cache hit " . $self->req->url->to_string . " $our_etag" );
 
 	$self->res->code(304);
 	$self->res->body('');