kapellmeister 0.6.1 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f654e13a403c5321d2861fc34f98026a817387d640fe5355b3b22959e420d2d3
-  data.tar.gz: 874dcd52728f29b7765a83f518530fd51df05d4d79d52e5b8202f297f90a4341
+  metadata.gz: 4196ba8032b296bcb5c8c78afe748ea5029378ffa86bc33acaa1637f28205166
+  data.tar.gz: 674bb803ecbd64de4475ac095933872cd5708fc9165a07c3da299014e2149550
 SHA512:
-  metadata.gz: '0984c82802a23c7c86c4283d59ac8461fdc5d9a49520f9b652617d7d6f7d604e934df9dbdfee214cc7c465dbc232ffc1bddd313b7f27931a1c73b33ca08f4720'
-  data.tar.gz: acc06e5fa9f0c42ef33363aed50ad23a41e8bd17d383b5d72ca33b29f61a4b402b0ee4f6a77b982148d58b13eade4f337ac3ec40944f6a070c39881e68401959
+  metadata.gz: d6d9e5c707598dec39cd1dc2108d65bfa66d863dda7857f9373ae68d6e5fb8f29d4409b35c478bf00850bb1e2ac0ff4de7ba286f55abf69d620404ddd2900808
+  data.tar.gz: f5fb16f1d6cd0f6a369fb0c80f7fbdc015b8102d8261436c973f5cbc28b005ad1dec19089726e492fdd5ecc5214fa97a5c7f1e62e123a2feed41a38255e33873

data/lib/kapellmeister/dispatcher.rb

@@ -1,42 +1,54 @@
 require 'faraday_middleware'
+require_relative './requests_extension'
 
 class Kapellmeister::Dispatcher
+  include Kapellmeister::RequestsExtension
+  delegate :request_processing, to: Kapellmeister::RequestsExtension
+
+  def initialize
+    self.class.module_parent.requests.each(&request_processing)
+  end
+
   def self.inherited(base)
     super
-    base.extend(Kapellmeister::RequestsExtension)
-
-    delegate :report, :configuration, :logger, to: base.module_parent
+    delegate :report, :logger, to: base.module_parent
   end
 
   FailedResponse = Struct.new(:success?, :response, :payload)
 
+  def headers
+    {}
+  end
+
+  def request_options
+    {}
+  end
+
+  def configuration
+    self.class.module_parent.configuration
+  end
+
+  private
+
   def connection_by(method_name, path, data = {})
     additional_headers = data.delete(:headers) || {}
     requests_data = data.delete(:request) || {}
+    data_json = data.blank? ? '' : data.to_json
 
     generated_connection = connection(additional_headers: additional_headers, requests_data: requests_data) # rubocop:disable Style/HashSyntax (for support ruby 2.4+)
 
-    process generated_connection.run_request(method_name.downcase.to_sym, path, data.to_json, additional_headers)
+    process generated_connection.run_request(method_name.downcase.to_sym, path, data_json, additional_headers)
+
   rescue NameError, RuntimeError
     raise "Library can't process method #{method_name} yet"
   rescue Faraday::ConnectionFailed, Faraday::TimeoutError => e
     failed_response(details: e.message)
   end
 
-  def headers
-    {}
-  end
-
-  def request_options
-    {}
-  end
-
-  private
-
   def connection(additional_headers:, requests_data:)
-    ::Faraday.new(url: configuration.url,
-                  headers: headers_generate(**additional_headers),
-                  request: requests_generate(**requests_data)) do |faraday|
+    @connection ||= ::Faraday.new(url: configuration.url,
+                                  headers: headers_generate(**additional_headers),
+                                  request: requests_generate(**requests_data)) do |faraday|
       faraday.request :json, content_type: 'application/json; charset=utf-8'
       faraday.request :multipart
       faraday.response :logger, logger

data/lib/kapellmeister/requests_extension.rb

@@ -10,17 +10,13 @@ module Kapellmeister::RequestsExtension
 
           full_path = generate_full_path(path, data)
 
-          new.connection_by(method, full_path, data)
+          connection_by(method, full_path, data)
         }.call(**request_data)
       end
     end
   rescue NoMethodError
     raise "You need to define #{self} class with connection_by method"
   end
-
-  def self.extended(base)
-    base.module_parent.requests.each(&request_processing)
-  end
 end
 
 def generate_full_path(original_path, data)

data/lib/kapellmeister/version.rb

@@ -1,3 +1,3 @@
 module Kapellmeister
-  VERSION = '0.6.1'.freeze
+  VERSION = '0.7.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kapellmeister
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.1
 platform: ruby
 authors:
 - DarkWater
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-05-24 00:00:00.000000000 Z
+date: 2022-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-schema