X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=angular-server.pl;h=0d1622e18c127341c5b8ec1bb95c5d0f517ddb1d;hb=05c21646949b9850e70268f90e9cd98e2236b654;hp=4471a066cc582c294a21b424b277ec7806f4a118;hpb=44dbf207741b4c06928dedd0ff4ac940e21b3fb8;p=angular-mojolicious.git

diff --git a/angular-server.pl b/angular-server.pl
index 4471a06..0d1622e 100755
--- a/angular-server.pl
+++ b/angular-server.pl
@@ -23,15 +23,23 @@ sub _couchdb_put {
 
 	my $json = Mojo::JSON->new->encode( $data );
 
+	my $rev;
+
 	warn "# _couchdb_put $url = $json";
 	$client->put( "$couchdb/$url" => $json => sub {
 		my ($client,$tx) = @_;
+		my ($message, $code) = $tx->error;
+		my $response = $tx->res->json;
+		warn "## response $code ",dump($response);
 		if ($tx->error) {
-			die "ERROR CouchDB ",$tx->error;
+			warn "ERROR $code $message";
 		}
-		my $response = $tx->res->json;
-		warn "## CouchDB response ",dump($response);
+		return
+		$rev = $response->{rev};
 	})->process;
+
+	warn "## rev = $rev";
+	return $rev;
 }
 
 sub _couchdb_get {
@@ -58,32 +66,6 @@ warn "## _render_json $data";
 
 #get '/' => 'index';
 
-get '/_replicate' => sub {
-	my $self = shift;
-
-	if ( my $from = $self->param('from') ) {
-		my $got = $self->client->get( $from )->res->json;
-		warn "# from $from ",dump($got);
-
-		my $database = $got->{name};
-		my $entities = $got->{entities};
-
-		if ( $database && $entities ) {
-			foreach my $entity ( keys %$entities ) {
-				my $url = $from;
-				$url =~ s{/?$}{/}; # add slash at end
-				$url .= $entity;
-				my $all = $self->client->get( $url )->res->json;
-				warn "# replicated $url ", dump($all);
-				foreach my $e ( @$all ) {
-					delete $e->{_id}; # sanitize data from older implementation
-					_couchdb_put( "/$database/$entity." . $e->{'$id'} => $e );
-				}
-			}
-		}
-		_render_jsonp( $self,  $got );
-	}
-};
 
 get '/data/' => sub {
 	my $self = shift;
@@ -104,7 +86,7 @@ get '/data/:database' => sub {
 			language => 'javascript',
 			views => {
 				counts => {
-					map    => q| function(doc) { emit(doc.$entity,1); } |,
+					map    => q| function(doc) { emit(doc._id.split('.')[0],1); } |,
 					reduce => q| function(keys,values,rereduce) { return sum(values); } |,
 				}
 			}
@@ -160,7 +142,8 @@ any [ 'post' ] => '/data/:database/:entity' => sub {
 
 	$json->{'$id'} ||= $id;	# make sure $id is in there
 
-	_couchdb_put "/$database/$entity.$id" => $json;
+	my $rev = _couchdb_put "/$database/$entity.$id" => $json;
+	$json->{_rev} = $rev;
 
 	_render_jsonp( $self,  $json );
 };
@@ -179,6 +162,24 @@ get '/conference/:page' => sub {
 	$self->render( "conference/" . $self->param('page'), layout => 'angular' );
 };
 
+# /app/
+
+get '/app/:database/angular.js' => sub {
+	my $self = shift;
+	my $ANGULAR_JS = $ENV{ANGULAR_JS} || ( -e 'public/angular/build/angular.js' ? '/angular/build/angular.js' : '/angular/src/angular-bootstrap.js' );
+	warn "# $ANGULAR_JS";
+	$self->render_static( $ANGULAR_JS );
+};
+
+# CouchDB proxy for _design _view
+
+get '/:database/_design/:design/_view/:view' => sub {
+	my $self = shift;
+	my $url = $self->param('url');
+	warn "# /couchdb $url";
+	_render_jsonp( $self, _couchdb_get( $self->param('database') . '/_design/' . $self->param('design') . '/_view/' . $self->param('view') ) );
+};
+
 app->start;
 __DATA__