redlock_for_collection 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4937ef3a7fc3cc932e53c070779e4111f570003c
-  data.tar.gz: ea8133464f2c73a36ca2688676908ece989dfc06
+  metadata.gz: c1eea1d62a00244a155a4d9f7502ade102188875
+  data.tar.gz: 651af54cd59d0a4ad7a706e4e8ef99153ea70972
 SHA512:
-  metadata.gz: 64e5152770347cf2cbcfa4f74f0b60e6c882b74bf9239bd5b0da689dbbfddad25e3efb9275f5c9b5079d1da74e60e73ba0b509b3edc0d078cdc588187a8c6f06
-  data.tar.gz: 16afb06e26f1f7c7dc85e3ba0850fc3183feb42eaa744d1492596e1c981402733e7463c8b769dbc101458f325f57748691df4a5c35017585ef0ee4652bc072fe
+  metadata.gz: fe231c2d1455388728ce33968a4dee6d1f67cb9a7a7fc53e1fc3d51a9fbb07ac9b1c968fc6c16a0cdba46e9b61ed1f9aa139494b89ee49d830a388c5b33f878b
+  data.tar.gz: 52af4480ba1074f2ae4f44e9ea9720aead773628216dcb769dc29e5c193d75ec532892d62be5ac4b8b045c3be95061eba34d640a1bf0963f3fc38b1357ddf25c

data/lib/redlock_for_collection/collection.rb

@@ -5,82 +5,66 @@ module RedlockForCollection
     DEFAULT_KEY_METHOD = 'key'.freeze
     DEFAULT_KEY_PREFIX = 'prefix'.freeze
 
-    LockPair = Struct.new(:object, :lock_info, :status)
+    attr_reader :objects, :options, :redlock_pool
 
-    attr_reader :objects, :options, :pool
-
-    def initialize(objects, options, pool)
+    def initialize(objects, options, redlock_pool)
       @objects = objects
       @options = options
-      @pool    = pool
+      @redlock_pool = redlock_pool
+
+      set_default_options
+    end
 
-      init_options
+    def set_default_options
+      @options[:key_prefix]   ||= DEFAULT_KEY_PREFIX
+      @options[:key_method]   ||= DEFAULT_KEY_METHOD
+      @options[:min_validity] ||= DEFAULT_MIN_VALIDITY
+      @options[:ttl]          ||= DEFAULT_TTL
     end
 
     def lock(&block)
-      lock_pairs = []
+      locked_objects = []
 
-      start_time = (Time.now.to_f * 1000).to_i
+      start_time = time_now
       @objects.each do |object|
-        @pool.with do |redlock|
-          lock_info = redlock.lock(build_key_for(object), @options[:ttl])
-          lock_pairs << LockPair.new(object, lock_info)
-        end
+        locked_object = LockedObject.new(object, @options , @redlock_pool)
+        locked_object.lock
+
+        locked_objects << locked_object
       end
-      end_time = (Time.now.to_f * 1000).to_i
+      end_time = time_now
 
-      separated_pairs = separate_expired_pairs(lock_pairs, end_time - start_time)
+      separated_expired_objects = separate_expired_objects(locked_objects, end_time - start_time)
 
       begin
-        separated_pairs[:valid].map(&:object)
-        separated_pairs[:expired].map(&:object)
-        block.yield(separated_pairs[:valid].map(&:object), separated_pairs[:expired].map(&:object))
+        block.yield(separated_expired_objects[:valid].map(&:object), separated_expired_objects[:expired].map(&:object))
       ensure
-        # Release the all acquired locks
-        unlock(lock_pairs)
+        locked_objects.each { |locked_object| locked_object.unlock }
       end
     end
 
     protected
 
