almost there

[angular-mojolicious.git] / angular-server.pl

diff --git a/angular-server.pl b/angular-server.pl
index 294af13..1f253a3 100755 (executable)
--- 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;
+                       die "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 {
@@ -64,7 +72,6 @@ get '/_replicate' => sub {
        if ( my $from = $self->param('from') ) {
                my $got = $self->client->get( $from )->res->json;
                warn "# from $from ",dump($got);
-               _render_jsonp( $self,  $got );
 
                my $database = $got->{name};
                my $entities = $got->{entities};
@@ -74,11 +81,15 @@ get '/_replicate' => sub {
                                my $url = $from;
                                $url =~ s{/?$}{/}; # add slash at end
                                $url .= $entity;
-                               my $e = $self->client->get( $url )->res->json;
-                               warn "# replicated $url ", dump($e);
-                               _chouchdb_put( $self, $database, $entity, $e->{'$id'}, $e );
+                               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 );
        }
 };
 
@@ -123,7 +134,17 @@ get '/data/:database' => sub {
 
 get '/data/:database/:entity' => sub {
        my $self = shift;
-       _render_jsonp( $self, _couchdb_get( '/' . $self->param('database') . '/_all_docs' ) ); # FIXME
+
+       my $database = $self->param('database');
+       my $entity   = $self->param('entity');
+
+       my $endkey = $entity;
+       $endkey++;
+
+       my $counts = _couchdb_get qq|/$database/_all_docs?startkey="$entity";endkey="$endkey";include_docs=true|;
+       warn "# counts ",dump($counts);
+
+       _render_jsonp( $self, [ map { $_->{doc} } @{ $counts->{rows} } ] )
 };
 
 get '/data/:database/:entity/:id' => sub {
@@ -147,7 +168,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 );
 };