kapellmeister 0.7.0 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 923b108fbce0c08cee2eb79bf46fb2741a61d1e833f1ffc01fcad0d18bbae972
-  data.tar.gz: 2dc7915c615149b8a7c5c1ff8a84960e212ffba27e65f2a29f45fd3b6ed174f8
+  metadata.gz: c63a59e324e6fd25a43b163b8db3a826b617cff0101f4cb001f1825f7fc9fc06
+  data.tar.gz: 38a102e6272a99813bf78181e7aa7aded4e3ab22864059c3582f0297d0263884
 SHA512:
-  metadata.gz: 4011c6602baf6895abcb1ec4468dcdcd27ea987a56e5a4c4d6395f8ed523f020771b07e785bdfbbf2477696b31c4b5045c11042344548b3727fc1cc374918fdd
-  data.tar.gz: 3c4df81ba7e805659df36374c384e52f788d1d4a4309fac1b5da09eea099d5a9c6d26a3d58088e73c4ea0aa431cba8a93154aee9c65d8b7bfc091adca12ce62a
+  metadata.gz: d05effbadfaba1923440b05ca4875d501a5fe281899b34c0c6fea5998e260159286d72f17800cea730b36fdff72c80409f3ce6d6059a504de6fb0fa92b990ddf
+  data.tar.gz: 2be64d2e49d7f78b51075a6477020bad5441f8edeb20e5ecc0ccdab8bf5cc9ee8978b11cf01efb6d0945e89db40cc39f828ff678b65424e27744abf3326d0794

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
@@ -33,12 +37,15 @@ class Kapellmeister::Dispatcher
   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)
-  rescue NameError, RuntimeError
-    raise "Library can't process method #{method_name} yet"
+    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
@@ -51,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
@@ -72,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

@@ -3,7 +3,9 @@ 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)
@@ -36,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
@@ -44,6 +46,7 @@ end
 
 def valid_query?(data, query)
   return if query.blank?
+
   required_keys = query.keys
 
   from_data = data.slice(*required_keys)
@@ -51,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.7.0'.freeze
+  VERSION = '0.7.3'.freeze
 end

metadata

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