X-Git-Url: http://git.rot13.org/?p=perl-Redis.git;a=blobdiff_plain;f=lib%2FRedis.pm;h=3ac761943306ec4766795a7a3fd6cb030f34d92e;hp=8fe98d6f4b6dc878d58a5c1fed09e2b51a79cfd2;hb=b9bd006758ee8dea10c6e2ff21e4bfc686d44a6a;hpb=7b6138898abd509437714737a314e455f77bc1e5

diff --git a/lib/Redis.pm b/lib/Redis.pm
index 8fe98d6..3ac7619 100644
--- a/lib/Redis.pm
+++ b/lib/Redis.pm
@@ -63,8 +63,10 @@ sub _sock_read_bulk {
 	warn "## bulk len: ",dump($len);
 	return undef if $len eq "nil\r\n";
 	my $v;
-	read($sock, $v, $len) || die $!;
-	warn "## bulk v: ",dump($v);
+	if ( $len > 0 ) {
+		read($sock, $v, $len) || die $!;
+		warn "## bulk v: ",dump($v);
+	}
 	my $crlf;
 	read($sock, $crlf, 2); # skip cr/lf
 	return $v;
@@ -77,8 +79,9 @@ sub _sock_result_bulk {
 	_sock_read_bulk();
 }
 
-sub _sock_ok {
+sub __sock_ok {
 	my $ok = <$sock>;
+	return undef if $ok eq "nil\r\n";
 	confess dump($ok) unless $ok eq "+OK\r\n";
 }
 
@@ -93,15 +96,28 @@ sub _sock_send_ok {
 	my $self = shift;
 	warn "## _sock_send_ok ",dump( @_ );
 	print $sock join(' ',@_) . "\r\n";
-	_sock_ok();
+	__sock_ok();
+}
+
+sub __sock_send_bulk_raw {
+	my $self = shift;
+	warn "## _sock_send_bulk ",dump( @_ );
+	my $value = pop;
+	$value = '' unless defined $value; # FIXME errr? nil?
+	print $sock join(' ',@_) . ' ' . length($value) . "\r\n$value\r\n"
 }
 
 sub _sock_send_bulk {
-	my ( $self, $command, $key, $value ) = @_;
-	print $sock "$command $key " . length($value) . "\r\n$value\r\n";
-	_sock_ok();
+	__sock_send_bulk_raw( @_ );
+	__sock_ok();
 }
 
+sub _sock_send_bulk_number {
+	__sock_send_bulk_raw( @_ );
+	my $v = _sock_result();
+	confess $v unless $v =~ m{^\-?\d+$};
+	return $v;
+}
 
 =head1 Connection Handling
 
@@ -334,9 +350,52 @@ sub ltrim {
 
 sub lindex {
 	my ( $self, $key, $index ) = @_;
-	$self->_sock_result_bulk( 'lindex', $key, $index );
+	$self->_sock_result_bulk( 'LINDEX', $key, $index );
+}
+
+=head2 lset
+
+  $r->lset( $key, $index, $value );
+
+=cut
+
+sub lset {
+	my ( $self, $key, $index, $value ) = @_;
+	$self->_sock_send_bulk( 'LSET', $key, $index, $value );
 }
 
+=head2 lrem
+
+  my $modified_count = $r->lrem( $key, $count, $value );
+
+=cut
+
+sub lrem {
+	my ( $self, $key, $count, $value ) = @_;
+	$self->_sock_send_bulk_number( 'LREM', $key, $count, $value );
+}
+
+=head2 lpop
+
+  my $value = $r->lpop( $key );
+
+=cut
+
+sub lpop {
+	my ( $self, $key ) = @_;
+	$self->_sock_result_bulk( 'lpop', $key );
+}
+
+=head2 rpop
+
+  my $value = $r->rpop( $key );
+
+=cut
+
+sub rpop {
+	my ( $self, $key ) = @_;
+	$self->_sock_result_bulk( 'rpop', $key );
+}
 
 =head1 AUTHOR