bbk-amqp 1.1.0.204853 → 1.1.1.273342

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82f3f5147bbec607ab82cc893553cfe341f55be04ccc49d4fbfacfb5bac9ef6b
-  data.tar.gz: 99aaf5d26352253c9c84b478588d8595275739c504e53d188fed59621161ef82
+  metadata.gz: 90ec5e4b546468b79eac4d67b12f2c371fd6469bd89e2a92ad12d1a11acc358e
+  data.tar.gz: c363a4a337a533af390f39de968dd622e852a3ee8378554aa23802226582d0c5
 SHA512:
-  metadata.gz: 618aac720f1b25be361a7031ea0e2df0fa94d54d3116e4c549755451d9a13a3b3dc7d7c1b46f220d0a023fa475c7540496ff70e6fcd179dbc67186ef8f916f76
-  data.tar.gz: cadd95fdd5b6ceee28579d9e40925efc47957cedb2f03c6dc949d3c0eecf60f7f3077fa882f361efae44725a67be29405687e1bfd637a4b36952eed1037ef521
+  metadata.gz: 5a174978472b0f091a7555144692c2c89f2e6ab16d3ca225597cba5dca259e4498a3f8d817af44b61af510c6427809d3fd6f65bb0576a0fa0eafd2ae47cb28b7
+  data.tar.gz: 90195f6966cead2909528e563d2f1e1140bdb284fa9ee892ff351c45780b12ce8f553d16c9b2cf63caf6029f40e4db81870dc6ba3c1d8aa88b153676e1d3e2e4

data/Gemfile

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

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    bbk-amqp (1.1.0.204853)
+    bbk-amqp (1.1.1.273342)
       activesupport (>= 6.0)
+      bbk-app (>= 1.1.1.273338)
       bbk-utils (> 1.0.1)
       bunny (>= 2.19.0)
       oj
@@ -10,12 +11,19 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.4.4)
+    activesupport (7.1.5)
+      base64
+      benchmark (>= 0.3)
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
       minitest (>= 5.1)
+      mutex_m
+      securerandom (>= 0.3)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     amq-protocol (2.3.2)
@@ -25,14 +33,17 @@ GEM
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
-    bbk-app (1.1.0.200186)
-      activesupport
+    base64 (0.2.0)
+    bbk-app (1.1.1.273338)
+      activesupport (>= 6.0)
       bbk-utils (> 1.0.1)
+      oj
       timeouter
-    bbk-utils (1.0.1.72735)
-      activesupport (~> 6.0)
+    bbk-utils (1.1.0.273317)
+      activesupport (>= 7.0)
       russian
-    bigdecimal (3.1.5)
+    benchmark (0.4.0)
+    bigdecimal (3.1.8)
     bunny (2.19.0)
       amq-protocol (~> 2.3, >= 2.3.1)
       sorted_set (~> 1, >= 1.0.2)
@@ -41,11 +52,13 @@ GEM
     byebug (11.1.3)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.3.4)
+    connection_pool (2.4.1)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
-    diff-lcs (1.5.0)
+    diff-lcs (1.5.1)
     docile (1.4.0)
+    drb (2.2.1)
     equalizer (0.0.11)
     erubis (2.7.0)
     flay (2.12.1)
@@ -57,41 +70,60 @@ GEM
       path_expander (~> 1.0)
       ruby_parser (~> 3.1, > 3.1.0)
       sexp_processor (~> 4.8)
-    i18n (1.8.11)
+    i18n (1.14.6)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     kwalify (0.7.2)
     launchy (2.5.0)
       addressable (~> 2.7)
-    minitest (5.15.0)
-    oj (3.16.3)
+    logger (1.6.1)
+    minitest (5.25.1)
+    mutex_m (0.2.0)
+    oj (3.16.7)
       bigdecimal (>= 3.0)
+      ostruct (>= 0.2)
+    ostruct (0.6.1)
+    parallel (1.26.3)
     parser (3.0.3.2)
       ast (~> 2.4.1)
     path_expander (1.1.0)
     public_suffix (4.0.6)
     rainbow (3.1.1)
     rake (13.0.6)
-    rbtree (0.4.4)
+    rbtree (0.4.6)
     reek (6.0.6)
       kwalify (~> 0.7.0)
       parser (~> 3.0.0)
       rainbow (>= 2.0, < 4.0)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    regexp_parser (2.9.2)
+    rexml (3.3.9)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.2)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.3)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.1)
     rspec_junit_formatter (0.5.1)
       rspec-core (>= 2, < 4, != 2.12.0)
+    rubocop (1.24.1)
+      parallel (~> 1.10)
+      parser (>= 3.0.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.15.1, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.15.2)
+      parser (>= 3.0.1.1)
+    ruby-progressbar (1.13.0)
     ruby_parser (3.18.1)
       sexp_processor (~> 4.16)
     rubycritic (4.6.1)
@@ -107,7 +139,8 @@ GEM
       virtus (~> 1.0)
     russian (0.6.0)
       i18n (>= 0.5.0)
-    set (1.0.3)
+    securerandom (0.3.2)
+    set (1.1.0)
     sexp_processor (4.16.0)
     simplecov (0.21.2)
       docile (~> 1.1)
@@ -127,7 +160,7 @@ GEM
     thread_safe (0.3.6)
     timeouter (0.1.3.38794)
     tty-which (0.4.2)
