strum-esb 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec01fbb52f6e4bbf0ae78e81b2c6c0d427b6724efc6e8a93283a595a21b512de
-  data.tar.gz: 57bd11fdbbd47f201d9d962893a160df528ab94c48410904df86c938bdcafc8d
+  metadata.gz: 71859024cac83efb0fe65d36972bc59e3a36aa909b8dd01c3a048e1c302c6af2
+  data.tar.gz: 3c85a148cdd144bd1f7dab17cece39d33f2dea8ea17813a77353cf4cadbe2ecc
 SHA512:
-  metadata.gz: 97c3b7ebbe683fb790b66ac59abf913af645025a72b94cabbd5e0d8c114c8ef3c4cbd7c31b87c1c212e00f07499c807f71e2af1db8265856856693e8649cff9f
-  data.tar.gz: d7483cb8f561e2b07f11c5cc7a177af1fc9a6b9a01347b5458d76624fff02462d898ed7ec84ba61f8c6aa435814d058b7bd3e99e6dead29d336c4d97734c50ab
+  metadata.gz: d94e6c04dc46f018558bb04b1edc16108cab4199e15eaebef3c3520d3e334828150dd524c02ce8005cc8f503207af7ff19c1f6d09ca98462ca0d4889cc4897e9
+  data.tar.gz: '09c5454b9283ce7b6c4be64d804bfe8b42894fb52afae00c3296107172cbe3be1841caaed160888b9ba5c3b12d41493b76b4a9fe451d714eaf05f7f7a63fdb47'

data/.gitignore

@@ -10,6 +10,9 @@
 # rspec failure tracking
 .rspec_status
 
+.ruby-gemset
+.ruby-version
+
 # Editor directories and files
 .idea
 .vscode

data/.rubocop.yml

@@ -23,4 +23,14 @@ Style/StringLiterals:
 
 Metrics/LineLength:
   Max: 120
-  IgnoredPatterns: ['\A#']
+  AllowedPatterns: ['\A[^#].*']
+
+Gemspec/RequireMFA:
+  Enabled: false
+
+Style/Documentation:
+  Enabled: false
+
+Metrics/BlockLength:
+  Exclude:
+    - 'spec/**/*.rb'

data/Gemfile

@@ -6,9 +6,10 @@ source "https://rubygems.org"
 gemspec
 
 gem "bundler", "~> 2.1.4"
-gem "rspec", "~> 3.11.0"
-gem "rubocop", "~> 1.36.0"
-gem "rubocop-rspec", "~> 2.12.1"
+gem "rspec", "~> 3.12.0"
+gem "rubocop", "~> 1.49.0"
+gem "rubocop-rspec", "~> 2.19"
+gem "simplecov", "~> 0.22.0"
 
 gem "debase", "~> 0.2.5.beta2"
 gem "ruby-debug-ide", "~> 0.7.2"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    strum-esb (0.4.0)
+    strum-esb (0.4.1)
       bunny (~> 2.15)
       connection_pool (~> 2.2.2)
       dry-configurable (~> 0.12.1)
@@ -14,64 +14,75 @@ GEM
   specs:
     amq-protocol (2.3.2)
     ast (2.4.2)
-    bunny (2.19.0)
+    bunny (2.20.3)
       amq-protocol (~> 2.3, >= 2.3.1)
       sorted_set (~> 1, >= 1.0.2)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.2)
     connection_pool (2.2.5)
     debase (0.2.5.beta2)
       debase-ruby_core_source (>= 0.10.12)
     debase-ruby_core_source (0.10.14)
     diff-lcs (1.5.0)
+    docile (1.4.0)
     dry-configurable (0.12.1)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.5, >= 0.5.0)
-    dry-core (0.8.1)
+    dry-core (0.9.1)
       concurrent-ruby (~> 1.0)
+      zeitwerk (~> 2.6)
     dry-inflector (0.2.1)
     json (2.6.2)
     parallel (1.22.1)
-    parser (3.1.2.1)
+    parser (3.2.2.0)
       ast (~> 2.4.1)
     rainbow (3.1.1)
     rake (12.3.3)
-    rbtree (0.4.5)
-    regexp_parser (2.5.0)
+    rbtree (0.4.6)
+    regexp_parser (2.7.0)
     rexml (3.2.5)
