strum-esb 0.3.0 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 115db6eaed48ee3c437b15fbf8103815214a5cdcc4d0d040960fc6ad73708190
-  data.tar.gz: dd0f567ec63c61781272ea0931a7348be7df38de6661b5d9da77ccf55e17855d
+  metadata.gz: 5eed53438b480b0f9f2faae4b2662dfb7005441bd74f62b15986d4eefeefbe7e
+  data.tar.gz: c8f52bbfc3955ca0735d1536e99fc07238ef6a823b84e602a242fad9b690646c
 SHA512:
-  metadata.gz: 3275b5108de6e8f5ac0bf8413d8fb53e0939855c9621fb1ac054b5ae9ecc693ff368a5d55d5e794956f75f038ba106eb4c3452c377b273eda7e064f713b6b605
-  data.tar.gz: 679fc2e04636143bbfcceb7fba20cb79972475313ed2731977035b1ceb21ca981d77247b03fc668c92d3e809894edeae16e5b74f92afbde55b2d21a77f287c4d
+  metadata.gz: c4eb4852df47c231e43218243178582e860f3dc553b06f5f8f32165b27c4a7d2448f01ac690b59617b4e724927db4224b9311791df77a8aff3a70ada43b3f9a0
+  data.tar.gz: c0a6ce6875f528459031905df09bdcccc1cc1fa34e6ed6eecfa5863647b8d711b38879f8c13afb1ff915c7ce642a92637bfc7bc559df40921cd30761baab2c53

data/CHANGELOG.md

@@ -2,6 +2,21 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [0.3.3]
+### Added
+  - default content type `application/json` in handler by [@valeriia.kolisnyk]
+
+## [0.3.2]
+### Added
+  - autoremove thread variables before handle message (used by pipeline storage)
+
+## [0.3.1]
+### Removed
+  - removed `chain` support
+### Added
+  - `bind_to` can take block for custom bindings
+  - `pipeline` and `pipeline_id` can be used as handler params
+
 ## [0.3.0] - 2022-03-14
 ### Added
 - `content_type` option to send message by [@valeriia.kolisnyk]

data/Gemfile

@@ -10,7 +10,7 @@ gem "rspec", "~> 3"
 gem "rubocop", "~> 1.15"
 gem "rubocop-rspec", "~> 2.3.0"
 
-gem "debase", "~> 0.2.4"
+gem "debase", "~> 0.2.5.beta2"
 gem "ruby-debug-ide", "~> 0.7.2"
 
 gem "dry-inflector", "~> 0.2.1"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    strum-esb (0.3.0)
+    strum-esb (0.3.3)
       bunny (~> 2.15)
       connection_pool (~> 2.2.2)
       dry-configurable (~> 0.12.1)
@@ -17,55 +17,55 @@ GEM
     bunny (2.19.0)
       amq-protocol (~> 2.3, >= 2.3.1)
       sorted_set (~> 1, >= 1.0.2)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)
     connection_pool (2.2.5)
-    debase (0.2.4.1)
-      debase-ruby_core_source (>= 0.10.2)
-    debase-ruby_core_source (0.10.12)
-    diff-lcs (1.4.4)
+    debase (0.2.5.beta2)
+      debase-ruby_core_source (>= 0.10.12)
+    debase-ruby_core_source (0.10.14)
+    diff-lcs (1.5.0)
     dry-configurable (0.12.1)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.5, >= 0.5.0)
     dry-core (0.7.1)
       concurrent-ruby (~> 1.0)
     dry-inflector (0.2.1)
-    json (2.6.1)
-    parallel (1.20.1)
-    parser (3.0.1.1)
+    json (2.6.2)
+    parallel (1.22.1)
+    parser (3.1.1.0)
       ast (~> 2.4.1)
-    rainbow (3.0.0)
+    rainbow (3.1.1)
     rake (12.3.3)
     rbtree (0.4.5)
-    regexp_parser (2.1.1)
+    regexp_parser (2.2.1)
     rexml (3.2.5)
-    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)
+    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)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
-    rubocop (1.15.0)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
+    rubocop (1.26.1)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.5.0, < 2.0)
+      rubocop-ast (>= 1.16.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.6.0)
-      parser (>= 3.0.1.1)
+    rubocop-ast (1.16.0)
+      parser (>= 3.1.1.0)
     rubocop-rspec (2.3.0)
       rubocop (~> 1.0)
       rubocop-ast (>= 1.1.0)
-    ruby-debug-ide (0.7.2)
+    ruby-debug-ide (0.7.3)
       rake (>= 0.8.1)
     ruby-progressbar (1.11.0)
     serverengine (2.1.1)
@@ -82,14 +82,14 @@ GEM
       rbtree
       set (~> 1.0)
     thor (1.2.1)
-    unicode-display_width (2.0.0)
+    unicode-display_width (2.1.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler (~> 2.1.4)
-  debase (~> 0.2.4)
+  debase (~> 0.2.5.beta2)
   dry-inflector (~> 0.2.1)
   rspec (~> 3)
   rubocop (~> 1.15)

data/lib/strum/esb/handler.rb

@@ -17,18 +17,26 @@ module Strum
       module ClassMethods
         def bind_to(queue, message_type, message_binding, handler = nil)
           bindings ||= (queue_opts && queue_opts[:bindings]) || {}
-          bindings[message_type] ||= []
-          bindings[message_type] << message_binding
+
+          if block_given?
+            yield(bindings)
+          else
+            bindings[message_type] ||= []
+            bindings[message_type] << message_binding  
+          end
+
           from_queue queue, bindings: bindings
+          handlers[handler_key(message_type, message_binding)] = handler.to_s if handler          
+        end
+
+        def handler_key(message_type, message_binding)
           _, *msg = Strum::Esb::Functions.public_send("#{message_type}_explain", message_binding)
-          @handlers ||= {}
           params = msg.map{ |param| param&.to_s.gsub(/[^a-zA-Z0-9]/, "_")&.downcase }
-          handler_key = ([message_type] + params).join("-")
-          @handlers[handler_key] = handler.to_s if handler
+          ([message_type] + params).join("-")
         end
 
         def handlers
-          @handlers || {}
+          @handlers ||= {}
         end
 
         def protobuf_service(service)
@@ -40,24 +48,23 @@ module Strum
         end
       end
 
+      def header(metadata, key)
+        (metadata[:headers] && metadata[:headers][key])&.to_s&.gsub(/[^a-zA-Z0-9]/, "_")&.downcase
+      end
+
       def work_with_params(deserialized_msg, delivery_info, metadata)
         Strum::Esb.config.before_handler_hooks.each { |hook| hook.call(deserialized_msg, delivery_info, metadata) }
 
-        snake_case_modify = ->(string) { string.nil? ? nil : string&.to_s.gsub(/[^a-zA-Z0-9]/, "_")&.downcase }
-        parse_header = ->(string) { metadata[:headers] && metadata[:headers][string] }
-        header = parse_header >> snake_case_modify
-
-        action = header.call("action")
-        resource = header.call("resource")
-        event = header.call("event")
-        state = header.call("state")
-        info = header.call("info")
-        notice = header.call("notice")
-        Thread.current[:chain] = header.call("chain")
-        Thread.current[:pipeline] = header.call("pipeline")
-        Thread.current[:pipeline_id] = header.call("pipeline-id")
+        action = header(metadata, "action")
+        resource = header(metadata, "resource")
+        event = header(metadata, "event")
+        state = header(metadata, "state")
+        info = header(metadata, "info")
+        notice = header(metadata, "notice")
+        pipeline = Thread.current[:pipeline] = header(metadata, "pipeline")
+        pipeline_id = Thread.current[:pipeline_id] = header(metadata, "pipeline-id")
 
-        after_headers_hook
+        after_headers_hook(binding)
 
         methods_names = if action
                           action_handler_methods(action, resource)
@@ -71,20 +78,22 @@ module Strum
 
         method_name = ([*methods_names] << "handler").find { |n| respond_to?(n, include_all: true) }
 
-        unless Strum::Esb.config.serializer.enabled?(metadata[:content_type])
-          logger.error "Content type #{metadata[:content_type]} is disabled by handler. Message rejected #{metadata[:headers]} with payload #{deserialized_msg}"
+        unless method_name
+          logger.error "Handler not found. Message rejected #{metadata[:headers]} with payload #{deserialized_msg}"
           return reject!
         end
 
-        payload, valid_payload = Strum::Esb.config.serializer.deserialize(deserialized_msg, metadata[:content_type], method_name)
+        content_type = metadata[:content_type] || "application/json"
 
-        unless valid_payload
-          logger.error "Content type is invalid. Message rejected #{metadata[:headers]} with payload #{payload}"
+        unless Strum::Esb.config.serializer.enabled?(content_type)
+          logger.error "Content type #{content_type} is disabled by handler. Message rejected #{metadata[:headers]} with payload #{deserialized_msg}"
           return reject!
         end
 
-        unless method_name
-          logger.error "Handler not found. Message rejected #{metadata[:headers]} with payload #{payload}"
+        payload, valid_payload = Strum::Esb.config.serializer.deserialize(deserialized_msg, content_type, method_name)
+
+        unless valid_payload
+          logger.error "Payload was unable to be parsed with #{content_type} content type. Message rejected #{metadata[:headers]} with payload #{payload}"
           return reject!
         end
 
@@ -92,7 +101,7 @@ module Strum
         method_params = method(method_name)
                         .parameters
                         .map { |param| _, param_name = param; param_name }
-                        .then { |m| m & %I[action resource event state info chain] }
+                        .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); }
         logger.info("Handler #{method_name} found. Payload: #{payload}")
         handler_params.count.positive? ? send(method_name, payload, handler_params) : send(method_name, payload)
@@ -106,7 +115,7 @@ module Strum
         Strum::Esb.config.after_handler_hooks.each { |hook| hook.call(deserialized_msg, delivery_info, metadata, payload, error) }
       end
 
-      def after_headers_hook; end
+      def after_headers_hook(bind); end
 
       private
 
@@ -144,7 +153,7 @@ module Strum
           result << "notice_#{notice}"
           result << "notice_handler"
           result
-        end
+        end        
     end
   end
 end

data/lib/strum/esb/message.rb

@@ -17,10 +17,6 @@ module Strum
           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]
-          if (chain = Thread.current[:chain])
-            payload["chain"] ||= chain
-            headers["chain"] ||= chain
-          end
 
           payload, valid_payload = Strum::Esb.config.serializer.serialize(payload, properties[:content_type])
           unless valid_payload

data/lib/strum/esb/version.rb

@@ -2,6 +2,6 @@
 
 module Strum
   module Esb
-    VERSION = "0.3.0"
+    VERSION = "0.3.3"
   end
 end

data/lib/strum/esb.rb

@@ -51,6 +51,18 @@ module Strum
 
     class Error < StandardError; end
 
+    class ThreadVariablesCleaner
+      def initialize(app, *args)
+        @app = app
+        @args = args
+      end
+    
+      def call(deserialized_msg, delivery_info, metadata, handler)
+        Thread.current.keys.each{ |key| Thread.current[key] = nil }
+        @app.call(deserialized_msg, delivery_info, metadata, handler)
+      end
+    end    
+
     Sneakers.configure(
       log: $stdout,
       workers: Strum::Esb.config.sneakers_workers,
@@ -61,6 +73,7 @@ module Strum
       exchange: Strum::Esb.config.exchange,
       exchange_type: "headers"
     )
+    Sneakers.middleware.use(ThreadVariablesCleaner, nil)
     Sneakers.logger.level = Logger::INFO
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: strum-esb
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.3
 platform: ruby
 authors:
 - Serhiy Nazarov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-03-17 00:00:00.000000000 Z
+date: 2022-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny