bbk-amqp 1.0.0.109994 → 1.1.0.199380

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66f28db2e42bb159e20d67828581f8396cc93699d88729662b78943198e75c6e
-  data.tar.gz: 8918688acd752ddf9201e12857ff1f4b66674b8ef8fabc105ab427d8401e19f6
+  metadata.gz: b795df145f589a12ff12bb34e6f22652edfdfa4223936b5b50126102a161706e
+  data.tar.gz: 7e7bc1ae16fcf85e170d6d80eac94c49f825ae2e068a8d0852844dbf3fada0ce
 SHA512:
-  metadata.gz: dcedc95871cb1d6f51750321c4167f05b317d2edbba787f3607c03f70f9d16788b6cdb4cb50c7270af778c4233207abc8a0f800a00276116c0351d7d09102845
-  data.tar.gz: 3a732dfba76916ae52b525120093cf31b6219e356ff0db5734d3e3fac3cdde374099e4171963139d6d8242adf0f86b6d94ae7b02beb04fe98a0c302255eefd3c
+  metadata.gz: e44e7227e9d00acf3d163fd7f8c47c18582cd0874782b48ebe5a3a1401c67090e9e50aa5a297bae3485ed0ab0ce139b5cdc22fba890892e8ce4efcee838f5911
+  data.tar.gz: 7debad965b8ed99fc1a97ca029566a3230952317ba7b92c989edf7053eeb847f753c7e49b323c20703b3ea9818ded004f839a490a2cec7cf26125d43736a2848

data/Gemfile

@@ -4,4 +4,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in bbk-amqp.gemspec
 gemspec
-

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bbk-amqp (1.0.0.109994)
+    bbk-amqp (1.1.0.199380)
       activesupport (>= 6.0)
       bbk-utils (> 1.0.1)
       bunny (>= 2.19.0)
@@ -63,7 +63,7 @@ GEM
     launchy (2.5.0)
       addressable (~> 2.7)
     minitest (5.15.0)
-    oj (3.13.23)
+    oj (3.16.1)
     parser (3.0.3.2)
       ast (~> 2.4.1)
     path_expander (1.1.0)
@@ -105,7 +105,7 @@ GEM
       virtus (~> 1.0)
     russian (0.6.0)
       i18n (>= 0.5.0)
-    set (1.0.2)
+    set (1.0.3)
     sexp_processor (4.16.0)
     simplecov (0.21.2)
       docile (~> 1.1)

data/lib/bbk/amqp/consumer.rb

@@ -6,6 +6,7 @@ module BBK
     class Consumer
 
       attr_reader :connection, :queue_name, :queue, :rejection_policy, :options, :logger
+      attr_accessor :publisher
 
       DEFAULT_OPTIONS = {
         consumer_pool_size:               3,
@@ -17,10 +18,11 @@ module BBK
 
       PROTOCOLS = %w[mq amqp amqps].freeze
 
-      def initialize(connection, queue_name: nil, **options)
+      def initialize(connection, queue_name: nil, publisher: nil, **options)
         @connection = connection
         @channel = options.delete(:channel)
         @queue = options.delete(:queue)
+        @publisher = publisher
 
         if @queue.nil? && queue_name.nil?
           raise ArgumentError.new('queue_name or queue must be provided!')
@@ -79,10 +81,20 @@ module BBK
         # [] - для работы тестов. В реальности вернется объект VersionedDeliveryTag у
         #  которого to_i (вызывается внутри channel.ack) вернет фактическоe число
         # logger.debug "Ack message #{incoming.headers[:type]}[#{incoming.headers[:message_id]}] on channel: #{incoming.delivery_info[:channel]&.id}[#{incoming.delivery_info[:channel]&.object_id}] delivery tag: #{incoming.delivery_info[:delivery_tag].to_i}"
+        send_answer(incoming, answer) unless answer.nil?
         logger.debug "Ack message #{incoming.headers[:type]}[#{incoming.headers[:message_id]}]  delivery tag: #{incoming.delivery_info[:delivery_tag].to_i}"
         incoming.delivery_info[:channel].ack incoming.delivery_info[:delivery_tag]
       end
 
+      protected def send_answer(incoming, answer)
+        if publisher.nil?
+          logger.error "Can't answer message: empty publisher"
+          raise "Publisher not configured in consumer #{self.inspect}"
+        end
+        logger.debug "Send answer message for incoming(message_id=#{incoming.message_id}) to #{answer.route}"
+        publisher.publish(answer).value!
+      end
+
       # Nack incoming message
       # @param incoming [BBK::AMQP::Message] nack procesing message
       def nack(incoming, *args, error: nil, **_kwargs)

data/lib/bbk/amqp/message.rb

@@ -17,7 +17,7 @@ module BBK
           protocols:        consumer.protocols,
           queue:            amqp_consumer&.queue_name
         )
-        @headers = @properties.except(:headers).merge(properties[:headers]).with_indifferent_access
+        @headers = @properties.except(:headers).merge(properties[:headers].presence || {}).with_indifferent_access
         @payload = begin
           Oj.load(body).with_indifferent_access
         rescue StandardError

data/lib/bbk/amqp/publisher.rb

@@ -120,8 +120,7 @@ module BBK
         end
 
         def on_return(exchange, basic_return, properties, body)
-          args = { exchange: exchange, basic_return: basic_return, properties: properties,
-body: body }
+          args = { exchange: exchange, basic_return: basic_return, properties: properties, body: body }
           message_id = properties[:message_id]
           logger.info "Message with message_id #{message_id} returned #{basic_return.inspect}"
           ack_id, = ack_map.each_pair.find {|_, msg_id| msg_id == message_id }

data/lib/bbk/amqp/version.rb

@@ -3,7 +3,7 @@
 module BBK
   module AMQP
 
-    VERSION = '1.0.0'
+    VERSION = '1.1.0'
 
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bbk-amqp
 version: !ruby/object:Gem::Version
-  version: 1.0.0.109994
+  version: 1.1.0.199380
 platform: ruby
 authors:
 - Samoylenko Yuri
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-18 00:00:00.000000000 Z
+date: 2023-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -247,7 +247,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: AMQP interaction classes for BBK stack