kapellmeister 0.9.3 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32e1209ce6cc479533048192e649ec0834e00dd32c2f259d5fa5ce9c57742b64
-  data.tar.gz: 4658216be2508dc3cb6821e8768083a44d6854845c7de7f08aa18b1bd5771418
+  metadata.gz: 93fe2a387a68b2a5faf9b507a8cc7e8ce1f43623e6b65e2fa62823acb7ac6f2f
+  data.tar.gz: cdc95e84692e828f107c82c0b6ea1b403dbe49b514cc64a6a7eae3e8486cd2d8
 SHA512:
-  metadata.gz: 60a588209e3cb1de365500385d4196b23760f448fd27107f6da65d144b611a58fbb7b355011590b606c172dfdf7bff9754d4557a1e53183ab63c9da40b5eaa0e
-  data.tar.gz: 5f579c8ed56808d489f7ffbae8b8fda9556796145b640e2f2f5f196dabcde2e29c2265c6f99313fe789a7c7491017506207154805945ac8ab80ce41226806fa6
+  metadata.gz: b8b0496064d754c153b15502c47815bd54684616acdb8da9367e4dd06b493d84ed78a449cfe69e312cf91c4d923ebd49c9e79bb3f8ade21137d9c8948496aec4
+  data.tar.gz: 444d6951d7c13ea2c2fe5c71ce0662bfb632e45802aee5fcbc94c776f2c507e4db0d505cfe539733939695ca3265ee796d203d50d020985294e2dfe1795dbbfe

data/lib/kapellmeister/dispatcher.rb

@@ -91,6 +91,10 @@ class Kapellmeister::Dispatcher
   end
 
   def url_with_params(url)
+    url = url.split('/').map do |url_part|
+      url_part.ascii_only? ? url_part : CGI.escape(url_part)
+    end.join('/')
+
     return url if query_params.blank?
 
     uri = URI(url)

data/lib/kapellmeister/requests_extension.rb

@@ -15,9 +15,9 @@ module Kapellmeister::RequestsExtension
             return ::Kapellmeister::Base.routes_scheme_parse(mock)
           end
 
-          data = query_params.compact_blank.merge(data) if data.is_a?(Hash)
+          data, query_keys = *parsed_query(query_params, data)
+          valid_query?(data, query_keys)
           valid_body?(data, body)
-          valid_query?(data, query_params)
 
           full_path = generate_full_path(path, data)
 
@@ -32,6 +32,29 @@ module Kapellmeister::RequestsExtension
   end
 end
 
+def parsed_query(params, data)
+  return [data, []] if params.blank?
+
+  hash_data, filtered_query = *split_hashes(params)
+  required_empty_query, default_data = *hash_data.partition { |elem| elem.values.compact_blank.blank? }
+  data = Hash[filtered_query.zip].compact_blank.merge(data) if data.is_a?(Hash)
+  optional_data, default_data = *split_optional(default_data)
+  data = data.merge(default_data) unless data.blank? && default_data.blank?
+
+  [data, filtered_query + required_empty_query.map(&:keys).flatten + default_data.keys.flatten]
+end
+
+def split_hashes(params)
+  case params
+  when Array then params.compact_blank.partition { |elem| elem.is_a?(Hash) }
+  when Hash then [[params], []]
+  end
+end
+
+def split_optional(params)
+  params.inject(:merge).partition { |key, value|  key == :optional }.map(&:to_h)
+end
+
 def generate_full_path(original_path, data)
   path = generate_path(original_path, data)
   query = data.delete(:query_params)&.to_query
@@ -47,7 +70,7 @@ def generate_path(original_path, data)
     next part unless part.include? '%<'
 
     data.delete(part.match(/%<(.*)>/).to_a.last.to_sym)
-  end.join('/')
+  end.join('/').squeeze('/')
 end
 
 def valid_body?(data, body)
@@ -63,7 +86,7 @@ end
 def valid_query?(data, query)
   return if query.blank?
 
-  required_keys = query.keys
+  required_keys = query.map(&:to_sym)
 
   from_data = data.slice(*required_keys)
   data.except!(*required_keys)

data/lib/kapellmeister/version.rb

@@ -1,3 +1,3 @@
 module Kapellmeister
-  VERSION = '0.9.3'.freeze
+  VERSION = '0.9.5'.freeze
 end

metadata

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