strum-esb 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2caca6a995f15c20737aa3ea31ee69be5660b058cf4ab632740225d31797c272
-  data.tar.gz: 81d1fd921e9e610b8fe65f275200485d2476a0761e205b229c0a09f790c65da7
+  metadata.gz: 8ce4f150ec3058cd6296aadaba679e410a53b0b0f50843c0ec1d71f0c8ce5134
+  data.tar.gz: cc4a35c95f53aa9fdbc8b7b341aee355c513fab06d4af19240bb454b95d26ad9
 SHA512:
-  metadata.gz: 4391409756c8fbc6c346ce9124d72052d849846f9b88eb7f26885d1a1405b66fe21db5129a644811361c6d77a35071b3887cdcb00cce30b68ee6593ed3ea380d
-  data.tar.gz: 92b3f5be2af199ec1c803cda251667e11206c1eca20d88efdb33bdfc2a72eb5dc8c55760d767aa22be7bba5e453c631b47f087825cf6426f38043f0a3cedb38c
+  metadata.gz: 804f610986a6b13f1948a3a4fea93fb53733c0693c7301a19fb0eba8ede1ed7d05549f7d3bd4d889264f5346c48bac7299597fd1aab740e3dfe5189750cd741b
+  data.tar.gz: 38cce564ca77e76433efdda7bea1b5566712c87f3d9abfba0debe102fe2933809afd0ecf6e3c71fbe7870d99383f4fc6ca3972234e0522036829a3e20eed827b

data/CHANGELOG.md

@@ -0,0 +1,14 @@
+
+# Changelog
+All notable changes to this project will be documented in this file.
+
+## [0.1.1] - 2021-06-01
+### Added
+- `pre_publish_hooks` to configuration by [@Samuron]
+
+### Fixed
+- bindings for `notice` by [@anton.klyzhka].
+- custom handlers for resource name with `-` by [@anton.klyzhka].
+
+### Changed
+- return `chain` to header and payload for back compatibility by [@anton.klyzhka].

data/Gemfile

@@ -7,9 +7,8 @@ gemspec
 
 gem "bundler", "~> 2.1.4"
 gem "rspec", "~> 3"
-gem "rubocop", "~> 0.90.0"
+gem "rubocop", "~> 1.15"
 
 gem "debase", "~> 0.2.4"
 gem "ruby-debug-ide", "~> 0.7.2"
 
-gem "dry-configurable", "~> 0.11"

data/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    strum-esb (0.1.0)
+    strum-esb (0.1.1)
       bunny (~> 2.15)
       connection_pool (~> 2.2.2)
+      dry-configurable (~> 0.12)
       json (~> 2.3)
       sneakers (~> 2.12)
 
@@ -11,59 +12,60 @@ GEM
   remote: https://rubygems.org/
   specs:
     amq-protocol (2.3.2)
-    ast (2.4.1)
-    bunny (2.17.0)
+    ast (2.4.2)
+    bunny (2.18.0)
       amq-protocol (~> 2.3, >= 2.3.1)
-    concurrent-ruby (1.1.7)
+      sorted_set (~> 1, >= 1.0.2)
+    concurrent-ruby (1.1.8)
     connection_pool (2.2.5)
     debase (0.2.4.1)
       debase-ruby_core_source (>= 0.10.2)
-    debase-ruby_core_source (0.10.11)
+    debase-ruby_core_source (0.10.12)
     diff-lcs (1.4.4)
-    dry-configurable (0.11.6)
+    dry-configurable (0.12.1)
       concurrent-ruby (~> 1.0)
-      dry-core (~> 0.4, >= 0.4.7)
-      dry-equalizer (~> 0.2)
+      dry-core (~> 0.5, >= 0.5.0)
     dry-core (0.5.0)
       concurrent-ruby (~> 1.0)
-    dry-equalizer (0.3.0)
     json (2.5.1)
     parallel (1.20.1)
-    parser (2.7.2.0)
+    parser (3.0.1.1)
       ast (~> 2.4.1)
     rainbow (3.0.0)
     rake (12.3.3)
-    regexp_parser (2.0.0)
-    rexml (3.2.4)
+    rbtree (0.4.4)
+    regexp_parser (2.1.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.0)
+    rspec-core (3.10.1)
       rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-support (3.10.0)
-    rubocop (0.90.0)
+    rspec-support (3.10.2)
+    rubocop (1.15.0)
       parallel (~> 1.10)
-      parser (>= 2.7.1.1)
+      parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.7)
+      regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 0.3.0, < 1.0)
+      rubocop-ast (>= 1.5.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.8.0)
-      parser (>= 2.7.1.5)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.6.0)
+      parser (>= 3.0.1.1)
     ruby-debug-ide (0.7.2)
       rake (>= 0.8.1)
-    ruby-progressbar (1.10.1)
+    ruby-progressbar (1.11.0)
     serverengine (2.1.1)
       sigdump (~> 0.2.2)
+    set (1.0.1)
     sigdump (0.2.4)
     sneakers (2.12.0)
       bunny (~> 2.14)
@@ -71,8 +73,11 @@ GEM
       rake (~> 12.3)
       serverengine (~> 2.1.0)
       thor
+    sorted_set (1.0.3)
+      rbtree
+      set (~> 1.0)
     thor (1.1.0)
-    unicode-display_width (1.7.0)
+    unicode-display_width (2.0.0)
 
 PLATFORMS
   ruby
@@ -80,9 +85,8 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 2.1.4)
   debase (~> 0.2.4)
-  dry-configurable (~> 0.11)
   rspec (~> 3)
-  rubocop (~> 0.90.0)
+  rubocop (~> 1.15)
   ruby-debug-ide (~> 0.7.2)
   strum-esb!
 

data/README.md

@@ -20,7 +20,7 @@ Or install it yourself as:
 
 ## Usage
 
-####Configuration
+### Configuration
 
 Exchanges can be customized by each message type:
 ```ruby
@@ -30,7 +30,12 @@ Strum::Esb.config.action_exchange = `demo.actions`
 Strum::Esb.config.notice_exchange = `demo.notice`
 ```
 
-####Sending message:
+Pre publish hooks allow you to configure custom code that will be able to modify properties of the message that will be published or execute any arbitrary logic
+```ruby
+Strum::Esb.config.pre_publish_hooks << ->(body, properties) { properties[:correlation_id] = "hello world" }
+```
+
+### Sending message:
 
 ```ruby
 Strum::Esb::Action.call(`payload`, `action`, `resource`)
@@ -50,7 +55,7 @@ Strum::Esb::Notice.call(`payload`, `notice`)
 Strum::Esb::Notice.call(`payload`, `notice`, `resource`)
 ```
 
-#### Handling message:
+### Handling message:
 
 ```ruby
 require "strum/esb"

data/lib/strum/esb.rb

@@ -34,6 +34,7 @@ module Strum
                                   end
     setting :before_fork_hooks, []
     setting :after_fork_hooks, []
+    setting :pre_publish_hooks, []
 
     Strum::Esb.config.before_fork_hooks << proc { DB.disconnect } if defined?(DB)
 

data/lib/strum/esb/functions.rb

@@ -5,8 +5,8 @@ module Strum
     class Functions
       class << self
         def action_explain(source)
-          exchange, resource_event = source.include?(":") ? source.split(":") : [Strum::Esb.config.action_exchange, source]
-          action, resource = resource_event.split("/")
+          exchange, resource_action = source.include?(":") ? source.split(":") : [Strum::Esb.config.action_exchange, source]
+          action, resource = resource_action.split("/")
           [exchange, action, resource]
         end
 
@@ -17,7 +17,9 @@ module Strum
         end
 
         def notice_explain(source)
-          source.include?(":") ? source.split(":") : [Strum::Esb.config.notice_exchange, source]
+          exchange, resource_notice = source.include?(":") ? source.split(":") : [Strum::Esb.config.notice_exchange, source]
+          resource, notice  = resource_notice.split("/")
+          [exchange, resource, notice]
         end
 
         def info_explain(source)

data/lib/strum/esb/handler.rb

@@ -22,12 +22,13 @@ module Strum
           from_queue queue, bindings: bindings
           _, *msg = Strum::Esb::Functions.public_send("#{message_type}_explain", message_binding)
           @handlers ||= {}
-          handler_key = ([message_type] + msg).join("-")
+          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
         end
 
         def handlers
-          @handlers
+          @handlers || {}
         end
       end
 
@@ -44,6 +45,7 @@ module Strum
         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")
 
@@ -62,18 +64,18 @@ module Strum
         method_name = ([*methods_names] << "handler").find { |n| respond_to?(n, include_all: true) }
 
         unless method_name
-          logger.debug "Handler not found. Message rejected #{metadata[:headers]} with payload #{notice_data}"
+          logger.error "Handler not found. Message rejected #{metadata[:headers]} with payload #{notice_data}"
           return reject!
         end
 
         method_params = method(method_name)
                         .parameters
                         .map { |param| _, param_name = param; param_name }
-                        .then { |m| m & %I[action resource event state info] }
+                        .then { |m| m & %I[action resource event state info chain] }
         handler_params = method_params.each_with_object({}) { |i, res| res[i] = eval(i.to_s); }
-        logger.debug("Handler #{method_name} found. Payload: #{notice_data}")
+        logger.info("Handler #{method_name} found. Payload: #{notice_data}")
         handler_params.count.positive? ? send(method_name, notice_data, handler_params) : send(method_name, notice_data)
-        logger.debug("Handler #{method_name} executed")
+        logger.info("Handler #{method_name} executed")
         ack!
       rescue StandardError => e
         logger.error e

data/lib/strum/esb/message.rb

@@ -7,9 +7,24 @@ module Strum
       class << self
         def publish(exchange:, headers:, payload:)
           rabbit_exchange ||= Strum::Esb.config.rabbit_channel_pool.with { |rabbit_channel| rabbit_channel.headers(exchange, durable: true) }
-          headers["pipeline"] ||= Thread.current[:pipeline] if Thread.current[:pipeline]
-          headers["pipeline-id"] ||= Thread.current[:pipeline_id] if Thread.current[:pipeline_id]
-          rabbit_exchange.publish(payload.to_json, headers: headers, content_type: "application/json")
+          properties = {
+            headers: headers,
+            content_type: "application/json"
+          }
+
+          Strum::Esb.config.pre_publish_hooks.each do |hook| 
+            hook.call(payload, properties)
+          end
+
+          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
+          
+          rabbit_exchange.publish(payload.to_json, **properties)
         end
       end
     end

data/lib/strum/esb/version.rb

@@ -2,6 +2,6 @@
 
 module Strum
   module Esb
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

data/lib/strum/patch/sneakers/queue_patch.rb

@@ -92,13 +92,14 @@ module QueuePatch
 
   def notices_subscribes(notices, **custom_headers)
     notices.each do |_info|
-      exchange, resource = Strum::Esb::Functions.info_explain(_info)
+      exchange, resource, notice = Strum::Esb::Functions.notice_explain(_info)
       raise StandardError "notice binding format must be a `exchange:resource`" unless resource
 
       @opts[:header_bindings] << {
         exchange: exchange,
         arguments: {
-          notice: resource
+          notice: notice,
+          resource: resource
         }.merge(custom_headers)
       }
     end

data/strum-esb.gemspec

@@ -10,14 +10,14 @@ Gem::Specification.new do |spec|
 
   spec.summary       = "Publish and subscribe rabbitMQ messages"
   spec.description   = "Publish and subscribe rabbitMQ messages"
-  spec.homepage      = "https://code.qpard.com/strum/strum-esb"
+  spec.homepage      = "https://gitlab.com/strum-rb/strum-esb"
   spec.required_ruby_version = Gem::Requirement.new(">= 2.6.0")
 
   spec.metadata["allowed_push_host"] = "https://rubygems.org"
 
   spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = "https://code.qpard.com/strum/strum-esb"
-  spec.metadata["changelog_uri"] = "https://code.qpard.com/strum/strum-esb/CHANGELOG.md"
+  spec.metadata["source_code_uri"] = "https://gitlab.com/strum-rb/strum-esb"
+  spec.metadata["changelog_uri"] = "https://gitlab.com/strum-rb/strum-esb/CHANGELOG.md"
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
@@ -32,4 +32,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "connection_pool", "~> 2.2.2"
   spec.add_dependency "json", "~> 2.3"
   spec.add_dependency "sneakers", "~> 2.12"
+  spec.add_dependency "dry-configurable", "~> 0.12"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: strum-esb
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Serhiy Nazarov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-04-28 00:00:00.000000000 Z
+date: 2021-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.12'
+- !ruby/object:Gem::Dependency
+  name: dry-configurable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.12'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.12'
 description: Publish and subscribe rabbitMQ messages
 email:
 - sn@nazarov.com.ua
@@ -78,6 +92,7 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -95,13 +110,13 @@ files:
 - lib/strum/esb/version.rb
 - lib/strum/patch/sneakers/queue_patch.rb
 - strum-esb.gemspec
-homepage: https://code.qpard.com/strum/strum-esb
+homepage: https://gitlab.com/strum-rb/strum-esb
 licenses: []
 metadata:
   allowed_push_host: https://rubygems.org
-  homepage_uri: https://code.qpard.com/strum/strum-esb
-  source_code_uri: https://code.qpard.com/strum/strum-esb
-  changelog_uri: https://code.qpard.com/strum/strum-esb/CHANGELOG.md
+  homepage_uri: https://gitlab.com/strum-rb/strum-esb
+  source_code_uri: https://gitlab.com/strum-rb/strum-esb
+  changelog_uri: https://gitlab.com/strum-rb/strum-esb/CHANGELOG.md
 post_install_message: 
 rdoc_options: []
 require_paths: