fleck 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10ed68bc695f23ef3d185e03f57fe4c6d5a71cb890b2f550f8c84cb445330933
-  data.tar.gz: 3dabbac45e9efa3cbc12eb5d3affa2d9a586d317df8d37d5378afd1a8c7b287f
+  metadata.gz: dca817403e895fd00e7d95e54d278f19e13f0941960b276b501d637c9330f588
+  data.tar.gz: 93e27ca7cbd491413e0fc9199c7ba259d05c2d6bef11403ee7feaf403b00453a
 SHA512:
-  metadata.gz: 791ebf6760b8a5aea71df57a8eebe386cf5bb3a5a877a7a50f6c4a4a73a0fe89b89cd06b1c09fc8a1a8b7480aab65e96f609d61f762100f866f0454607a319cd
-  data.tar.gz: '094dab3b65a3b0c9e1453a88339fb3e6d7f3955e26c888d02ea2aae75adde5033c7a879cf1d00249c6d5f03e4364d6d1f662ffa01093fa3f28592a78ab964c8c'
+  metadata.gz: b6079c6cb3bc70d79e4cc576f7e358bb1043bf996700c073147155bb7c27178836a7f23a67bf1cae51c0a4665838f440c7b39bea64104c5978eb8a9f7eef7375
+  data.tar.gz: 6d12f8ffd73af744fd61d3620fc955a310a3b78b4bbf6f06b6070dae9c43f782b1cea0c12e158284e97af8a38ad0f5e34e7d1a16bbfff74edcb09ccc75334228

data/examples/actions.rb

@@ -28,8 +28,9 @@ class MyConsumer < Fleck::Consumer
   end
 
   action 'ciao', "An action which returns 'Ciao'"
+  param :world, type: 'boolean', required: true, default: false
   def my_custom_method
-    ok! 'Ciao!'
+    ok! params[:world] ? 'Ciao, Mondo!' : 'Ciao!'
   end
 
   action :aloha
@@ -47,9 +48,9 @@ end
 actions = %i[hello ciao aloha not_an_action]
 
 SAMPLES.to_i.times do |num|
-  action = actions[(rand * actions.size).to_i]
+  action = actions.sample
   name = ['John Doe', 'Willie Wonka', 'Billie Smith'].sample
-  client.request(action: action, params: { num: num, name: name, number: rand * 100 }, timeout: 5) do |_, response|
+  client.request(action: action, params: { num: num, name: name, number: rand * 100, world: %w[yes no].sample }, timeout: 5) do |_, response|
     if response.status == 200
       Fleck.logger.info "ACTION: (#{action.inspect}) #{response.body}"
     else

data/lib/fleck/core/consumer/actions.rb

@@ -49,6 +49,7 @@ module Fleck
             action_name = request.action.to_s
             action = actions[action_name]
             unless action
+              request.log_headers_and_params!
               message = "Action #{action_name.inspect} not found!"
               not_found! error: message, body: [
                 { type: 'action', name: action_name, value: action_name, error: 'not_found', message: message }
@@ -58,12 +59,14 @@ module Fleck
             # iterate over action params and use param options to validate incoming request params.
             action[:params].each { |_, param| validate_action_param!(param) }
 
+            request.log_headers_and_params!
             send(action[:method_name])
           end
 
           def validate_action_param!(param)
             validation = param.validate(request.params[param.name])
             unless validation.valid?
+              request.log_headers_and_params!
               bad_request! error: "Invalid param value: #{param.name} = #{validation.value.inspect}",
                            body: validation.errors
             end

data/lib/fleck/core/consumer/logger.rb

@@ -67,7 +67,7 @@ module Fleck
 
           def exchange_and_queue_name
             ex_name = rmq_exchange_name.to_s == '' ? ''.inspect : rmq_exchange_name
-            "(#{ex_name.to_s.inspect}|#{exchange_type_code}|#{queue_name}) "
+            "(#{ex_name}|#{exchange_type_code}|#{queue_name}) "
           end
 
           def request_metadata

data/lib/fleck/core/consumer/request.rb

@@ -19,8 +19,8 @@ module Fleck
           @app_id        = metadata[:app_id]
           @reply_to      = @metadata.reply_to
           @payload       = payload
-          @exchange      = delivery_info.exchange.inspect
-          @queue         = delivery_info.routing_key.inspect
+          @exchange      = delivery_info.exchange
+          @queue         = delivery_info.routing_key
           @delivery_tag  = delivery_info.delivery_tag
           @data          = {}
           @headers       = (@metadata.headers || {}).to_hash_with_indifferent_access
@@ -61,13 +61,24 @@ module Fleck
           @requeue
         end
 
+        def log_headers_and_params!
+          queue_name = "(#{@exchange == '' ? @queue : "#{@queue}@#{@exchange}"})".color(:red)
+          endpoint = "/#{action} :#{@version || 'v1'}".color(:red)
+          message = "\n" \
+                    "#{ip} - #{queue_name} #{endpoint} [#{@id}]\n" \
+                    "  ~ headers ~ #{headers.inspect.color(:green)}\n" \
+                    "  @params #{params.inspect.color(:green)}"
+          logger.debug message
+        end
+
         protected
 
         def parse_request!
           @data = Oj.load(@payload, mode: :compat).to_hash_with_indifferent_access.filtered!
           @headers.merge!(@data['headers'] || {}).filtered!
 
-          logger.debug "Processing request (exchange: #{@exchange}, queue: #{@queue}, options: #{@headers}, message: #{@data})"
+          logger.debug "Request (exchange: #{@exchange.inspect}, queue: #{@queue.inspect}, " \
+                       "options: #{@headers}, message: #{@data})"
 
           @action            ||= @headers['action']
           @headers['action'] ||= @action

data/lib/fleck/version.rb

@@ -2,5 +2,5 @@
 
 # Open `Fleck` module to set `VERSION` constant.
 module Fleck
-  VERSION = '2.0.0'
+  VERSION = '2.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fleck
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Groza Sergiu
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-01-31 00:00:00.000000000 Z
+date: 2022-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler