redness 0.1.3 → 0.1.4

data/lib/redness/red.rb

@@ -25,21 +25,18 @@ class Red
     fail_return
   end
 
-  def multi_with_caution(fail_return = [])
-    redis.multi rescue return fail_return
+  def multi_with_caution(fail_return = [], &block)
     begin
-      yield
-      redis.exec
-    rescue
-      begin
-        redis.discard
-      rescue Redis::CommandError
-        # It's possible the multi failed, but didn't raise an exception -
-        # perhaps due to write(2) not being reattempted in the redis client
-        # (likely a bug).
-      end
-      fail_return
+      redis.multi(&block) || fail_return
+    rescue Redis::TimeoutError
+      # The redis client pipelines the commands internally. It's possible the
+      # MULTI succeeds, but there's a timeout before reaching the EXEC. Try to
+      # issue an extra discard to ensure the transaction is closed.
+      redis.discard  # may raise Redis::CommandError if MULTI never succeeded
+      raise
     end
+  rescue
+    fail_return
   end
 
   def method_missing(method, *args)

data/lib/redness/version.rb

@@ -1,4 +1,4 @@
 module Redness
-  VERSION="0.1.3"
+  VERSION="0.1.4"
   MAJOR, MINOR, TINY = VERSION.split(".")
 end

data/spec/redness/red_spec.rb

@@ -29,10 +29,14 @@ describe Red do
         Red.new.multi_with_caution { raise error_class }.should == []
       end
 
-      it "should not call discard" do
-        lambda do
-          Red.new.multi_with_caution{}
-        end.should_not raise_error
+      it "should attempt to discard the transaction in case it's incomplete" do
+        Red.redis.should_receive(:discard)
+        Red.new.multi_with_caution{}
+      end
+
+      it "should handle a Redis::CommandError when discarding the transaction, in case the MULTI never fired" do
+        Red.redis.stub(:discard).and_raise(Redis::CommandError)
+        -> { Red.new.multi_with_caution{} }.should_not raise_error
       end
     end
 
@@ -46,26 +50,9 @@ describe Red do
       it "should return an empty array if no failure result is given" do
         Red.new.multi_with_caution { raise error_class }.should == []
       end
-
-      it "should discard the transaction" do
-        Red.redis.should_receive(:multi)
-        Red.redis.should_not_receive(:exec)
-        Red.redis.should_receive(:discard)
-        begin
-          Red.new.multi_with_caution{raise error_class}
-        rescue error_class
-        end
-      end
     end
 
     context "when the block does not raise an exception" do
-      it "should exec the transaction" do
-        Red.redis.should_receive(:multi)
-        Red.redis.should_receive(:exec)
-        Red.redis.should_not_receive(:discard)
-        Red.new.multi_with_caution{}
-      end
-
       it "should return the results of the exec'd commands" do
         result = Red.new.multi_with_caution do
           Red.redis.set('a', 1)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redness
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors: