bunny_burrow 1.5.2 → 1.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9f59ed06d792f9c5984ca3e621c6a734063b1ac
-  data.tar.gz: f750e7145b8074d481700d9a3f9358c34708363d
+  metadata.gz: 673a05f44f658570ba0b421d5e4592e4a6d8da47
+  data.tar.gz: aaa51e1e5a7c94e35e6812330092909fed493e06
 SHA512:
-  metadata.gz: f1f51879842df68648545a61638772bbe0a2f0eae0fe051cfa424a7e4f64b7e60f4b73303e4d0100059617a63ca4074f64e241fe3085154744c9758c0a987af5
-  data.tar.gz: 285d7516c3b13b0bff10dbfa91a2e2f5caf8e211cad92d788dd71b5748614b444391b186536e2a0259c35568501c9400acc0353b1ae56a2bcc184fcc3c8eb531
+  metadata.gz: 63c9fcb9eef80edb283b5be5a4b36f5e458276253b7a559da917864ebacda8de109a2f2e5b1196f0bb375e33384cdf988e37c4563160193ab70ce070488668f5
+  data.tar.gz: 542907ae1679ceee6196028f9c49fff90def448f76eaa368a8fb0babfc4b9fd1f5450e319640f79300cacb88f013f63a759a9a5f4a4e6ead1d021c406b708830

data/lib/bunny_burrow/client.rb

@@ -1,44 +1,54 @@
 require_relative 'base'
+require 'securerandom'
 
 module BunnyBurrow
   class Client < Base
+
+    DIRECT_REPLY_TO = 'amq.rabbitmq.reply-to'
+
+
     def publish(payload, routing_key)
       result = nil
 
-      # when creating a queue, a blank name indicates we want the AMPQ broker
-      # to generate a unique name for us. Also note that this queue will be on
-      # the default exchange
-      reply_to = channel.queue('', exclusive: true, auto_delete: true)
-
       details = {
         routing_key: routing_key,
-        reply_to: reply_to
+        reply_to: DIRECT_REPLY_TO
       }
+
       details[:request] = payload if log_request?
       log "Publishing #{details}"
 
       options = {
         routing_key: routing_key,
-        reply_to: reply_to.name,
+        reply_to: DIRECT_REPLY_TO,
         persistence: false
       }
 
-      topic_exchange.publish(payload.to_json, options)
+      consumer = Bunny::Consumer.new(channel, DIRECT_REPLY_TO, SecureRandom.uuid)
+      consumer.on_delivery do |_, _, received_payload|
+        result = handle_delivery(details, received_payload)
+      end
 
-      Timeout.timeout(timeout) do
-        reply_to.subscribe do |_, _, payload|
-          details[:response] = payload if log_response?
-          log "Receiving #{details}"
-          result = payload
-          lock.synchronize { condition.signal }
-        end
 
-        lock.synchronize { condition.wait(lock) }
+      begin
+        channel.basic_consume_with consumer
+        topic_exchange.publish(payload.to_json, options)
+
+        Timeout.timeout(timeout) do
+          lock.synchronize {condition.wait(lock)}
+        end
+      ensure
+        consumer.cancel
       end
+      result
+    end
 
-       result
-    ensure
-      reply_to.delete if reply_to
+    def handle_delivery(details, payload)
+      details[:response] = payload if log_response?
+      log "Receiving #{details}"
+      result = payload
+      lock.synchronize {condition.signal}
+      result
     end
   end
 end

data/lib/bunny_burrow/version.rb

@@ -1,3 +1,3 @@
 module BunnyBurrow
-  VERSION = '1.5.2'
+  VERSION = '1.5.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bunny_burrow
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.5
 platform: ruby
 authors:
 - Vericity
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-19 00:00:00.000000000 Z
+date: 2017-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler