upfluence-utils 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c148d5d8756d1d0eefd36e85cba488b5df5e846d
-  data.tar.gz: f6b03fef67c6c7735670556db8a3f09e6759f54f
+  metadata.gz: a61bc40a56614b16ca62ec6eeeac95a157d9e1b9
+  data.tar.gz: 7f732111b80c7bec627ab96a2a49449b66adc2c8
 SHA512:
-  metadata.gz: 18b5549fd9a5069213fe0c1276f75a17e46d5a8b6e416d2abf25b1779d3b6cca79c8088f8d8b4f841e662797431071f6d771dd620d0220b1c323ddba121b4ca3
-  data.tar.gz: 1af342090c2066769a63e774518b66cdd498196012c404e3bb8077ea38df407a8a4d0fc6ea71d0059678081015aec0d90ef0a5ab968c23a4978117d24a4b38ba
+  metadata.gz: a176fde5bd46b36baa492dbfa9f17a461e34d57bf9d3573c546242eafbe2fa5d9b620cc06b046b72f467e346d79aaa68eea247f0b9cd3a1aefa93ce8327fb596
+  data.tar.gz: 19df2c5d964303de32bdc5919707246020edf8ddb71634463cecd662f1e540325cdf663fca6c7a6e1efb19086d9dbec7c8dbccd7a22a6cc37e61115d0359e342

data/lib/upfluence/pool.rb

@@ -23,18 +23,15 @@ module Upfluence
 
     def discard(obj)
       @mutex.synchronize do
-        raise UnknownResource unless @redeemed.include? obj
-
-        @redeemed.reject! { |e| e == obj }
+        remove_from_redeemed obj
         @resource.broadcast
       end
     end
 
     def push(obj)
       @mutex.synchronize do
-        raise UnknownResource unless @redeemed.include? obj
+        remove_from_redeemed obj
 
-        @redeemed.reject! { |e| e == obj }
         @que.push obj
         @resource.broadcast
       end
@@ -46,7 +43,11 @@ module Upfluence
 
       @mutex.synchronize do
         loop do
-          return @que.pop unless @que.empty?
+          unless @que.empty?
+            object = @que.pop
+            @redeemed << object
+            object
+          end
 
           connection = try_create(options)
           return connection if connection
@@ -68,12 +69,20 @@ module Upfluence
 
     private
 
-    def try_create(_options = nil)
-      unless @redeemed.length >= @max
-        object = @create_block.call
-        @redeemed << object
-        object
+    def remove_from_redeemed(obj)
+      unless @redeemed.map(&:object_id).include? obj.object_id
+        raise UnknownResource
       end
+
+      @redeemed.reject! { |e| e.object_id == obj.object_id }
+    end
+
+    def try_create(_options = nil)
+      ureturn if  @redeemed.length >= @max
+
+      object = @create_block.call
+      @redeemed << object
+      object
     end
   end
 end

data/lib/upfluence/utils/version.rb

@@ -1,5 +1,5 @@
 module Upfluence
   module Utils
-    VERSION = '0.5.0'.freeze
+    VERSION = '0.5.1'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: upfluence-utils
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Upfluence