-    tzinfo (2.0.4)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.1.0)
     virtus (1.0.5)
@@ -135,19 +168,18 @@ GEM
       coercible (~> 1.0)
       descendants_tracker (~> 0.0, >= 0.0.3)
       equalizer (~> 0.0, >= 0.0.9)
-    zeitwerk (2.5.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bbk-amqp!
-  bbk-app (>= 1.1.0.200186)
   bunny-mock
   byebug
   rake
   rspec
   rspec_junit_formatter
+  rubocop
   rubycritic
   simplecov
   simplecov-console

data/lib/bbk/amqp/consumer.rb

@@ -102,8 +102,8 @@ module BBK
 
       # Nack incoming message
       # @param incoming [BBK::AMQP::Message] nack procesing message
-      def nack(incoming, *args, error: nil, **_kwargs)
-        rejection_policy.call(incoming, error)
+      def nack(incoming, *args, error: nil, **kwargs)
+        rejection_policy.call(incoming, error, *args, **kwargs)
       end
 
       # stop consuming messages

data/lib/bbk/amqp/message.rb

@@ -1,28 +1,25 @@
 # frozen_string_literal: true
+require 'bbk/app/dispatcher/message'
 
 module BBK
   module AMQP
     # Store information about consumed AMQP message
-    class Message
+    class Message < BBK::App::Dispatcher::Message
 
-      attr_reader :consumer, :headers, :body, :payload, :delivery_info, :properties
+      attr_reader :properties
 
       def initialize(consumer, delivery_info, properties, body)
-        @consumer = consumer
         @properties = properties.to_h.with_indifferent_access
-        @body = body
+        headers = @properties.except(:headers).merge(@properties[:headers].presence || {}).with_indifferent_access
+
         amqp_consumer = delivery_info[:consumer]
-        @delivery_info = delivery_info.to_h.merge(
+        delivery_info = delivery_info.to_h.merge(
           message_consumer: consumer,
           protocols:        consumer.protocols,
           queue:            amqp_consumer&.queue_name
         )
-        @headers = @properties.except(:headers).merge(properties[:headers].presence || {}).with_indifferent_access
-        @payload = begin
-          Oj.load(body).with_indifferent_access
-        rescue StandardError
-          {}.with_indifferent_access
-        end
+
+        super(consumer, delivery_info, headers, body)
       end
 
       def message_id
@@ -37,14 +34,6 @@ module BBK
         headers[:user_id]
       end
 
-      def ack(*args, answer: nil, **kwargs)
-        consumer.ack(self, *args, answer: answer, **kwargs)
-      end
-
-      def nack(*args, error: nil, **kwargs)
-        consumer.nack(self, *args, error: error, **kwargs)
-      end
-
       def clone
         self.class.new(consumer, delivery_info, properties, body)
       end

data/lib/bbk/amqp/rejection_policies/reject.rb

@@ -8,8 +8,8 @@ module BBK
         def initialize(logger: BBK::Utils::Logger.default)
           @logger = logger
         end
-      
-        def call(message, error)
+
+        def call(message, error, *_args, **_kwargs)
           logger.debug "Reject message #{message.headers[:type]}[#{message.headers[:message_id]}] delivery tag: #{message.delivery_info[:delivery_tag].to_i}. Error: #{error.inspect}"
           message.delivery_info[:channel].reject message.delivery_info[:delivery_tag], false
         end
@@ -17,4 +17,5 @@ module BBK
       end
     end
   end
-end
+end
+

data/lib/bbk/amqp/rejection_policies/republish.rb

@@ -12,7 +12,7 @@ module BBK
           @logger = ActiveSupport::TaggedLogging.new(logger).tagged(self.class.name)
         end
 
-        def call(message, error)
+        def call(message, error, *_args, **_kwargs)
           if message.delivery_info[:redelivered] || message.headers.key?(REPUBLISH_COUNTER_KEY)
             republish_message(message, error)
           else

data/lib/bbk/amqp/rejection_policies/requeue.rb

@@ -9,11 +9,13 @@ module BBK
           @logger = logger
         end
 
-        def call(message, error)
+        def call(message, error, *_args, **_kwargs)
           logger.debug "Requeue message #{message.headers[:type]}[#{message.headers[:message_id]}] delivery tag: #{message.delivery_info[:delivery_tag].to_i}. Error: #{error.inspect}"
           message.delivery_info[:channel].reject message.delivery_info[:delivery_tag], true
         end
+
       end
     end
   end
 end
+

data/lib/bbk/amqp/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bbk-amqp
 version: !ruby/object:Gem::Version
-  version: 1.1.0.204853
+  version: 1.1.1.273342
 platform: ruby
 authors:
 - Samoylenko Yuri
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-12 00:00:00.000000000 Z
+date: 2024-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -25,63 +25,77 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '6.0'
 - !ruby/object:Gem::Dependency
-  name: bbk-utils
+  name: bunny
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 2.19.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 2.19.0
 - !ruby/object:Gem::Dependency
-  name: bunny
+  name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.19.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.19.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: oj
+  name: bbk-app
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.1.273338
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.1.273338
 - !ruby/object:Gem::Dependency
-  name: bbk-app
+  name: bbk-utils
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: 1.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: 1.0.1
+- !ruby/object:Gem::Dependency
+  name: bunny-mock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0.200186
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0.200186
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: bunny-mock
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: byebug
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rspec_junit_formatter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,7 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec_junit_formatter
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="