Simplify the with/without verbage

evanphx · May 17, 2012 · e06ec87 · e06ec87
1 parent 6c38a95
commit e06ec87
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/lib/redis/client.rb b/lib/redis/client.rb
@@ -110,7 +110,7 @@ def call_loop(command)
     end
 
     def call_pipeline(pipeline)
-      without_reconnect pipeline.without_reconnect? do
+      with_reconnect pipeline.with_reconnect? do
         if pipeline.shutdown?
           begin
             pipeline.finish(call_pipelined(pipeline.commands))
@@ -226,15 +226,19 @@ def without_socket_timeout
       end
     end
 
-    def without_reconnect(val=true)
+    def with_reconnect(val=true)
       begin
-        original, @reconnect = @reconnect, !val
+        original, @reconnect = @reconnect, val
         yield
       ensure
         @reconnect = original
       end
     end
 
+    def without_reconnect(val=true, &blk)
+      with_reconnect(!val, &blk)
+    end
+
   protected
 
     def logging(commands)

diff --git a/lib/redis/pipeline.rb b/lib/redis/pipeline.rb
@@ -9,13 +9,17 @@ class Pipeline
     attr :futures
 
     def initialize
-      @without_reconnect = false
+      @with_reconnect = true
       @shutdown = false
       @futures = []
     end
 
+    def with_reconnect?
+      @with_reconnect
+    end
+
     def without_reconnect?
-      @without_reconnect
+      !@with_reconnect
     end
 
     def shutdown?
@@ -41,8 +45,13 @@ def commands
       @futures.map { |f| f._command }
     end
 
+    def with_reconnect(&block)
+      @with_reconnect = true
+      yield
+    end
+
     def without_reconnect(&block)
-      @without_reconnect = true
+      @with_reconnect = false
       yield
     end