fleck 2.0.0 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10ed68bc695f23ef3d185e03f57fe4c6d5a71cb890b2f550f8c84cb445330933
-  data.tar.gz: 3dabbac45e9efa3cbc12eb5d3affa2d9a586d317df8d37d5378afd1a8c7b287f
+  metadata.gz: 1ba4104d51ed9b8954789594108e46d754a5ebedbb281ebf03b11e4c7af762fd
+  data.tar.gz: 7a7fe6fdac9a8fc0ef6effd8ab321dbd0940b7f580a39dc2cc4132dd5f81d4c2
 SHA512:
-  metadata.gz: 791ebf6760b8a5aea71df57a8eebe386cf5bb3a5a877a7a50f6c4a4a73a0fe89b89cd06b1c09fc8a1a8b7480aab65e96f609d61f762100f866f0454607a319cd
-  data.tar.gz: '094dab3b65a3b0c9e1453a88339fb3e6d7f3955e26c888d02ea2aae75adde5033c7a879cf1d00249c6d5f03e4364d6d1f662ffa01093fa3f28592a78ab964c8c'
+  metadata.gz: b98ae1a23554c782a5d99001edf83a054ccbba794d57a6778a6322dff7e8bf21d09a5d45f797f9d0e3cb247b4cb5b495959e39976d380edcd6a61bd6a288055a
+  data.tar.gz: 603c304bb7bec0bb967fb83afe6bf0f0a27d9ff71a1ea1e3e8d80539bd7ad2ff9c2fb681418461bbde12a7d2df50bb9aa0968bc82b1e59a8e847ba7bb2b05ba4

data/examples/actions.rb

@@ -24,12 +24,13 @@ class MyConsumer < Fleck::Consumer
 
   action 'hello', "An action which returns 'Hello'"
   def hello
-    ok! 'Hello!'
+    ok! result: 'Hello', message: 'Ciao'
   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,13 +48,13 @@ 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}"
+      Fleck.logger.info "ACTION: (#{action.inspect}) #{response.body.inspect}"
     else
-      Fleck.logger.error "ACTION: (#{action.inspect}) #{response.errors.join(', ')} --- #{response.body}"
+      Fleck.logger.error "ACTION: (#{action.inspect}) #{response.errors.join(', ')} --- #{response.body.inspect}"
     end
   end
 end

data/lib/fleck/configuration.rb

@@ -4,8 +4,6 @@
 module Fleck
   # `Fleck::Configuration` implements a set of methods useful for `Fleck` clients and consumers configuration.
   class Configuration
-    autoload :HostRating, 'fleck/utilities/host_rating.rb'
-
     attr_reader :logfile, :loglevel, :progname, :hosts
     attr_accessor :default_user, :default_pass, :default_host, :default_port, :default_vhost, :default_queue,
                   :app_name, :filters

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/helpers_definers.rb

@@ -24,9 +24,10 @@ module Fleck
           end
 
           def success_method(name, code)
-            define_method(name) do |body = nil, interrupt: true|
+            define_method(name) do |*args|
+              interrupt = (args[1] ? args[1][:interrupt] : true)
               response.status = code
-              response.body = body
+              response.body = args[0]
               throw INTERRUPT_NAME if interrupt
             end
           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/utilities/host_rating.rb

@@ -64,41 +64,39 @@ module Fleck
     ensure
       @updated_at = Time.now
     end
-  end
 
-  private
+    # Use a socket to test connection latency.
+    def measure_latency
+      socket = create_socket
 
-  # Use a socket to test connection latency.
-  def measure_latency
-    socket = create_socket
+      started_at = Time.now.to_f
+      begin
+        socket.connect_nonblock(sock_addr)
+      rescue IO::WaitWritable
+        IO.select(nil, [socket], nil, CONN_TIMEOUT) or raise Timeout::Error
+      end
 
-    started_at = Time.now.to_f
-    begin
-      socket.connect_nonblock(sock_addr)
-    rescue IO::WaitWritable
-      IO.select(nil, [socket], nil, CONN_TIMEOUT) or raise Timeout::Error
+      (Time.now.to_f - started_at) * 1000 # ms
+    ensure
+      socket&.close
     end
 
-    (Time.now.to_f - started_at) * 1000 # ms
-  ensure
-    socket&.close
-  end
-
-  # Create a new socket for connection test.
-  def create_socket
-    socket = Socket.new(:AF_INET, :SOCK_STREAM, 0)
-    socket.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
+    # Create a new socket for connection test.
+    def create_socket
+      socket = Socket.new(:AF_INET, :SOCK_STREAM, 0)
+      socket.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
 
-    socket
-  end
+      socket
+    end
 
-  # Resolve domain name in order to obtain IP address to test.
-  def sock_addr
-    return @sock_addr if @sock_addr
+    # Resolve domain name in order to obtain IP address to test.
+    def sock_addr
+      return @sock_addr if @sock_addr
 
-    addr = Socket.getaddrinfo(@host, nil)
-    @sock_addr = Socket.pack_sockaddr_in(@port, addr[0][3])
+      addr = Socket.getaddrinfo(@host, nil)
+      @sock_addr = Socket.pack_sockaddr_in(@port, addr[0][3])
 
-    @sock_addr
+      @sock_addr
+    end
   end
 end

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.3'
 end

data/lib/fleck.rb

@@ -23,6 +23,7 @@ require 'fleck/utilities/hash_with_indifferent_access'
 module Fleck
   autoload :VERSION, 'fleck/version.rb'
   autoload :Loggable, 'fleck/loggable.rb'
+  autoload :HostRating, 'fleck/utilities/host_rating.rb'
   autoload :Configuration, 'fleck/configuration.rb'
   autoload :Core, 'fleck/core.rb'
   autoload :Consumer, 'fleck/consumer.rb'

metadata

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