Add support for MULTI/EXEC with a block.

djanowski · djanowski · commit 31b7544dcaed · 2010-02-27T23:43:03.000-03:00
The current implementation assumes something like this to be merged upstream: http://github.com/djanowski/redis/commit/aa374a
diff --git a/lib/redis.rb b/lib/redis.rb
@@ -366,6 +366,25 @@ def read_reply
     end
   end
 
+  def exec
+    # Need to override Kernel#exec.
+    call_command([:exec])
+  end
+
+  def multi(&block)
+    return super unless block_given?
+
+    multi
+
+    begin
+      yield
+      exec
+    rescue Exception => e
+      discard
+      raise e
+    end
+  end
+
   private
     def get_size(string)
       string.respond_to?(:bytesize) ? string.bytesize : string.size
diff --git a/spec/redis_spec.rb b/spec/redis_spec.rb
@@ -665,4 +665,29 @@ def ==(other)
     r.connect_to_server
   end
 
+  it "should run MULTI without a block" do
+    @r.multi
+    @r.get("key1").should == "QUEUED"
+  end
+
+  it "should run MULTI/EXEC with a block" do
+    @r.multi do
+      @r.set "key1", "value1"
+    end
+
+    @r.get("key1").should == "value1"
+
+    begin
+      @r.multi do
+        @r.set "key2", "value2"
+        raise "Some error"
+        @r.set "key3", "value3"
+      end
+    rescue
+    end
+
+    @r.get("key2").should be_nil
+    @r.get("key3").should be_nil
+  end
+
 end
