redstruct 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 134acc649952b4163693f10342277431de4934fa
-  data.tar.gz: 19ab242fd3c80366c0904dd4f9ef774bbebe77e7
+  metadata.gz: 2af38a102227eedaa6ed3d2f8efd91b02dcae8a0
+  data.tar.gz: 49041b97b9b1074aaac1986b792ea2ba72b7e3cc
 SHA512:
-  metadata.gz: d7750e77d99eed37f6e8f40d2b7125309b706b53b1a21034bf79211c5c50e8cb130bd392cf4d5694c8faadd51e72c0346eb89dc9276a4d30724d229987e6ea42
-  data.tar.gz: 724d70a31f5b50a59bbf7b899f3bcffc0d9204ad76b3ee2141a99e2bb6ab1dafcee2ca82d0f974f7dd702716bb41e26e3b2ed5d382e5d13e59ed7a53d5d63857
+  metadata.gz: 9f1b9391762f28ec0686ce2f5b54b756b31e6640d63c51448b26d6d8948564a55916ff78f419edcba8310bdb3b79f91ad680fe5d17ad842e14fdda2528139823
+  data.tar.gz: 0abdd88f1387ea57ef1546ef35bae91fc783c631287c412705867ebbc148c093f9d5293aa208aec6b5f1fb964f8b0feedb2f3364c9f7338a6fef3f6f26d29fa0

data/lib/redstruct/lock.rb

@@ -4,6 +4,7 @@ require 'securerandom'
 require 'redstruct/factory/object'
 require 'redstruct/utils/scriptable'
 require 'redstruct/utils/coercion'
+require 'redstruct/utils/atomic_counter'
 
 module Redstruct
   # Implementation of a simple binary lock (locked/not locked), with option to block and wait for the lock.
@@ -39,6 +40,8 @@ module Redstruct
       @resource = resource
       @token = nil
       @expiry = expiry
+      @acquired = Redstruct::Utils::AtomicCounter.new
+
       @timeout = case timeout
       when nil then nil
       when Float::INFINITY then 0
@@ -96,6 +99,8 @@ module Redstruct
       unless token.nil?
         @lease.expire(@expiry)
         @token = token
+        @acquired.increment
+
         acquired = true
       end
 
@@ -108,20 +113,24 @@ module Redstruct
     def release
       return false if @token.nil?
 
-      keys = [@lease.key, @tokens.key]
-      argv = [@token, generate_token, (@expiry.to_f * 1000).floor]
+      released = true
 
-      released = release_script(keys: keys, argv: argv)
-      @token = nil
+      if @acquired.decrement.zero?
+        keys = [@lease.key, @tokens.key]
+        argv = [@token, generate_token, (@expiry.to_f * 1000).floor]
+
+        released = coerce_bool(release_script(keys: keys, argv: argv))
+        @token = nil
+      end
 
-      return coerce_bool(released)
+      return released
     end
 
     private
 
     def non_blocking_acquire
       keys = [@lease.key, @tokens.key]
-      argv = [generate_token]
+      argv = [@token || generate_token]
 
       return acquire_script(keys: keys, argv: argv)
     end

data/lib/redstruct/utils/atomic_counter.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Redstruct
+  module Utils
+    # Very basic utility class to have thread-safe counters
+    class AtomicCounter
+      # @param [Integer] initial the initial value of the counter
+      def initialize(initial = 0)
+        @lock = Mutex.new
+        @current = initial
+      end
+
+      # Increments the counter by the given delta
+      # @param [Integer] by the delta to increment by
+      # @return [Integer] the new, incremented value
+      def increment(by: 1)
+        return @lock.synchronize do
+          @current += by.to_i
+        end
+      end
+
+      # Decrements the counter by the given delta
+      # @param [Integer] by the delta to decrement by
+      # @return [Integer] the new, decremented value
+      def decrement(by: 1)
+        return increment(by: -by.to_i)
+      end
+    end
+  end
+end

data/lib/redstruct/version.rb

@@ -2,5 +2,5 @@
 
 module Redstruct
   # Current version
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

data/test/redstruct/lock_test.rb

@@ -109,6 +109,22 @@ module Redstruct
       assert lock.acquire, 'should be to acquire the lock again since it was deleted'
     end
 
+    def test_nested
+      lock = create
+      nested = false
+
+      lock.locked do
+        lock.locked do
+          nested = true
+        end
+
+        refute_nil lock.token, 'should still own the lock'
+        assert lock.acquire, 'should still own the lock'
+      end
+
+      assert nested, 'should have turned on the nested flag'
+    end
+
     private
 
     def create(resource = nil, **options)

data/test/redstruct/script_test.rb

@@ -6,7 +6,7 @@ module Redstruct
   class ScriptTest < Redstruct::Test
     def setup
       super
-      @value = @@counter.incr
+      @value = @@counter.increment
       @code = "return #{@value}"
       @factory = create_factory
       @script = @factory.script(@code)

data/test/test_helper.rb

@@ -5,6 +5,7 @@ require 'securerandom'
 require 'bundler/setup'
 require 'minitest/autorun'
 require 'flexmock/minitest'
+require 'redstruct/utils/atomic_counter'
 
 ci_build = ENV['CI_BUILD'].to_i.positive?
 
@@ -30,37 +31,18 @@ Minitest.after_run do
   end
 end
 
-# Small class used to generate thread-safe sequence when creating per-test
-# factories
-class AtomicInteger
-  def initialize
-    @lock = Mutex.new
-    @current = 0
-  end
-
-  def incr
-    value = nil
-    @lock.synchronize do
-      value = @current
-      @current += 1
-    end
-
-    return value
-  end
-end
-
 module Redstruct
   # Base class for all Redstruct tests. Configures the gem, provides a default factory, and makes sure to clean it up
   # at the end
   class Test < Minitest::Test
-    @@counter = AtomicInteger.new # rubocop: disable Style/ClassVars
+    @@counter = Redstruct::Utils::AtomicCounter.new # rubocop: disable Style/ClassVars
 
     parallelize_me!
     make_my_diffs_pretty!
 
     # Use this helper to create a factory that the test class will keep track of and remove at the end
     def create_factory(namespace = nil)
-      namespace ||= "#{Redstruct.config.default_namespace}:#{@@counter.incr}"
+      namespace ||= "#{Redstruct.config.default_namespace}:#{@@counter.increment}"
       return Redstruct::Factory.new(namespace: namespace)
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redstruct
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Nicolas Pepin-Perreault
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-31 00:00:00.000000000 Z
+date: 2017-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -113,6 +113,7 @@ files:
 - lib/redstruct/sorted_set/slice.rb
 - lib/redstruct/string.rb
 - lib/redstruct/struct.rb
+- lib/redstruct/utils/atomic_counter.rb
 - lib/redstruct/utils/coercion.rb
 - lib/redstruct/utils/inspectable.rb
 - lib/redstruct/utils/iterable.rb