msgr 0.14.1.1.b111 → 0.14.1.1.b112

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Nzk0OWIyMTE4NWVmM2ZhOWY3ZDA3ZDQzZTJkMTk4Zjg1ODYxODU3Mg==
+    MTg4NDhmODcwZWU2MzEzOTQ1ODllNzg5ODdiNGFjODJiOGZmMmZiMQ==
   data.tar.gz: !binary |-
-    OGZjNzQyOWNmNzg2ZjYwOTZlNzZlNTUxMmUxYTY4MmVhZmFiMWFjNA==
+    NDUwNjY3NDU5ZWQ1ZjM1ZjdkYTE0N2YwYjg4YTRjZmFhOTYyOTEzOA==
 SHA512:
   metadata.gz: !binary |-
-    N2M3N2ZkYWVkNGMxYWIyMzVjZGMwMTg0MjkyYWZlYzc0YTg4ODBiZGRhMzY2
-    YmU4NmY4M2JiMTkwOTBhMzcxMzE5YmZhODdhN2I1ODY0ZWNlYzgwYTJjYjM2
-    MzViMjAwNjFkM2Y0MGU3MzI0YzQzYjRmODlhMDk1MTI5MjlmNjY=
+    N2M3OGEyMWUwNTA5MGQyN2Q1MjkzMWRiNWIwYmVhZjIzNzk3ZmE5MGIwZGU4
+    YmQ4OTM2MGMxZjFkZmE0ZTlmNTdiNmQ4MzE5NmU1ZDgwNDdlNWEyZGU2N2U2
+    YjUwYjViZTg1MjIyOTdjY2M4Mjk5OThjN2I0MzNjZTVlMWRkYjc=
   data.tar.gz: !binary |-
-    MGIwZGI3NDA3MjYwY2FiMzRjZWE5MThiODM5YTlhNWYyOTc2OWUxM2IwNThj
-    NTAyZTY2M2IwMTJmMTRiNjI2YmRhZTY3ZDJlNjM2MGU0YWM4Yzc4OTIyYzNh
-    OGVmMDc0MDliOTMwOTU3NjFiNDFjMThmMzY0MWZkZjEwMjQ2YjQ=
+    MjY0OWNlMGQ0N2U3MjdmMWZmYWI1YTI2NGM0ZGQ0MjlhODA3ZDkyZWE3ZDNj
+    M2NjM2VmYmUzNGVmMTFjZjA1NDhjNmMzNzZiMGE5ZTJhNjBkOGFiNDZlNmI3
+    OGNhYmNiY2U1Nzk4ZTg0NDg4NDNmYjk0YmMxYTVlZTAxOGNjMzc=

data/lib/msgr/binding.rb

@@ -17,15 +17,7 @@ module Msgr
         queue.bind connection.exchange, routing_key: key
       end
 
-      @subscription = queue.subscribe(manual_ack: true) do |*args|
-        begin
-          dispatcher.call Message.new(connection, *args, route)
-        rescue => err
-          log(:error) do
-            "Rescued error from subscribe: #{err.class.name}: #{err}\n#{err.backtrace.join("\n")}"
-          end
-        end
-      end
+      subscribe
     end
 
     def release
@@ -37,8 +29,26 @@ module Msgr
       queue.delete
     end
 
-    def purge
+    def purge(release: true)
+      self.release if release
+
       queue.purge
+
+      subscribe if release
+    end
+
+    private
+
+    def subscribe
+      @subscription = queue.subscribe(manual_ack: true) do |*args|
+        begin
+          dispatcher.call Message.new(connection, *args, route)
+        rescue => err
+          log(:error) do
+            "Rescued error from subscribe: #{err.class.name}: #{err}\n#{err.backtrace.join("\n")}"
+          end
+        end
+      end
     end
   end
 end

data/lib/msgr/client.rb

@@ -71,13 +71,13 @@ module Msgr
       end
     end
 
-    def purge
+    def purge(release: false)
       mutex.synchronize do
         check_process!
 
         log(:debug) { "Purge all queues on #{uri}..." }
 
-        connection.purge
+        connection.purge(release: release)
       end
     end
 

data/lib/msgr/connection.rb

@@ -58,11 +58,11 @@ module Msgr
       bindings.each { |binding| binding.delete }
     end
 
-    def purge
+    def purge(**kwargs)
       return if bindings.empty?
       log(:debug) { "Purge bindings (#{bindings.size})..." }
 
-      bindings.each(&:purge)
+      bindings.each {|b| b.purge(**kwargs) }
     end
 
     def bindings

data/lib/msgr/test_pool.rb

@@ -1,30 +1,56 @@
 module Msgr
   class TestPool
     def initialize(*)
-      @mutex = Mutex.new
       @queue = []
+      @mutex = Mutex.new
+      @event = ConditionVariable.new
     end
 
-    def post(*args, &block)
-      @mutex.synchronize { @queue << [block, args] }
+    def post(message, &block)
+      @mutex.synchronize do
+        @queue << [block, message]
+        @event.signal
+      end
     end
 
-    def run(timeout: 5, count: 1)
-      Timeout.timeout(timeout) do
-        while count > 0
-          @mutex.synchronize do
-            if (item = @queue.pop)
-              item[0].call(*item[1])
+    def run(**kwargs)
+      @mutex.synchronize do
+        ns_run(**kwargs)
+      end
+    end
 
-              count -= 1
-            end
-          end
-        end
+    def clear
+      @mutex.synchronize do
+        @queue.clear
       end
     end
 
-    def reset
-      @queue.clear
+    alias_method :reset, :clear
+
+    private
+
+    def ns_run(count: 1, timeout: 5)
+      received = 0
+
+      while received < count
+        if (item = @queue.pop)
+          item[0].call item[1]
+          received += 1
+        else
+          start = Time.now.to_f
+
+          @event.wait(@mutex, timeout)
+
+          stop = Time.now.to_f
+          diff = stop - start
+          timeout -= diff
+
+          if timeout <= 0
+            raise TimeoutError.new \
+              "Expected to receive #{count} messages but received #{received}."
+          end
+        end
+      end
     end
 
     class << self
@@ -36,9 +62,11 @@ module Msgr
         new.run(*args)
       end
 
-      def reset
-        @instance ? @instance.reset : nil
+      def clear
+        @instance ? @instance.clear : nil
       end
+
+      alias_method :reset, :clear
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: msgr
 version: !ruby/object:Gem::Version
-  version: 0.14.1.1.b111
+  version: 0.14.1.1.b112
 platform: ruby
 authors:
 - Jan Graichen