kapellmeister 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4196ba8032b296bcb5c8c78afe748ea5029378ffa86bc33acaa1637f28205166
-  data.tar.gz: 674bb803ecbd64de4475ac095933872cd5708fc9165a07c3da299014e2149550
+  metadata.gz: 03e830a5335e55d2acd0db7d93e54bf12e657fc0cf21cc9c5676cf90a0cddc80
+  data.tar.gz: db3fc0c80480c15e84e6a40e019b569d7a7dc1645d1eaed8a28b73ccaf8b87a3
 SHA512:
-  metadata.gz: d6d9e5c707598dec39cd1dc2108d65bfa66d863dda7857f9373ae68d6e5fb8f29d4409b35c478bf00850bb1e2ac0ff4de7ba286f55abf69d620404ddd2900808
-  data.tar.gz: f5fb16f1d6cd0f6a369fb0c80f7fbdc015b8102d8261436c973f5cbc28b005ad1dec19089726e492fdd5ecc5214fa97a5c7f1e62e123a2feed41a38255e33873
+  metadata.gz: c79f2c5b731932fa74af03a1ddf08f89ed089d09104cac257d6720c9cdcccb0689ead099cf4a9a32b83b7c323434387a463b9cd9ea7a26615f7812d6bb8c6281
+  data.tar.gz: 69b47a4b15b8075a772273dc99a2a41e710859db437714b3a4e8e5963b79dacd6a7b69f59ee676e78e55c4e9e8267a774ec76093c0c593c0ce5bcc084e2697b8

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
@@ -74,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,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.1'.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.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - DarkWater
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-08-13 00:00:00.000000000 Z
+date: 2022-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-schema