-    def init_options
-      @options[:key_prefix]   ||= DEFAULT_KEY_PREFIX
-      @options[:key_method]   ||= DEFAULT_KEY_METHOD
-      @options[:min_validity] ||= DEFAULT_MIN_VALIDITY
-      @options[:ttl]          ||= DEFAULT_TTL
-    end
-
-    # @param lock_pairs [Array<LockPair>]
-    def unlock(lock_pairs)
-      @pool.with do |redlock|
-        lock_pairs.each do |lock_pair|
-          redlock.unlock(lock_pair.lock_info) if lock_pair.lock_info
-        end
-      end
+    def time_now
+      (Time.now.to_f * 1000).to_i
     end
 
-    def build_key_for(object)
-      (@options[:key_prefix]) + object.send(@options[:key_method]).to_s
-    end
-
-    # @param lock_pairs [Array<LockPair>]
+    # @param locked_objects [Array<LockedObject>]
     # @param elapsed [Integer]
     # @return [Hash]
-    def separate_expired_pairs(lock_pairs, elapsed)
-      expired_pairs = []
-      valid_pairs   = []
-
-      lock_pairs.each do |lock_pair|
-        if lock_pair.lock_info && ((lock_pair.lock_info[:validity] - elapsed) > (@options[:min_validity]))
-          lock_pair.status = :valid
-          valid_pairs << lock_pair
+    def separate_expired_objects(locked_objects, elapsed)
+      expired_locked_objects = []
+      valid_locked_objects   = []
+
+      locked_objects.each do |locked_object|
+        if locked_object.valid?(elapsed)
+         valid_locked_objects << locked_object
         else
-          lock_pair.status= :expired
-          expired_pairs <<  lock_pair
+          expired_locked_objects << locked_object
         end
       end
 
-      { valid: valid_pairs, expired: expired_pairs }
+      { valid: valid_locked_objects, expired: expired_locked_objects }
     end
 
   end

data/lib/redlock_for_collection/locked_object.rb

@@ -0,0 +1,44 @@
+module RedlockForCollection
+  class LockedObject
+    attr_reader :object,
+                :lock_info,
+                :redlock_pool,
+                :key
+
+    def initialize(object, options, redlock_pool)
+      @object       = object
+      @options      = options
+      @redlock_pool = redlock_pool
+      build_key
+    end
+
+    def lock
+      @redlock_pool.with do |redlock|
+        @lock_info = redlock.lock(@key, @options[:ttl])
+      end
+    end
+
+    def unlock
+      if @lock_info
+        @redlock_pool.with do |redlock|
+          redlock.unlock(@lock_info)
+        end
+      end
+    end
+
+    def expired?(elapsed_time)
+      !valid?(elapsed_time)
+    end
+
+    def valid?(elapsed_time)
+       @lock_info && ((@lock_info[:validity] - elapsed_time) > (@options[:min_validity]))
+    end
+
+    private
+
+    def build_key
+      @key = (@options[:key_prefix]) + @object.send(@options[:key_method]).to_s
+    end
+
+  end
+end

data/lib/redlock_for_collection/version.rb

@@ -1,3 +1,3 @@
 module RedlockForCollection
-  VERSION = '0.1.2'.freeze
+  VERSION = '0.1.3'.freeze
 end

data/lib/redlock_for_collection.rb

@@ -1,6 +1,7 @@
-require_relative 'redlock_for_collection/version'
-require_relative 'redlock_for_collection/configuration'
-require_relative 'redlock_for_collection/collection'
+require 'redlock_for_collection/version'
+require 'redlock_for_collection/configuration'
+require 'redlock_for_collection/locked_object'
+require 'redlock_for_collection/collection'
 
 module RedlockForCollection
   class Manager

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redlock_for_collection
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - CoolElvis
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-28 00:00:00.000000000 Z
+date: 2016-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -87,6 +87,7 @@ files:
 - lib/redlock_for_collection.rb
 - lib/redlock_for_collection/collection.rb
 - lib/redlock_for_collection/configuration.rb
+- lib/redlock_for_collection/locked_object.rb
 - lib/redlock_for_collection/version.rb
 - redlock_for_collection.gemspec
 homepage: https://github.com/CoolElvis/redlock_for_collection