redness 0.1.0 → 0.1.1

data/lib/redness/red.rb

@@ -26,12 +26,14 @@ class Red
   end
 
   def multi_with_caution(fail_return = [])
-    redis.multi
-    yield
-    redis.exec
-  rescue
-    redis.discard
-    fail_return
+    redis.multi rescue return
+    begin
+      yield
+      redis.exec
+    rescue
+      redis.discard
+      fail_return
+    end
   end
 
   def method_missing(method, *args)

data/lib/redness/version.rb

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

data/spec/redness/red_spec.rb

@@ -0,0 +1,31 @@
+require_relative '../spec_integration_helper'
+
+describe Red do
+  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
+    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{}
+    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
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redness
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -148,6 +148,7 @@ files:
 - spec/redness/red_set_multi_spec.rb
 - spec/redness/red_set_spec.rb
 - spec/redness/red_set_union_spec.rb
+- spec/redness/red_spec.rb
 - spec/redness/timed_red_set_spec.rb
 - spec/spec_integration_helper.rb
 homepage: http://github.com/howaboutwe/redness