fleck 1.0.1 → 2.0.0

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: fleck
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Groza Sergiu
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-02 00:00:00.000000000 Z
+date: 2022-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: 2.2.33
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: 2.2.33
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -53,61 +53,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.9'
 - !ruby/object:Gem::Dependency
-  name: rainbow
+  name: bunny
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.14'
 - !ruby/object:Gem::Dependency
-  name: bunny
+  name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.10'
 - !ruby/object:Gem::Dependency
-  name: thread_safe
+  name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
-  name: oj
+  name: thread_safe
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: ztimer
   requirement: !ruby/object:Gem::Requirement
@@ -157,11 +157,22 @@ files:
 - lib/fleck/client/response.rb
 - lib/fleck/configuration.rb
 - lib/fleck/consumer.rb
-- lib/fleck/consumer/request.rb
-- lib/fleck/consumer/response.rb
-- lib/fleck/hash_with_indifferent_access.rb
-- lib/fleck/host_rating.rb
+- lib/fleck/core.rb
+- lib/fleck/core/consumer.rb
+- lib/fleck/core/consumer/action_param.rb
+- lib/fleck/core/consumer/actions.rb
+- lib/fleck/core/consumer/base.rb
+- lib/fleck/core/consumer/configuration.rb
+- lib/fleck/core/consumer/decorators.rb
+- lib/fleck/core/consumer/helpers_definers.rb
+- lib/fleck/core/consumer/logger.rb
+- lib/fleck/core/consumer/request.rb
+- lib/fleck/core/consumer/response.rb
+- lib/fleck/core/consumer/response_helpers.rb
+- lib/fleck/core/consumer/validation.rb
 - lib/fleck/loggable.rb
+- lib/fleck/utilities/hash_with_indifferent_access.rb
+- lib/fleck/utilities/host_rating.rb
 - lib/fleck/version.rb
 homepage: https://github.com/serioja90/fleck
 licenses:
@@ -175,14 +186,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: A Ruby gem for syncronous and asyncronous communication via Message Queue

data/lib/fleck/consumer/request.rb

@@ -1,52 +0,0 @@
-
-module Fleck
-  class Consumer::Request
-    include Fleck::Loggable
-
-    attr_reader :id, :metadata, :payload, :action, :data, :headers, :action, :version, :ip, :params, :status, :errors
-
-    def initialize(metadata, payload, delivery_info)
-      @id              = metadata.correlation_id
-      logger.progname += " #{@id}"
-
-      @metadata      = metadata
-      @payload       = payload
-      @exchange      = delivery_info.exchange.inspect
-      @queue         = delivery_info.routing_key.inspect
-      @data          = {}
-      @headers       = (@metadata.headers || {}).to_hash_with_indifferent_access
-      @action        = @metadata.type
-      @version       = nil
-      @ip            = nil
-      @params        = {}
-      @status        = 200
-      @errors        = []
-
-      parse_request!
-    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})"
-
-      @action            ||= @headers["action"]
-      @headers["action"] ||= @action
-      @version             = @headers["version"]
-      @ip                  = @headers["ip"]
-      @params              = @data["params"] || {}
-    rescue Oj::ParseError => e
-      logger.error(e.inspect + "\n" + e.backtrace.join("\n"))
-      @status = 400
-      @errors << "Bad Request"
-      @errors << e.inspect
-    rescue => e
-      logger.error(e.inspect + "\n" + e.backtrace.join("\n"))
-      @status = 500
-      @errors << "Internal Server Error"
-    end
-  end
-end

data/lib/fleck/consumer/response.rb

@@ -1,80 +0,0 @@
-
-module Fleck
-  class Consumer::Response
-    include Fleck::Loggable
-
-    attr_accessor :id, :status, :errors, :headers, :body
-
-    def initialize(request_id)
-      @id = request_id
-      logger.progname += " #{@id}"
-
-      @status     = 200
-      @errors     = []
-      @headers    = {}
-      @body       = nil
-      @rejected   = false
-      @requeue    = false
-      @deprecated = false
-    end
-
-    def reject!(requeue: false)
-      @rejected = true
-      @requeue  = requeue
-    end
-
-    def rejected?
-      return @rejected
-    end
-
-    def requeue?
-      return @requeue
-    end
-
-    def deprecated!
-      @deprecated = true
-    end
-
-    def deprecated?
-      @deprecated
-    end
-
-    def not_found(msg = nil)
-      @status = 404
-      @errors << 'Resource Not Found'
-      @errors << msg if msg
-    end
-
-    def render_error(status, msg = [])
-      @status = status.to_i
-      if msg.is_a?(Array)
-        @errors += msg
-      else
-        @errors << msg
-      end
-    end
-
-    def to_json(filter: false)
-      data = {
-        "status"     => @status,
-        "errors"     => @errors,
-        "headers"    => @headers,
-        "body"       => @body,
-        "deprecated" => @deprecated
-      }
-      data.filter! if filter
-
-      return Oj.dump(data, mode: :compat)
-    rescue => e
-      logger.error e.inspect + "\n" + e.backtrace.join("\n")
-      return Oj.dump({
-        "status" => 500,
-        "errors" => ['Internal Server Error', 'Failed to dump the response to JSON']
-      }, mode: :compat)
-    end
-
-    def to_s
-      return "#<#{self.class} #{self.to_json(filter: true)}>"
-    end
-  end
-end

data/lib/fleck/host_rating.rb

@@ -1,74 +0,0 @@
-require 'socket'
-
-module Fleck
-  class HostRating
-    include Fleck::Loggable
-
-    CONN_TIMEOUT = 5
-
-    attr_reader :host, :port, :avg, :history
-
-    def initialize(host: 'localhost', port: 5672, refresh_rate: 30000, period: 300000)
-      @host         = host
-      @port         = port
-      @refresh_rate = refresh_rate
-      @period       = period
-
-      # metrics
-      @reachable  = false
-      @avg        = 0
-      @updated_at = nil
-      @history    = []
-
-      refresh!
-      @timer = Ztimer.every(@refresh_rate){ refresh! }
-    end
-
-    def reachable?
-      @reachable
-    end
-
-    def close
-      @timer.cancel!
-    end
-
-    def <=>(other_host)
-      return 1 if !self.reachable? && other_host.reachable? # the other host is reachable, so it comes first
-      return 0  if !(self.reachable? || other_host.reachable?) # both host are unreachable, so they have the same priority
-      return -1  if self.reachable? && !other_host.reachable? # the current host comes first, because it's reachable, while the other host is unreachable
-
-      # when both hosts are reachable, use avg latency to order them
-      return self.avg <=> other_host.avg
-    end
-
-    private
-
-    def refresh!
-      # Get host info and open a new socket
-      addr = Socket.getaddrinfo(@host, nil)
-      sock_addr = Socket.pack_sockaddr_in(@port, addr[0][3])
-      socket = Socket.new(:AF_INET, :SOCK_STREAM, 0)
-      socket.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
-
-      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
-      latency = (Time.now.to_f - started_at) * 1000 # ms
-      socket.close
-
-      @history << latency
-      @history.shift if @history.size > @period / @refresh_rate
-      @avg = @history.inject(:+).to_f / @history.size
-      @reachable = true
-    rescue SocketError, Timeout::Error => e
-      socket.close if socket
-      @reachable = false
-      logger.error "Connection error: #{@host}:#{@port} (#{e.inspect})"
-    ensure
-      @updated_at = Time.now
-    end
-  end
-end