-    rspec (3.11.0)
-      rspec-core (~> 3.11.0)
-      rspec-expectations (~> 3.11.0)
-      rspec-mocks (~> 3.11.0)
-    rspec-core (3.11.0)
-      rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.0)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.1)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.0)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.5)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.0)
-    rubocop (1.36.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
+    rubocop (1.49.0)
       json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.1.2.1)
+      parser (>= 3.2.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.20.1, < 2.0)
+      rubocop-ast (>= 1.28.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.21.0)
-      parser (>= 3.1.1.0)
-    rubocop-rspec (2.12.1)
-      rubocop (~> 1.31)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.28.0)
+      parser (>= 3.2.1.0)
+    rubocop-capybara (2.17.1)
+      rubocop (~> 1.41)
+    rubocop-rspec (2.19.0)
+      rubocop (~> 1.33)
+      rubocop-capybara (~> 2.17)
     ruby-debug-ide (0.7.3)
       rake (>= 0.8.1)
-    ruby-progressbar (1.11.0)
+    ruby-progressbar (1.13.0)
     serverengine (2.1.1)
       sigdump (~> 0.2.2)
     set (1.0.3)
     sigdump (0.2.4)
+    simplecov (0.22.0)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.4)
     sneakers (2.12.0)
       bunny (~> 2.14)
       concurrent-ruby (~> 1.0)
@@ -82,7 +93,8 @@ GEM
       rbtree
       set (~> 1.0)
     thor (1.2.1)
-    unicode-display_width (2.2.0)
+    unicode-display_width (2.4.2)
+    zeitwerk (2.6.7)
 
 PLATFORMS
   ruby
@@ -91,10 +103,11 @@ DEPENDENCIES
   bundler (~> 2.1.4)
   debase (~> 0.2.5.beta2)
   dry-inflector (~> 0.2.1)
-  rspec (~> 3.11.0)
-  rubocop (~> 1.36.0)
-  rubocop-rspec (~> 2.12.1)
+  rspec (~> 3.12.0)
+  rubocop (~> 1.49.0)
+  rubocop-rspec (~> 2.19)
   ruby-debug-ide (~> 0.7.2)
+  simplecov (~> 0.22.0)
   strum-esb!
 
 BUNDLED WITH

data/lib/strum/esb/functions.rb

@@ -18,7 +18,7 @@ module Strum
 
         def notice_explain(source)
           exchange, resource_notice = source.include?(":") ? source.split(":") : [Strum::Esb.config.notice_exchange, source]
-          resource, notice  = resource_notice.split("/")
+          resource, notice = resource_notice.split("/")
           [exchange, resource, notice]
         end
 

data/lib/strum/esb/handler.rb

@@ -138,9 +138,12 @@ module Strum
         error = nil
         method_params = method(method_name)
                         .parameters
-                        .map { |param| _, param_name = param; param_name }
+                        .map do |param|
+                          _, param_name = param
+                          param_name
+                        end
                         .then { |m| m & %I[action resource event state info pipeline pipeline_id] }
-        handler_params = method_params.each_with_object({}) { |i, res| res[i] = eval(i.to_s); }
+        handler_params = method_params.each_with_object({}) { |i, res| res[i] = eval(i.to_s) }
         logger.info("Handler #{method_name} found. Payload: #{payload}")
         handler_params.count.positive? ? send(method_name, payload, handler_params) : send(method_name, payload)
         logger.info("Handler #{method_name} executed")

data/lib/strum/esb/message.rb

@@ -4,28 +4,60 @@ module Strum
   module Esb
     # Strum Message
     class Message
+      FROZEN_EXCHANGE_OPTIONS = { durable: true }.freeze
+
       class << self
-        def publish(exchange:, headers:, payload:, **args)
-          rabbit_exchange ||= Strum::Esb.config.rabbit_channel_pool.with do |rabbit_channel|
-            rabbit_channel.headers(exchange, durable: true)
-          end
+        def publish(exchange:, headers:, payload:, exchange_options: {}, **args)
+          new(
+            exchange: exchange,
+            headers: headers,
+            payload: payload,
+            exchange_options: exchange_options,
+            **args
+          ).publish
+        end
+      end
 
