kapellmeister 0.9.5 → 0.9.6
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/kapellmeister/requests_extension.rb +8 -3
- data/lib/kapellmeister/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: fe79b6fb67ba56c68ef8f1ae0c8f617856027bd63092193f32c11ced913db7f8
|
4
|
+
data.tar.gz: 80f2ff06ffcb6b91da5610162d52a5c8648d60a0d22991ffe90a175998424bf3
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: acfe492025285fe11843ba4bdd3a911f793ae3c980afb46281b9490df7096005f246f585722587d2103d1d56f9b4568aa3082392f29640fff61f35c5fd1926bb
|
7
|
+
data.tar.gz: 916c8280053a15b9fbccfc7ddab4941219d1309331b019e40879523fe0b05300ba802d5ad306e4492245a47871e919aca8c184f0cab17ad581d56fa24dfd18be
|
@@ -38,21 +38,26 @@ def parsed_query(params, data)
|
|
38
38
|
hash_data, filtered_query = *split_hashes(params)
|
39
39
|
required_empty_query, default_data = *hash_data.partition { |elem| elem.values.compact_blank.blank? }
|
40
40
|
data = Hash[filtered_query.zip].compact_blank.merge(data) if data.is_a?(Hash)
|
41
|
-
|
42
|
-
data = data.merge(default_data)
|
41
|
+
_optional_data, default_data = *split_optional(default_data)
|
42
|
+
data = data.merge(default_data) if !data.blank? || !default_data.blank?
|
43
43
|
|
44
44
|
[data, filtered_query + required_empty_query.map(&:keys).flatten + default_data.keys.flatten]
|
45
45
|
end
|
46
46
|
|
47
47
|
def split_hashes(params)
|
48
|
+
return [[], []] if params.blank?
|
49
|
+
|
48
50
|
case params
|
49
51
|
when Array then params.compact_blank.partition { |elem| elem.is_a?(Hash) }
|
50
52
|
when Hash then [[params], []]
|
53
|
+
else [[], []]
|
51
54
|
end
|
52
55
|
end
|
53
56
|
|
54
57
|
def split_optional(params)
|
55
|
-
|
58
|
+
return [{}, {}] if params.blank?
|
59
|
+
|
60
|
+
params.inject(:merge).partition { |key, _value| key == :optional }.map(&:to_h)
|
56
61
|
end
|
57
62
|
|
58
63
|
def generate_full_path(original_path, data)
|