--- lib/Redis.pm	2009/03/22 13:44:19	27
+++ lib/Redis.pm	2009/03/22 17:31:40	33
@@ -63,8 +63,10 @@
 	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,26 @@
 	_sock_read_bulk();
 }
 
+sub _sock_result_bulk_list {
+	my $self = shift;
+	warn "## _sock_result_bulk_list ",dump( @_ );
+
+	my $size = $self->_sock_send( @_ );
+	confess $size unless $size > 0;
+	$size--;
+
+	my @list = ( 0 .. $size );
+	foreach ( 0 .. $size ) {
+		$list[ $_ ] = _sock_read_bulk();
+	}
+
+	warn "## list = ", dump( @list );
+	return @list;
+}
+
 sub __sock_ok {
 	my $ok = <$sock>;
+	return undef if $ok eq "nil\r\n";
 	confess dump($ok) unless $ok eq "+OK\r\n";
 }
 
@@ -100,7 +120,8 @@
 	my $self = shift;
 	warn "## _sock_send_bulk ",dump( @_ );
 	my $value = pop;
-	print $sock join(' ',@_) . ' ' . length($value) . "\r\n$value\r\n";
+	$value = '' unless defined $value; # FIXME errr? nil?
+	print $sock join(' ',@_) . ' ' . length($value) . "\r\n$value\r\n"
 }
 
 sub _sock_send_bulk {
@@ -313,18 +334,7 @@
 
 sub lrange {
 	my ( $self, $key, $start, $end ) = @_;
-	my $size = $self->_sock_send('LRANGE', $key, $start, $end);
-
-	confess $size unless $size > 0;
-	$size--;
-
-	my @list = ( 0 .. $size );
-	foreach ( 0 .. $size ) {
-		$list[ $_ ] = _sock_read_bulk();
-	}
-
-	warn "## lrange $key $start $end = [$size] ", dump( @list );
-	return @list;
+	$self->_sock_result_bulk_list('LRANGE', $key, $start, $end);
 }
 
 =head2 ltrim
@@ -379,7 +389,7 @@
 
 sub lpop {
 	my ( $self, $key ) = @_;
-	$self->_sock_result_bulk( 'lpop', $key );
+	$self->_sock_result_bulk( 'LPOP', $key );
 }
 
 =head2 rpop
@@ -390,7 +400,64 @@
 
 sub rpop {
 	my ( $self, $key ) = @_;
-	$self->_sock_result_bulk( 'rpop', $key );
+	$self->_sock_result_bulk( 'RPOP', $key );
+}
+
+=head1 Commands operating on sets
+
+=head2 sadd
+
+  $r->sadd( $key, $member );
+
+=cut
+
+sub sadd {
+	my ( $self, $key, $member ) = @_;
+	$self->_sock_send_bulk_number( 'SADD', $key, $member );
+}
+
+=head2 srem
+
+  $r->srem( $key, $member );
+
+=cut
+
+sub srem {
+	my ( $self, $key, $member ) = @_;
+	$self->_sock_send_bulk_number( 'SREM', $key, $member );
+}
+
+=head2 scard
+
+  my $elements = $r->scard( $key );
+
+=cut
+
+sub scard {
+	my ( $self, $key ) = @_;
+	$self->_sock_send( 'SCARD', $key );
+}
+
+=head2 sismember
+
+  $r->sismember( $key, $member );
+
+=cut
+
+sub sismember {
+	my ( $self, $key, $member ) = @_;
+	$self->_sock_send_bulk_number( 'SISMEMBER', $key, $member );
+}
+
+=head2 sinter
+
+  $r->sinter( $key1, $key2, ... );
+
+=cut
+
+sub sinter {
+	my $self = shift;
+	$self->_sock_result_bulk_list( 'SINTER', @_ );
 }
 
 =head1 AUTHOR