-          properties = { headers: headers, content_type: args.fetch(:content_type, "application/json") }
+      attr_reader :exchange,
+                  :headers,
+                  :payload,
+                  :args,
+                  :exchange_options,
+                  :rabbit_channel
 
-          Strum::Esb.config.before_publish_hooks.each { |hook| hook.call(payload, properties) }
-          args.merge!(properties)
+      def initialize(exchange:, headers:, payload:, exchange_options: {}, **args)
+        @exchange         = exchange
+        @headers          = headers
+        @payload          = payload
+        @args             = args # { content_type: "application/x-protobuf", message_class: Messages::ActionGetUser }
+        # Sneakers::CONFIG[:exchange_options] = { type: "headers", durable: true, auto_delete: false, arguments: {} }
+        @exchange_options = Sneakers::CONFIG[:exchange_options].merge(exchange_options).merge(FROZEN_EXCHANGE_OPTIONS)
+        @rabbit_channel   = Strum::Esb.config.rabbit_channel_pool
+      end
 
-          payload, valid_payload = Strum::Esb.config.serializer.serialize(payload, args: args)
-          return unless valid_payload
+      def publish
+        rabbit_exchange = rabbit_channel.with { |rabbit_channel| rabbit_channel.headers(exchange, exchange_options) }
+        payload, valid_payload, properties = prepare_publication_options
+        return unless valid_payload
 
-          rabbit_exchange.publish(payload, **properties)
-        end
+        rabbit_exchange.publish(payload, **properties)
+      end
 
-        def extend_headers(properties)
-          properties[:headers] = {} unless properties[:headers].is_a?(Hash)
-          properties[:headers]["pipeline"] ||= Thread.current[:pipeline] if Thread.current[:pipeline]
-          properties[:headers]["pipeline-id"] ||= Thread.current[:pipeline_id] if Thread.current[:pipeline_id]
-        end
+      def prepare_publication_options
+        properties = { headers: headers, content_type: args.fetch(:content_type, "application/json") }
+
+        Strum::Esb.config.before_publish_hooks.each { |hook| hook.call(payload, properties) }
+        extend_headers(properties)
+        args.merge!(properties)
+
+        # [serialized_payload, valid, properties]
+        [*Strum::Esb.config.serializer.serialize(payload, args: args), properties]
+      end
+
+      def extend_headers(properties)
+        properties[:headers] = {} unless properties[:headers].is_a?(Hash)
+        properties[:headers]["pipeline"] ||= Thread.current[:pipeline] if Thread.current[:pipeline]
+        properties[:headers]["pipeline-id"] ||= Thread.current[:pipeline_id] if Thread.current[:pipeline_id]
       end
     end
   end

data/lib/strum/esb/serializer.rb

@@ -51,6 +51,8 @@ module Strum
         end
 
         def serialize_protobuf(payload, args: {})
+          return payload unless args.key?(:message_class)
+
           message_class = args.fetch(:message_class)
           Strum::Esb.config.serializer_conf[:to_proto].call(message_class, payload)
         end

data/lib/strum/esb/version.rb

@@ -2,6 +2,6 @@
 
 module Strum
   module Esb
-    VERSION = "0.4.0"
+    VERSION = "0.4.1"
   end
 end

data/lib/strum/esb.rb

@@ -29,12 +29,12 @@ module Strum
     setting :action_exchange, "strum.actions"
     setting :notice_exchange, "strum.notice"
     setting :rabbit_channel_pool, begin
-                                    ConnectionPool.new(size: 5, timeout: 5) do
-                                      rabbit_connection = Bunny.new
-                                      rabbit_connection.start
-                                      rabbit_connection.create_channel
-                                    end
-                                  end
+      ConnectionPool.new(size: 5, timeout: 5) do
+        rabbit_connection = Bunny.new
+        rabbit_connection.start
+        rabbit_connection.create_channel
+      end
+    end
     setting :before_fork_hooks, []
     setting :after_fork_hooks, []
     setting :before_publish_hooks, []
@@ -49,7 +49,7 @@ module Strum
                   message_class.new(payload).to_proto
                 end,
       from_proto: proc do |message_class, encoded_payload|
-                    message_class.decode(encoded_payload).to_h
+                    message_class.decode(encoded_payload)
                   end
     }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: strum-esb
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Serhiy Nazarov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-09-21 00:00:00.000000000 Z
+date: 2023-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny