X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=angular-server.pl;h=80d2392e37e30af35febaff0171291215a21f7f4;hb=9f4a3e13c51558885c1379d466741b724ce44acb;hp=9ed7925ddfb09bc28c191287cd719e8ce27d1374;hpb=4d99a57488de9a6e3ceec84bf0384130ae8b4f3a;p=angular-drzb

diff --git a/angular-server.pl b/angular-server.pl
index 9ed7925..80d2392 100755
--- a/angular-server.pl
+++ b/angular-server.pl
@@ -6,12 +6,17 @@ use Time::HiRes;
 use Clone qw(clone);
 use Mojo::UserAgent;
 
+our $VERSION = `git describe`;
+chomp $VERSION;
+
 sub new_uuid { Time::HiRes::time * 100000 }
 
 #push @{app->static->paths}, 'app'; # default angular-seed app directory
 
 
 my $couchdb = $ENV{COUCHDB} || 'http://localhost:5984';
+my $couchdb_database = 'drzb2013v2';
+my $couchdb_view = "http://10.60.0.92:5984/_utils/document.html?$couchdb_database";
 my $client = Mojo::UserAgent->new;
 
 sub _couchdb_put {
@@ -64,6 +69,27 @@ 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 );
+	$self->stash( couchdb_database => $couchdb_database );
+	$self->render( 'js/services', format => 'js' );
+};
+
+# short public URLs
+get '/hr' => sub { shift->redirect_to('/lang/hr/drzb2013') };
+get '/en' => sub { shift->redirect_to('/lang/en/drzb2013') };
+
 get '/lang/:lang/:template' => sub {
 	my $self = shift;
 	$self->render( $self->stash('template') , lang => $self->stash('lang') );
@@ -71,6 +97,7 @@ get '/lang/:lang/:template' => sub {
 
 get '/lang/:lang/partials/:template' => sub {
 	my $self = shift;
+	$self->stash( couchdb_view => $couchdb_view );
 	$self->render( 'partials/' . $self->stash('template') , lang => $self->stash('lang') );
 };
 
@@ -158,6 +185,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;
@@ -197,10 +230,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);
     });
   }
 }
@@ -231,13 +266,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('');