kapellmeister 0.9.4 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5fd7d3c5d2244764964d2ceee2e2bf0400baa2c8aeac18a8bc49ac2e7aed5fc7
-  data.tar.gz: 1fa8a6ba63c7a40dd294fb0ee38ff9fb2f4c1532d3d56311b00647eea53dd6ab
+  metadata.gz: fe79b6fb67ba56c68ef8f1ae0c8f617856027bd63092193f32c11ced913db7f8
+  data.tar.gz: 80f2ff06ffcb6b91da5610162d52a5c8648d60a0d22991ffe90a175998424bf3
 SHA512:
-  metadata.gz: 9a52a16e343a393a17c7bf7568f638ddd3a1b43cc992772ba89ce658174d73e08c24aae9ef554e03e91a9c1282515acf157f6a3002c6e4421dea333f4004458c
-  data.tar.gz: 499902ae0d25dd3623b6f8790a87ada07464219678bc60c6a82d1b3cd8233f5991728881e744373d9fc186d7832f65ec25eb1de6b1a08c28d5e64bc3f5027fea
+  metadata.gz: acfe492025285fe11843ba4bdd3a911f793ae3c980afb46281b9490df7096005f246f585722587d2103d1d56f9b4568aa3082392f29640fff61f35c5fd1926bb
+  data.tar.gz: 916c8280053a15b9fbccfc7ddab4941219d1309331b019e40879523fe0b05300ba802d5ad306e4492245a47871e919aca8c184f0cab17ad581d56fa24dfd18be

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,34 @@ 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) if !data.blank? || !default_data.blank?
+
+  [data, filtered_query + required_empty_query.map(&:keys).flatten + default_data.keys.flatten]
+end
+
+def split_hashes(params)
+  return [[], []] if params.blank?
+
+  case params
+  when Array then params.compact_blank.partition { |elem| elem.is_a?(Hash) }
+  when Hash then [[params], []]
+  else [[], []]
+  end
+end
+
+def split_optional(params)
+  return [{}, {}] if params.blank?
+
+  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
@@ -63,7 +91,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.4'.freeze
+  VERSION = '0.9.6'.freeze
 end

metadata

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