X-Git-Url: http://git.rot13.org/?p=angular-mojolicious.git;a=blobdiff_plain;f=angular-server.pl;h=0a6cd7529b84babd624e378b2330e0478725e190;hp=2a1ad6383cf78a0dbe6878a210bb90c015d3d466;hb=aee0665504a089a1c2f7152604b90e03c5862358;hpb=a682bf6b4b0f7aa0cdd41df90f4cef0782e6aaea

diff --git a/angular-server.pl b/angular-server.pl
index 2a1ad63..0a6cd75 100755
--- a/angular-server.pl
+++ b/angular-server.pl
@@ -2,15 +2,45 @@
 
 use Mojolicious::Lite;
 use Data::Dump qw(dump);
+use Time::HiRes qw(time);
+use Clone qw(clone);
 
 # based on
 # http://docs.getangular.com/REST.Basic
 # http://angular.getangular.com/data
 
-our $data;
+our $data = {
+	'Cookbook' => {
+		test => [
+				{ '$id' => 1, foo => 1, bar => 2, baz => 3 },
+				{ '$id' => 2, foo => 1                     },
+				{ '$id' => 3,           bar => 2           },
+				{ '$id' => 4,                     baz => 3 },
+		],
+	},
+	'AddressBook' => {
+		people => [
+			{name=>'Misko'},
+			{name=>'Igor'},
+			{name=>'Adam'},
+			{name=>'Elliott'}
+		]
+	}
+};
 our $id2nr;
 
-get '/' => 'index';
+sub _render_jsonp {
+	my ( $self, $json ) = @_;
+#warn "## _render_json ",dump($json);
+	my $data = $self->render( json => $json, partial => 1 );
+warn "## _render_json $data";
+	if ( my $callback = $self->param('callback') ) {
+		$data = "$callback($data)";
+	}
+	$self->render( data => $data, format => 'js' );
+}
+
+#get '/' => 'index';
 
 get '/_replicate' => sub {
 	my $self = shift;
@@ -18,7 +48,7 @@ get '/_replicate' => sub {
 	if ( my $from = $self->param('from') ) {
 		my $got = $self->client->get( $from )->res->json;
 		warn "# from $from ",dump($got);
-		$self->render_json( $got );
+		_render_jsonp( $self,  $got );
 
 		my $database = $got->{name};
 		my $entities = $got->{entities};
@@ -26,23 +56,25 @@ get '/_replicate' => sub {
 		if ( $database && $entities ) {
 			foreach my $entity ( keys %$entities ) {
 				my $url = $from;
-				$url =~ s{/+$}{/};
+				$url =~ s{/?$}{/}; # add slash at end
 				$url .= $entity;
 				my $e = $self->client->get( $url )->res->json;
 				warn "# replicated $url ", dump($e);
 				$data->{$database}->{$entity} = $e;
+				delete $id2nr->{$database}->{$entity};
 			}
 		}
 	}
 };
 
 get '/_data' => sub {
-	shift->render_json( $data )
+	my $self = shift;
+	_render_jsonp( $self, $data )
 };
 
 get '/data/' => sub {
 	my $self = shift;
-	$self->render_json( [ keys %$data ] );
+	_render_jsonp( $self,  [ keys %$data ] );
 };
 
 get '/data/:database' => sub {
@@ -56,12 +88,12 @@ warn "# entry $entity ", dump( $data->{$database}->{$entity} );
 		$list_databases->{document_count} += $count;
 	}
 	warn dump($list_databases);
-	$self->render_json( $list_databases );
+	_render_jsonp( $self,  $list_databases );
 };
 
 get '/data/:database/:entity' => sub {
 	my $self = shift;
-	$self->render_json( $data->{ $self->param('database') }->{ $self->param('entity' ) } );
+	_render_jsonp( $self,  $data->{ $self->param('database') }->{ $self->param('entity' ) } );
 };
 
 get '/data/:database/:entity/:id' => sub {
@@ -82,16 +114,38 @@ get '/data/:database/:entity/:id' => sub {
 	if ( exists $id2nr->{$database}->{$entity}->{$id} ) {
 		my $nr = $id2nr->{$database}->{$entity}->{$id};
 		warn "# entity $id -> $nr\n";
-		$self->render_json( $data->{$database}->{$entity}->[$nr] );
+		_render_jsonp( $self,  $data->{$database}->{$entity}->[$nr] );
 	} else {
 		die "no entity $entity $id in ", dump( $id2nr->{$database}->{$entity} );
 	}
 };
 
-any [ 'put' ] => '/data/:database/:entity/:id' => sub {
+any [ 'post' ] => '/data/:database/:entity' => sub {
 	my $self = shift;
-	$data->{ $self->param('database') }->{ $self->param('entity') }->{ $self->param('id') } = $self->req->json;
-	dumper $data;
+	my $json = $self->req->json;
+	my $id = $json->{'$id'} # XXX we don't get it back from angular.js
+		|| $json->{'_id'}  # so we use our version
+		|| Time::HiRes::time(); # FIXME UUID?
+	warn "## $id body ",dump($self->req->body, $json);
+	die "no data" unless $data;
+
+	$json->{'$id'} ||= $id;	# angular.js doesn't resend this one
+	$json->{'_id'} = $id;	# but does this one :-)
+
+	my $database = $self->param('database');
+	my $entity   = $self->param('entity');
+
+	my $nr = $id2nr->{$database}->{$entity}->{$id};
+	if ( defined $nr ) {
+		$data->{$database}->{$entity}->[$nr] = $json;
+		warn "# update $nr $id ",dump($json);
+	} else {
+		push @{ $data->{$database}->{$entity} }, $json;
+		my $nr = $#{ $data->{$database}->{$entity} };
+		$id2nr->{$database}->{$entity}->{$id} = $nr;
+		warn "# added $nr $id ",dump($json);
+	}
+	_render_jsonp( $self,  $json );
 };
 
 get '/demo/:groovy' => sub {
@@ -99,6 +153,17 @@ get '/demo/:groovy' => sub {
     $self->render(text => $self->param('groovy'), layout => 'funky');
 };
 
+get '/' => sub { shift->redirect_to('/Cookbook') };
+get '/Cookbook' => 'Cookbook';
+get '/Cookbook/:example' => sub {
+	my $self = shift;
+	$self->render( "Cookbook/" . $self->param('example'), layout => 'angular' );
+};
+
+get '/conference/:page' => sub {
+	my $self = shift;
+	$self->render( "conference/" . $self->param('page'), layout => 'angular' );
+};
 
 app->start;
 __DATA__
@@ -112,3 +177,14 @@ Yea baby!
     <head><title>Funky!</title></head>
     <body><%== content %></body>
 </html>
+
+@@ layouts/angular.html.ep
+<!DOCTYPE HTML>
+<html xmlns:ng="http://angularjs.org">
+  <head>
+% my $ANGULAR_JS = $ENV{ANGULAR_JS} || ( -e 'public/angular/build/angular.js' ? '/angular/build/angular.js' : '/angular/src/angular-bootstrap.js' );
+    <script type="text/javascript"
+         src="<%== $ANGULAR_JS %>" ng:autobind></script>
+  </head>
+  <body><%== content %></body>
+</html>