--- lib/Redis.pm	2009/03/21 23:09:48	11
+++ lib/Redis.pm	2009/03/21 23:39:20	15
@@ -58,6 +58,23 @@
 	return $result;
 }
 
+sub _sock_result_bulk {
+	my $len = <$sock>;
+	warn "# len: ",dump($len);
+	return undef if $len eq "nil\r\n";
+	my $v;
+	read($sock, $v, $len) || die $!;
+	warn "# v: ",dump($v);
+	my $crlf;
+	read($sock, $crlf, 2); # skip cr/lf
+	return $v;
+}
+
+sub _sock_ok {
+	my $ok = <$sock>;
+	confess dump($ok) unless $ok eq "+OK\r\n";
+}
+
 =head1 Connection Handling
 
 =head2 quit
@@ -94,9 +111,8 @@
 
 sub set {
 	my ( $self, $k, $v, $new ) = @_;
-	print $sock ( $new ? "SETNX" : "SET" ) . " $k " . length($v) . "\r\n$v\r\n";
-	my $ok = <$sock>;
-	confess dump($ok) unless $ok eq "+OK\r\n";
+	print $sock "SET" . ( $new ? 'NX' : '' ) . " $k " . length($v) . "\r\n$v\r\n";
+	_sock_ok();
 }
 
 =head2 get
@@ -108,15 +124,7 @@
 sub get {
 	my ( $self, $k ) = @_;
 	print $sock "GET $k\r\n";
-	my $len = <$sock>;
-#	warn "# len: ",dump($len);
-	return undef if $len eq "nil\r\n";
-	my $v;
-	read($sock, $v, $len) || die $!;
-#	warn "# v: ",dump($v);
-	my $crlf;
-	read($sock, $crlf, 2); # skip cr/lf
-	return $v;
+	_sock_result_bulk();
 }
 
 =head2 incr
@@ -187,10 +195,48 @@
 
 sub type {
 	my ( $self, $key ) = @_;
-	print $sock "type $key\r\n";
+	print $sock "TYPE $key\r\n";
 	_sock_result();
 }
 
+=head1 Commands operating on the key space
+
+=head2 keys
+
+  my @keys = $r->keys( '*glob_pattern*' );
+
+=cut
+
+sub keys {
+	my ( $self, $glob ) = @_;
+	print $sock "KEYS $glob\r\n";
+	return split(/\s/, _sock_result_bulk());
+}
+
+=head2 randomkey
+
+  my $key = $r->randomkey;
+
+=cut
+
+sub randomkey {
+	my ( $self ) = @_;
+	print $sock "RANDOMKEY\r\n";
+	_sock_result();
+}
+
+=head2 rename
+
+  my $ok = $r->rename( 'old-key', 'new-key', $new );
+
+=cut
+
+sub rename {
+	my ( $self, $old, $new, $nx ) = @_;
+	print $sock "RENAME" . ( $nx ? 'NX' : '' ) . " $old $new\r\n";
+	_sock_ok();
+}
+
 =head1 AUTHOR
 
 Dobrica Pavlinusic, C<< <dpavlin at rot13.org> >>