kapellmeister 0.6.2 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 409792ce404710854c377a9d87c4b36e03d86b03e0370459bc6b99dfacfec516
-  data.tar.gz: 6cee24733a1acfc189bbdb34b2f3b3d28857402ba926cc77ce58f2d4be853164
+  metadata.gz: 03e830a5335e55d2acd0db7d93e54bf12e657fc0cf21cc9c5676cf90a0cddc80
+  data.tar.gz: db3fc0c80480c15e84e6a40e019b569d7a7dc1645d1eaed8a28b73ccaf8b87a3
 SHA512:
-  metadata.gz: 1d67914af1df363b0e89cfd7a71f48419da7db47350f307c7e0c251c0a4e3252446e10c1a33769e30c6bcf7c4b4f10c09d75a96608052aff68a7473e31ca74a8
-  data.tar.gz: 373bac9c6d765bfb2a0350bb21dcfff117839e76b82b7a09dd3dc7ef48c77bba8090dc311c936c9e956b5cce3b0616a5f0ed00c2a98679ac34ec93c5bacee425
+  metadata.gz: c79f2c5b731932fa74af03a1ddf08f89ed089d09104cac257d6720c9cdcccb0689ead099cf4a9a32b83b7c323434387a463b9cd9ea7a26615f7812d6bb8c6281
+  data.tar.gz: 69b47a4b15b8075a772273dc99a2a41e710859db437714b3a4e8e5963b79dacd6a7b69f59ee676e78e55c4e9e8267a774ec76093c0c593c0ce5bcc084e2697b8

data/lib/kapellmeister/dispatcher.rb

@@ -1,28 +1,21 @@
 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, :logger, to: base.module_parent
   end
 
   FailedResponse = Struct.new(:success?, :response, :payload)
 
-  def connection_by(method_name, path, data = {})
-    additional_headers = data.delete(:headers) || {}
-    requests_data = data.delete(:request) || {}
-
-    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)
-  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
@@ -31,16 +24,36 @@ class Kapellmeister::Dispatcher
     {}
   end
 
+  def query_params
+    {}
+  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,
+                                             url_with_params(path),
+                                             data_json,
+                                             additional_headers)
+
+  rescue Faraday::ConnectionFailed, Faraday::TimeoutError => e
+    failed_response(details: e.message)
+  end
+
   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
@@ -66,10 +79,23 @@ class Kapellmeister::Dispatcher
     }
   end
 
+  def path_generate(path)
+    path.query_parameters
+  end
+
   def process(data)
     report(data).result
   end
 
+  def url_with_params(url)
+    return url if query_params.blank?
+
+    uri = URI(url)
+    params = URI.decode_www_form(uri.query || '').to_h.merge(query_params)
+    uri.query = URI.encode_www_form(params)
+    uri.to_s
+  end
+
   def failed_response(**args)
     FailedResponse.new(false, { message: "#{self.class} no connection" }, { status: 555, **args })
   end

data/lib/kapellmeister/requests_extension.rb

@@ -3,24 +3,22 @@ module Kapellmeister::RequestsExtension
     proc do |name, request_data|
       define_method name do |data = {}|
         proc { |method:, path:, body: {}, query_params: {}, mock: ''|
-          return ::Kapellmeister::Base.routes_scheme_parse(mock) if (Rails.try(:env) || ENV['APP_ENV']) == 'test'
+          if (Rails.try(:env) || ENV.fetch('APP_ENV', nil)) == 'test'
+            return ::Kapellmeister::Base.routes_scheme_parse(mock)
+          end
 
           valid_body?(data, body)
           valid_query?(data, query_params)
 
           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)
@@ -40,7 +38,7 @@ def valid_body?(data, body)
   return if body.blank? || body.is_a?(Hash)
 
   schema = Object.const_get(body).schema
-  result = schema.(data)
+  result = schema.call(data)
   return data if result.success?
 
   raise ArgumentError, result.errors.to_h
@@ -48,6 +46,7 @@ end
 
 def valid_query?(data, query)
   return if query.blank?
+
   required_keys = query.keys
 
   from_data = data.slice(*required_keys)
@@ -55,8 +54,8 @@ def valid_query?(data, query)
   data[:query_params] ||= {}
   data[:query_params] = data[:query_params].to_h.merge!(from_data)
 
-  diffirent_keys = data[:query_params].transform_keys(&:to_sym)
-  return if required_keys.all? { |key| diffirent_keys.has_key? key.to_sym }
+  different_keys = data[:query_params].transform_keys(&:to_sym)
+  return if required_keys.all? { |key| different_keys.key? key.to_sym }
 
   raise ArgumentError, "Query params needs keys #{required_keys}"
 end

data/lib/kapellmeister/version.rb

@@ -1,3 +1,3 @@
 module Kapellmeister
-  VERSION = '0.6.2'.freeze
+  VERSION = '0.7.2'.freeze
 end

metadata

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