kapellmeister 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4196ba8032b296bcb5c8c78afe748ea5029378ffa86bc33acaa1637f28205166
-  data.tar.gz: 674bb803ecbd64de4475ac095933872cd5708fc9165a07c3da299014e2149550
+  metadata.gz: 310275b6a62ec2d0e7d669d929ba840fc0fff1e33e1df7624dd50058e6bc2019
+  data.tar.gz: 057a8571e02b3db203e53734002f1cf4abfd8190b28e1f21df03e9c8a54374d6
 SHA512:
-  metadata.gz: d6d9e5c707598dec39cd1dc2108d65bfa66d863dda7857f9373ae68d6e5fb8f29d4409b35c478bf00850bb1e2ac0ff4de7ba286f55abf69d620404ddd2900808
-  data.tar.gz: f5fb16f1d6cd0f6a369fb0c80f7fbdc015b8102d8261436c973f5cbc28b005ad1dec19089726e492fdd5ecc5214fa97a5c7f1e62e123a2feed41a38255e33873
+  metadata.gz: b42f79eaf9e15d9e6fbba01122688f8cf81b1e45708712a714cd0e6b42e4ca9cf6a09d35e96946a28ab0e6485db499cdf2d940b9865d27019124e177efa7b5f4
+  data.tar.gz: d5063ebf038c9effbbdd3f9cb8e134619d584712402c47e1d48efa179d086469f6ed4ef0d753b0de89758b18783cc403abed388d849827221c3a1329cf8b4ddd

data/lib/kapellmeister/dispatcher.rb

@@ -24,6 +24,10 @@ class Kapellmeister::Dispatcher
     {}
   end
 
+  def query_params
+    {}
+  end
+
   def configuration
     self.class.module_parent.configuration
   end
@@ -37,10 +41,11 @@ class Kapellmeister::Dispatcher
 
     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_json, additional_headers)
+    process generated_connection.run_request(method_name.downcase.to_sym,
+                                             url_with_params(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
@@ -53,6 +58,7 @@ class Kapellmeister::Dispatcher
       faraday.request :multipart
       faraday.response :logger, logger
       faraday.response :json, content_type: 'application/json; charset=utf-8'
+      faraday.use FaradayMiddleware::FollowRedirects, limit: 5
       faraday.adapter :typhoeus do |http|
         http.timeout = 20
       end
@@ -74,10 +80,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

@@ -2,9 +2,12 @@ module Kapellmeister::RequestsExtension
   def self.request_processing
     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'
+        proc { |method:, path: nil, body: {}, query_params: {}, mock: ''|
+          if (Rails.try(:env) || ENV.fetch('APP_ENV', nil)) == 'test'
+            return ::Kapellmeister::Base.routes_scheme_parse(mock)
+          end
 
+          data = query_params.compact_blank.merge(data)
           valid_body?(data, body)
           valid_query?(data, query_params)
 
@@ -21,10 +24,15 @@ end
 
 def generate_full_path(original_path, data)
   path = generate_path(original_path, data)
-  [path, data.delete(:query_params)&.to_query].compact_blank!.join('?')
+  query = data.delete(:query_params)&.to_query
+  return "?#{query}" unless path
+
+  [path, query].compact_blank!.join('?')
 end
 
 def generate_path(original_path, data)
+  return nil unless original_path
+
   original_path.split('/').map do |part|
     next part unless part.include? '%<'
 
@@ -36,7 +44,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
@@ -44,6 +52,7 @@ end
 
 def valid_query?(data, query)
   return if query.blank?
+
   required_keys = query.keys
 
   from_data = data.slice(*required_keys)
@@ -51,8 +60,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.7.1'.freeze
+  VERSION = '0.8.0'.freeze
 end

metadata

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