rename #take to #borrow in case a block is given

Author: lionelperrin

lib/concurrent/mvar.rb

@@ -68,14 +68,27 @@ def take(timeout = nil)
 
         # If we timed out we'll still be empty
         if unlocked_full?
-          if block_given?
-            yield @value
-          else
-            value = @value
-            @value = EMPTY
-            @empty_condition.signal
-            apply_deref_options(value)
-          end
+          value = @value
+          @value = EMPTY
+          @empty_condition.signal
+          apply_deref_options(value)
+        else
+          TIMEOUT
+        end
+      end
+    end
+
+    # acquires lock on the from an `MVAR`, yields the value to provided block,
+    # and release lock. A timeout can be set to limit the time spent blocked,
+    # in which case it returns `TIMEOUT` if the time is exceeded.
+    # @return [Object] the value returned by the block, or `TIMEOUT`
+    def borrow(timeout = nil)
+      @mutex.synchronize do
+        wait_for_full(timeout)
+
+        # if we timeoud out we'll still be empty
+        if unlocked_full?
+          yield @value
         else
           TIMEOUT
         end

spec/concurrent/mvar_spec.rb

@@ -68,35 +68,36 @@ def dereferenceable_subject(value, opts = {})
         expect(m.take(0.1)).to eq MVar::TIMEOUT
       end
 
-      context 'when a block is given' do
+    end
 
-        it 'yields current value to the block and puts back value' do
-          m = MVar.new(14)
-          expect { |b| m.take(&b) }.to yield_with_args(14)
-          expect(m.take).to eq(14)
-        end
+    describe '#borrow' do
 
-        it 'puts back value even if an exception is raised' do
-          m = MVar.new(14)
-          expect { m.take { fail 'boom!' } }.to raise_error('boom!')
-          expect(m.take).to eq(14)
-        end
+      it 'yields current value to the block and puts back value' do
+        m = MVar.new(14)
+        expect { |b| m.borrow(&b) }.to yield_with_args(14)
+        expect(m.take).to eq(14)
+      end
 
-        it 'returns the returned value of the block' do
-          m = MVar.new(14)
-          expect(m.take{2}).to eq(2)
-          expect(m.take).to eq(14)
-        end
+      it 'puts back value even if an exception is raised' do
+        m = MVar.new(14)
+        expect { m.borrow { fail 'boom!' } }.to raise_error('boom!')
+        expect(m.take).to eq(14)
+      end
 
-        it 'returns TIMEOUT on timeout on an empty MVar' do
-          m = MVar.new
-          expect(m.take(0.1){}).to eq MVar::TIMEOUT
-        end
+      it 'returns the returned value of the block' do
+        m = MVar.new(14)
+        expect(m.borrow{2}).to eq(2)
+        expect(m.take).to eq(14)
+      end
 
+      it 'returns TIMEOUT on timeout on an empty MVar' do
+        m = MVar.new
+        expect(m.borrow(0.1){}).to eq MVar::TIMEOUT
       end
 
     end
 
+
     describe '#put' do
 
       it 'sets the MVar to be empty' do