--- lib/PXElator/CouchDB.pm	2009/08/12 22:56:45	207
+++ lib/PXElator/CouchDB.pm	2009/08/18 21:30:55	256
@@ -12,6 +12,7 @@
 use Data::Structure::Util qw(unbless);
 use Scalar::Util qw/blessed/;
 use Storable qw/dclone/;
+use Carp qw/carp/;
 
 sub new {
 	my ($class, $host, $port, $options) = @_;
@@ -60,10 +61,18 @@
 
 our $rev;
 
+sub rev {
+	my ($self,$url) = @_;
+	my $rev = $rev->{$url};
+	$rev  ||= eval { $self->get( $url )->{_rev} };
+#	warn "# rev $url $rev";
+	return $rev;
+}
+
 sub delete {
 	my ($self, $url) = @_;
 
-	$self->request(DELETE => $url);
+	$self->request(DELETE => $url . '?rev=' . $self->rev($url) );
 }
 
 sub get {
@@ -75,16 +84,26 @@
 sub put {
 	my ($self, $url, $json) = @_;
 
-	if ( ! defined $json->{_rev} ) {
-		my $old = eval { $self->get( $url )->{_rev} };
-		$rev->{$url} = $json->{_rev} = $old if defined $old;
-	}
+	$json->{_rev} = $rev->{$url} if defined $rev->{$url};
 
-	$json = unbless dclone $json if blessed $json;
+	my $data = dclone $json;
+	$data = unbless $data if blessed $data;
 
-	$json = JSON->new->utf8->encode( $json ) if $json;
+#	warn "# put ",dump( $data );
 
-	$self->request(PUT => $url, $json);
+	$json = JSON->new->utf8->encode( $data );
+
+	carp "# put ",$json;
+
+	do {
+		my $json = eval { $self->request(PUT => $url, $json) };
+		if ( $@ ) {
+			$rev->{$url} = $self->rev( $url );
+			warn "refresh rev $url = ", $rev->{$url};
+		} else {
+			$rev->{$url} = JSON->new->decode( $json )->{rev};
+		}
+	} until ! $@;
 }
 
 sub post {
@@ -99,25 +118,31 @@
 	my $data = pop @_;
 
 	my $url = join(' ', @_);
-	$url =~ s/-\S+//g;
+	$url =~ s/\s+-\S+//g;	# remove command line options
 	$url =~ s/\W+/-/g;
 
-	my ( $package, $file, $line, $sub ) = caller(1);
-	( $package, undef, $line ) = caller(0) if $package eq 'main';
+	my $time = $data->{time} = time();
+
+	my @caller_name = ( qw/package file line sub/ );
+	my @caller = caller(0);
+	$caller[3] =~ s{^.+::}{}; # stip package name from sub
+	$data->{ $caller_name[$_] } = $caller[$_] foreach ( 0 .. $#caller_name );
+
+	my $caller;
+	my $depth = 0;
+	while ( my @c = caller($depth) ) {
+		push @$caller, [ @c ];
+		$depth++;
+	}
 
-	my $t = time();
+	$data->{caller} = $caller;
 
-	$data->{x_meta} = {
-		'time' => $t,
-		'package' => $package,
-		'line' => $line,
-		'sub' => $sub,
-	};
-	$data->{'ident'} = [ @_ ] if @_;
+#	carp 'audit ', dump($data);
 
-	warn 'audit ', dump($data), "at $file +$line\n";
+	$time = int($time); # reduce granularity for url
+	my $package = $caller[0];
+	$audit->put( "pxelator/$time.$package.$url", $data );
 
-	$audit->put( "pxelator/$t.$package.$url", $data );
 }
 
 1;