Error "not allowed after "multi"" now raise exception

Author: iph0

README

@@ -1,4 +1,4 @@
-AnyEvent-RipeRedis version 0.22
+AnyEvent-RipeRedis version 0.23_01
 ======================
 
 INSTALLATION

lib/AnyEvent/RipeRedis.pm

@@ -5,7 +5,7 @@ use strict;
 use warnings;
 use base qw( Exporter );
 
-our $VERSION = '0.22';
+our $VERSION = '0.23_01';
 
 use AnyEvent::RipeRedis::Error;
 
@@ -506,6 +506,14 @@ sub _execute {
   my $self = shift;
   my $cmd  = shift;
 
+  if ( $self->{_multi_mode}
+    && ( exists $SUBUNSUB_CMDS{ $cmd->{name} }
+      || exists $NEED_POSTPROCESS{ $cmd->{name} } ) )
+  {
+    croak qq{Command "$cmd->{name}" not allowed after "multi" command.}
+        . ' First, the transaction must be finalized.';
+  }
+
   if ( exists $NEED_PREPROCESS{ $cmd->{name} } ) {
     if ( $cmd->{name} eq 'multi' ) {
       $self->{_multi_mode} = 1;
@@ -527,20 +535,7 @@ sub _execute {
       if ( exists $SUB_CMDS{ $cmd->{name} }
         && !defined $cmd->{on_message} )
       {
-        croak q{"on_message" callback must be specified};
-      }
-
-      if ( $self->{_multi_mode} ) {
-        AE::postpone {
-          my $err = _new_error(
-            qq{Command "$cmd->{name}" not allowed after "multi" command.}
-                . ' First, the transaction must be finalized.',
-            E_OPRN_ERROR
-          );
-          $cmd->{on_reply}->( undef, $err );
-        };
-
-        return;
+        croak '"on_message" callback must be specified';
       }
 
       if ( @{ $cmd->{args} } ) {

lib/AnyEvent/RipeRedis/Error.pm

@@ -4,7 +4,7 @@ use 5.008000;
 use strict;
 use warnings;
 
-our $VERSION = '0.22';
+our $VERSION = '0.23_01';
 
 our %ERROR_CODES = (
   E_CANT_CONN                  => 1,

t/06-subs.t

@@ -10,7 +10,7 @@ my $server_info = run_redis_instance();
 if ( !defined $server_info ) {
   plan skip_all => 'redis-server is required for this test';
 }
-plan tests => 13;
+plan tests => 8;
 
 my $r_consum = AnyEvent::RipeRedis->new(
   host => $server_info->{host},
@@ -35,10 +35,6 @@ my $redis = AnyEvent::RipeRedis->new(
   },
 );
 
-t_sub_after_multi($redis);
-t_sub_after_exec($redis);
-t_sub_after_discard($redis);
-
 $redis->disconnect;
 
 
@@ -297,179 +293,3 @@ sub t_psubunsub {
 
   return;
 }
-
-sub t_sub_after_multi {
-  my $redis = shift;
-
-  my $t_err;
-
-  ev_loop(
-    sub {
-      my $cv = shift;
-
-      $redis->multi;
-      $redis->subscribe( 'channel',
-        { on_reply => sub {
-            my $reply = shift;
-            $t_err    = shift;
-
-            $cv->send;
-          },
-
-          on_message => sub {},
-        }
-      );
-    }
-  );
-
-  $redis->disconnect;
-
-  my $t_pname = 'subscription after MULTI command';
-  isa_ok( $t_err, 'AnyEvent::RipeRedis::Error' );
-  is( $t_err->message, q{Command "subscribe" not allowed}
-      . q{ after "multi" command. First, the transaction must be finalized.},
-      "$t_pname; error message" );
-  is( $t_err->code, E_OPRN_ERROR, "$t_pname; error code" );
-
-  return;
-}
-
-sub t_sub_after_exec {
-  my $redis = shift;
-
-  my $t_reply;
-
-  ev_loop(
-    sub {
-      my $cv = shift;
-
-      $redis->set( 'foo', "some\r\nstring" );
-
-      $redis->multi;
-      $redis->get( 'foo' );
-      $redis->incr( 'bar' );
-      $redis->exec(
-        sub {
-          my $reply = shift;
-          my $err   = shift;
-
-          if ( defined $err ) {
-            diag( $err->message );
-          }
-        }
-      );
-
-      $redis->subscribe( 'channel',
-        { on_reply => sub {
-            $t_reply = shift;
-            my $err  = shift;
-
-            if ( defined $err ) {
-              diag( $err->message );
-            }
-
-            $redis->unsubscribe( 'channel',
-              sub {
-                my $reply = shift;
-                my $err   = shift;
-
-                if ( defined $err ) {
-                  diag( $err->message );
-                }
-
-                $redis->del( qw( foo bar ),
-                  sub {
-                    my $reply = shift;
-                    my $err   = shift;
-
-                    if ( defined $err ) {
-                      diag( $err->message );
-                    }
-
-                    $cv->send;
-                  }
-                );
-              }
-            );
-          },
-
-          on_message => sub {},
-        }
-      );
-    }
-  );
-
-  is( $t_reply, 1, 'subscription after EXEC command' );
-
-  return;
-}
-
-sub t_sub_after_discard {
-  my $redis = shift;
-
-  my $t_reply;
-
-  ev_loop(
-    sub {
-      my $cv = shift;
-
-      $redis->set( 'foo', "some\r\nstring" );
-
-      $redis->multi;
-      $redis->get( 'foo' );
-      $redis->incr( 'bar' );
-      $redis->discard(
-        sub {
-          my $reply = shift;
-          my $err   = shift;
-
-          if ( defined $err ) {
-            diag( $err->message );
-          }
-        }
-      );
-
-      $redis->subscribe( 'channel',
-        { on_reply => sub {
-            $t_reply = shift;
-            my $err  = shift;
-
-            if ( defined $err ) {
-              diag( $err->message );
-            }
-
-            $redis->unsubscribe( 'channel',
-              sub {
-                my $reply = shift;
-                my $err   = shift;
-
-                if ( defined $err ) {
-                  diag( $err->message );
-                }
-
-                $redis->del( 'foo',
-                  sub {
-                    my $reply = shift;
-                    my $err   = shift;
-
-                    if ( defined $err ) {
-                      diag( $err->message );
-                    }
-
-                    $cv->send;
-                  }
-                );
-              }
-            );
-          },
-
-          on_message => sub {},
-        }
-      );
-    }
-  );
-
-  is( $t_reply, 1, 'subscription after DISCARD command' );
-
-  return;
-}

t/10-exceptions.t

@@ -2,13 +2,14 @@ use 5.008000;
 use strict;
 use warnings;
 
-use Test::More tests => 13;
+use Test::More tests => 15;
 use Test::Fatal;
 use AnyEvent::RipeRedis;
 
 t_conn_timeout();
 t_read_timeout();
 t_min_reconnect_interval();
+t_not_allowed_after_multi();
 t_on_message();
 
 
@@ -138,6 +139,36 @@ sub t_min_reconnect_interval {
   return;
 }
 
+sub t_not_allowed_after_multi {
+  my $redis = AnyEvent::RipeRedis->new(
+    on_error => sub {
+      # do not print error
+    }
+  );
+
+  $redis->multi;
+
+  like(
+    exception {
+      $redis->subscribe('channel');
+    },
+    qr/Command "subscribe" not allowed after "multi" command\./,
+    "t_not_allowed_after_multi; SUBSCRIBE",
+  );
+
+  like(
+    exception {
+      $redis->select(2);
+    },
+    qr/Command "select" not allowed after "multi" command\./,
+    "t_not_allowed_after_multi; SELECT",
+  );
+
+  $redis->disconnect;
+
+  return;
+}
+
 sub t_on_message {
   my $redis = AnyEvent::RipeRedis->new();