servactory 2.15.1 → 2.16.0.rc1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/servactory/context/warehouse/inputs.rb +1 -5
- data/lib/servactory/context/workspace/inputs.rb +1 -5
- data/lib/servactory/context/workspace/internals.rb +1 -4
- data/lib/servactory/context/workspace/outputs.rb +1 -4
- data/lib/servactory/info/dsl.rb +4 -0
- data/lib/servactory/inputs/tools/rules.rb +1 -5
- data/lib/servactory/inputs/tools/unnecessary.rb +1 -4
- data/lib/servactory/inputs/tools/validation.rb +10 -10
- data/lib/servactory/maintenance/attributes/options_collection.rb +2 -1
- data/lib/servactory/maintenance/attributes/tools/validation.rb +4 -0
- data/lib/servactory/maintenance/attributes/validations/errors.rb +1 -1
- data/lib/servactory/version.rb +3 -3
- 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: bc13e8261f2784169fde009e5f3fd2527e963e55cbda931d728c46319b395187
|
4
|
+
data.tar.gz: 9b4f88c9ba2695f0fa8c8084866bb27a1bcf99702890985e080d08a750d6e1c1
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: ab74975be82b4e3231a1ed12d92d12853755afe051e7e0f7144ae34efbc909c124e70091a333fba41c657c2f5344abd7cc649c5f9def2d37e7363b41ab39d794
|
7
|
+
data.tar.gz: b46024d472db88be0c99e9eb15c912089b4ebace519e39e5e840ba84272f7d61572fcf851c47b106e4acd44037798d9a7fd40547093521a87a180f6c3bac677a
|
data/lib/servactory/info/dsl.rb
CHANGED
@@ -34,11 +34,7 @@ module Servactory
|
|
34
34
|
conflict_code: input.conflict_code
|
35
35
|
)
|
36
36
|
|
37
|
-
|
38
|
-
context: @context,
|
39
|
-
message: message_text,
|
40
|
-
input_name: input.name
|
41
|
-
)
|
37
|
+
@context.fail_input!(input.name, message: message_text)
|
42
38
|
end
|
43
39
|
end
|
44
40
|
end
|
@@ -21,10 +21,7 @@ module Servactory
|
|
21
21
|
unnecessary_attributes: unnecessary_attributes.join(", ")
|
22
22
|
)
|
23
23
|
|
24
|
-
|
25
|
-
context: @context,
|
26
|
-
message: message_text
|
27
|
-
)
|
24
|
+
@context.fail_input!(nil, message: message_text)
|
28
25
|
end
|
29
26
|
|
30
27
|
private
|
@@ -29,18 +29,21 @@ module Servactory
|
|
29
29
|
end
|
30
30
|
end
|
31
31
|
|
32
|
-
def process_option(check_key, check_options, input:)
|
33
|
-
validation_classes_from(input)
|
32
|
+
def process_option(check_key, check_options, input:) # rubocop:disable Metrics/MethodLength
|
33
|
+
validation_classes = validation_classes_from(input)
|
34
|
+
return if validation_classes.empty?
|
35
|
+
|
36
|
+
validation_classes.each do |validation_class|
|
34
37
|
errors_from_checks = process_validation_class(
|
35
38
|
validation_class:,
|
36
39
|
input:,
|
37
40
|
check_key:,
|
38
41
|
check_options:
|
39
|
-
)
|
42
|
+
)
|
40
43
|
|
41
|
-
next if errors_from_checks.empty?
|
44
|
+
next if errors_from_checks.nil? || errors_from_checks.empty?
|
42
45
|
|
43
|
-
errors.merge(errors_from_checks)
|
46
|
+
errors.merge(errors_from_checks.to_a)
|
44
47
|
end
|
45
48
|
end
|
46
49
|
|
@@ -62,7 +65,7 @@ module Servactory
|
|
62
65
|
########################################################################
|
63
66
|
|
64
67
|
def validation_classes_from(input)
|
65
|
-
input.collection_of_options.validation_classes
|
68
|
+
@validation_classes_cache ||= input.collection_of_options.validation_classes # rubocop:disable Naming/MemoizedInstanceVariableName
|
66
69
|
end
|
67
70
|
|
68
71
|
########################################################################
|
@@ -74,10 +77,7 @@ module Servactory
|
|
74
77
|
def raise_errors
|
75
78
|
return if (tmp_errors = errors.not_blank).empty?
|
76
79
|
|
77
|
-
|
78
|
-
context: @context,
|
79
|
-
message: tmp_errors.first
|
80
|
-
)
|
80
|
+
@context.fail_input!(nil, message: tmp_errors.first)
|
81
81
|
end
|
82
82
|
end
|
83
83
|
end
|
@@ -30,6 +30,8 @@ module Servactory
|
|
30
30
|
end
|
31
31
|
|
32
32
|
def process_option(check_key, check_options)
|
33
|
+
return if validation_classes.empty?
|
34
|
+
|
33
35
|
validation_classes.each do |validation_class|
|
34
36
|
errors_from_checks = process_validation_class(
|
35
37
|
validation_class:,
|
@@ -37,6 +39,8 @@ module Servactory
|
|
37
39
|
check_options:
|
38
40
|
)
|
39
41
|
|
42
|
+
next if errors_from_checks.nil? || errors_from_checks.empty?
|
43
|
+
|
40
44
|
errors.merge(errors_from_checks.to_a)
|
41
45
|
end
|
42
46
|
end
|
data/lib/servactory/version.rb
CHANGED