redness 0.1.2 → 0.1.3

data/lib/redness/red.rb

@@ -26,12 +26,18 @@ class Red
   end
 
   def multi_with_caution(fail_return = [])
-    redis.multi rescue return
+    redis.multi rescue return fail_return
     begin
       yield
       redis.exec
     rescue
-      redis.discard
+      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
     end
   end

data/lib/redness/version.rb

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

data/spec/redness/red_spec.rb

@@ -3,42 +3,75 @@ require_relative '../spec_integration_helper'
 describe Red do
   describe "#execute_with_uncertainty" do
     it "should return the given value if the block raises a Red::RedisUnavailable" do
-      Red.new.execute_with_uncertainty(2) { raise Red::RedisUnavailable }.should == 2
+      Red.new.execute_with_uncertainty(:boom) { raise Red::RedisUnavailable }.should == :boom
     end
 
     it "should return the given value if the block raises a Redis::CannotConnectError" do
-      Red.new.execute_with_uncertainty(2) { raise Redis::CannotConnectError }.should == 2
+      Red.new.execute_with_uncertainty(:boom) { raise Redis::CannotConnectError }.should == :boom
     end
 
     it "should return the given value if the block raises a Redis::TimeoutError" do
-      Red.new.execute_with_uncertainty(2) { raise Redis::TimeoutError }.should == 2
+      Red.new.execute_with_uncertainty(:boom) { raise Redis::TimeoutError }.should == :boom
     end
   end
 
   describe "#multi_with_caution" do
-    it "should not try call discard if the multi fails" do
-      Red.redis.stub(:multi).and_raise(Redis::TimeoutError)
-      red = Red.new
-      lambda do
-        red.multi_with_caution{}
-      end.should_not raise_error
+    context "when the multi fails" do
+      before do
+        Red.redis.stub(:multi).and_raise(Redis::TimeoutError)
+      end
+
+      it "should return the failure result given, if any" do
+        Red.new.multi_with_caution(:boom){}.should == :boom
+      end
+
+      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 not call discard" do
+        lambda do
+          Red.new.multi_with_caution{}
+        end.should_not raise_error
+      end
     end
 
-    it "should exec the transaction if the block does not raise an exception" do
-      Red.redis.should_receive(:multi)
-      Red.redis.should_receive(:exec)
-      Red.redis.should_not_receive(:discard)
-      Red.new.multi_with_caution{}
+    describe "when the block raises an exception" do
+      let(:error_class) { Class.new(RuntimeError) }
+
+      it "should return the failure result given, if any" do
+        Red.new.multi_with_caution(:boom) { raise error_class }.should == :boom
+      end
+
+      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
 
-    it "should discard the transaction if the block raises an exception" do
-      error_class = Class.new(RuntimeError)
-      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
+    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)
+          Red.redis.set('b', 1)
+        end
+        result.size.should == 2
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redness
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-03 00:00:00.000000000 Z
+date: 2012-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json