schemacop 3.0.8 → 3.0.12
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.github/workflows/ruby.yml +27 -0
- data/.releaser_config +0 -1
- data/CHANGELOG.md +18 -0
- data/README.md +1 -1
- data/README_V3.md +129 -40
- data/VERSION +1 -1
- data/lib/schemacop/v3/combination_node.rb +1 -1
- data/lib/schemacop/v3/node.rb +6 -5
- data/lib/schemacop/v3/one_of_node.rb +23 -1
- data/lib/schemacop/v3/string_node.rb +8 -2
- data/schemacop.gemspec +30 -18
- data/test/unit/schemacop/v3/array_node_test.rb +19 -17
- data/test/unit/schemacop/v3/boolean_node_test.rb +40 -7
- data/test/unit/schemacop/v3/hash_node_test.rb +49 -11
- data/test/unit/schemacop/v3/integer_node_test.rb +38 -14
- data/test/unit/schemacop/v3/node_test.rb +10 -0
- data/test/unit/schemacop/v3/number_node_test.rb +14 -9
- data/test/unit/schemacop/v3/object_node_test.rb +7 -7
- data/test/unit/schemacop/v3/one_of_node_test.rb +12 -0
- data/test/unit/schemacop/v3/reference_node_test.rb +4 -4
- data/test/unit/schemacop/v3/string_node_test.rb +60 -11
- data/test/unit/schemacop/v3/symbol_node_test.rb +9 -6
- metadata +4 -4
- data/.travis.yml +0 -9
@@ -3,7 +3,9 @@ require 'test_helper'
|
|
3
3
|
module Schemacop
|
4
4
|
module V3
|
5
5
|
class IntegerNodeTest < V3Test
|
6
|
-
|
6
|
+
def self.invalid_type_error(type)
|
7
|
+
"Invalid type, got type \"#{type}\", expected \"integer\"."
|
8
|
+
end
|
7
9
|
|
8
10
|
def test_basic
|
9
11
|
schema :integer
|
@@ -59,11 +61,11 @@ module Schemacop
|
|
59
61
|
)
|
60
62
|
|
61
63
|
assert_validation 42.5 do
|
62
|
-
error '/',
|
64
|
+
error '/', IntegerNodeTest.invalid_type_error(Float)
|
63
65
|
end
|
64
66
|
|
65
67
|
assert_validation '42.5' do
|
66
|
-
error '/',
|
68
|
+
error '/', IntegerNodeTest.invalid_type_error(String)
|
67
69
|
end
|
68
70
|
|
69
71
|
schema { int! :age }
|
@@ -78,27 +80,27 @@ module Schemacop
|
|
78
80
|
)
|
79
81
|
|
80
82
|
assert_validation age: :foo do
|
81
|
-
error '/age',
|
83
|
+
error '/age', IntegerNodeTest.invalid_type_error(Symbol)
|
82
84
|
end
|
83
85
|
|
84
86
|
assert_validation age: '234' do
|
85
|
-
error '/age',
|
87
|
+
error '/age', IntegerNodeTest.invalid_type_error(String)
|
86
88
|
end
|
87
89
|
|
88
90
|
assert_validation age: 10.0 do
|
89
|
-
error '/age',
|
91
|
+
error '/age', IntegerNodeTest.invalid_type_error(Float)
|
90
92
|
end
|
91
93
|
|
92
94
|
assert_validation age: 4r do
|
93
|
-
error '/age',
|
95
|
+
error '/age', IntegerNodeTest.invalid_type_error(Rational)
|
94
96
|
end
|
95
97
|
|
96
98
|
assert_validation age: (4 + 0i) do
|
97
|
-
error '/age',
|
99
|
+
error '/age', IntegerNodeTest.invalid_type_error(Complex)
|
98
100
|
end
|
99
101
|
|
100
102
|
assert_validation age: BigDecimal(5) do
|
101
|
-
error '/age',
|
103
|
+
error '/age', IntegerNodeTest.invalid_type_error(BigDecimal)
|
102
104
|
end
|
103
105
|
end
|
104
106
|
|
@@ -210,7 +212,7 @@ module Schemacop
|
|
210
212
|
assert_validation(nil)
|
211
213
|
assert_validation(50)
|
212
214
|
assert_validation(5.2) do
|
213
|
-
error '/',
|
215
|
+
error '/', IntegerNodeTest.invalid_type_error(Float)
|
214
216
|
end
|
215
217
|
|
216
218
|
assert_cast(5, 5)
|
@@ -289,18 +291,18 @@ module Schemacop
|
|
289
291
|
# Even we put those types in the enum, they need to fail the validations,
|
290
292
|
# as they are not integers
|
291
293
|
assert_validation('foo') do
|
292
|
-
error '/',
|
294
|
+
error '/', IntegerNodeTest.invalid_type_error(String)
|
293
295
|
end
|
294
296
|
assert_validation(:bar) do
|
295
|
-
error '/',
|
297
|
+
error '/', IntegerNodeTest.invalid_type_error(Symbol)
|
296
298
|
end
|
297
299
|
assert_validation({ qux: 42 }) do
|
298
|
-
error '/',
|
300
|
+
error '/', IntegerNodeTest.invalid_type_error(Hash)
|
299
301
|
end
|
300
302
|
|
301
303
|
# This needs to fail as it is a number (float) and not an integer
|
302
304
|
assert_validation(4.2) do
|
303
|
-
error '/',
|
305
|
+
error '/', IntegerNodeTest.invalid_type_error(Float)
|
304
306
|
end
|
305
307
|
|
306
308
|
# These need to fail validation, as they are not in the enum list
|
@@ -337,6 +339,28 @@ module Schemacop
|
|
337
339
|
assert_cast('1', 1)
|
338
340
|
assert_cast(1, 1)
|
339
341
|
|
342
|
+
assert_cast(nil, nil)
|
343
|
+
assert_cast('', nil)
|
344
|
+
|
345
|
+
assert_validation('true') do
|
346
|
+
error '/', 'Matches 0 definitions but should match exactly 1.'
|
347
|
+
end
|
348
|
+
end
|
349
|
+
|
350
|
+
def test_cast_str_required
|
351
|
+
schema :integer, cast_str: true, required: true
|
352
|
+
|
353
|
+
assert_cast('1', 1)
|
354
|
+
assert_cast(1, 1)
|
355
|
+
|
356
|
+
assert_validation(nil) do
|
357
|
+
error '/', 'Value must be given.'
|
358
|
+
end
|
359
|
+
|
360
|
+
assert_validation('') do
|
361
|
+
error '/', 'Value must be given.'
|
362
|
+
end
|
363
|
+
|
340
364
|
assert_validation('true') do
|
341
365
|
error '/', 'Matches 0 definitions but should match exactly 1.'
|
342
366
|
end
|
@@ -93,6 +93,10 @@ module Schemacop
|
|
93
93
|
error '/', 'Value must be given.'
|
94
94
|
end
|
95
95
|
|
96
|
+
assert_validation('') do
|
97
|
+
error '/', 'Value must be given.'
|
98
|
+
end
|
99
|
+
|
96
100
|
assert_validation('5')
|
97
101
|
assert_validation('5.3') do
|
98
102
|
error '/', 'Matches 0 definitions but should match exactly 1.'
|
@@ -156,6 +160,12 @@ module Schemacop
|
|
156
160
|
assert_validation([nil]) do
|
157
161
|
error '/[0]', 'Value must be given.'
|
158
162
|
end
|
163
|
+
assert_validation(['']) do
|
164
|
+
error '/[0]', 'Value must be given.'
|
165
|
+
end
|
166
|
+
assert_validation([]) do
|
167
|
+
error '/', 'Array has 0 items but must have exactly 1.'
|
168
|
+
end
|
159
169
|
end
|
160
170
|
|
161
171
|
def test_not_support_block
|
@@ -3,7 +3,9 @@ require 'test_helper'
|
|
3
3
|
module Schemacop
|
4
4
|
module V3
|
5
5
|
class NumberNodeTest < V3Test
|
6
|
-
|
6
|
+
def self.invalid_type_error(type)
|
7
|
+
"Invalid type, got type \"#{type}\", expected \"big_decimal\" or \"float\" or \"integer\" or \"rational\"."
|
8
|
+
end
|
7
9
|
|
8
10
|
def test_basic
|
9
11
|
schema :number
|
@@ -16,7 +18,7 @@ module Schemacop
|
|
16
18
|
assert_validation(BigDecimal(6))
|
17
19
|
|
18
20
|
assert_validation((6 + 0i)) do
|
19
|
-
error '/',
|
21
|
+
error '/', NumberNodeTest.invalid_type_error(Complex)
|
20
22
|
end
|
21
23
|
|
22
24
|
assert_json(type: :number)
|
@@ -52,7 +54,7 @@ module Schemacop
|
|
52
54
|
assert_validation [30.3, 42.0]
|
53
55
|
assert_validation [30, 30r, 30.0, BigDecimal(30)]
|
54
56
|
assert_validation ['30.3', 30.3] do
|
55
|
-
error '/[0]',
|
57
|
+
error '/[0]', NumberNodeTest.invalid_type_error(String)
|
56
58
|
end
|
57
59
|
end
|
58
60
|
|
@@ -64,17 +66,17 @@ module Schemacop
|
|
64
66
|
)
|
65
67
|
|
66
68
|
assert_validation '42.5' do
|
67
|
-
error '/',
|
69
|
+
error '/', NumberNodeTest.invalid_type_error(String)
|
68
70
|
end
|
69
71
|
|
70
72
|
schema { num! :age }
|
71
73
|
|
72
74
|
assert_validation age: :foo do
|
73
|
-
error '/age',
|
75
|
+
error '/age', NumberNodeTest.invalid_type_error(Symbol)
|
74
76
|
end
|
75
77
|
|
76
78
|
assert_validation age: '234' do
|
77
|
-
error '/age',
|
79
|
+
error '/age', NumberNodeTest.invalid_type_error(String)
|
78
80
|
end
|
79
81
|
end
|
80
82
|
|
@@ -261,13 +263,13 @@ module Schemacop
|
|
261
263
|
# Even we put those types in the enum, they need to fail the validations,
|
262
264
|
# as they are not numbers
|
263
265
|
assert_validation('foo') do
|
264
|
-
error '/',
|
266
|
+
error '/', NumberNodeTest.invalid_type_error(String)
|
265
267
|
end
|
266
268
|
assert_validation(:bar) do
|
267
|
-
error '/',
|
269
|
+
error '/', NumberNodeTest.invalid_type_error(Symbol)
|
268
270
|
end
|
269
271
|
assert_validation({ qux: 42 }) do
|
270
|
-
error '/',
|
272
|
+
error '/', NumberNodeTest.invalid_type_error(Hash)
|
271
273
|
end
|
272
274
|
|
273
275
|
# These need to fail validation, as they are not in the enum list
|
@@ -306,6 +308,9 @@ module Schemacop
|
|
306
308
|
assert_cast('1', 1)
|
307
309
|
assert_cast(1, 1)
|
308
310
|
|
311
|
+
assert_validation(nil)
|
312
|
+
assert_validation('')
|
313
|
+
|
309
314
|
assert_cast('1.0', 1.0)
|
310
315
|
assert_cast(1.0, 1.0)
|
311
316
|
|
@@ -28,10 +28,10 @@ module Schemacop
|
|
28
28
|
assert_validation 'foo'
|
29
29
|
assert_validation Date.today
|
30
30
|
assert_validation({}.with_indifferent_access) do
|
31
|
-
error '/', 'Invalid type, expected "Date" or "String".'
|
31
|
+
error '/', 'Invalid type, got type "ActiveSupport::HashWithIndifferentAccess", expected "Date" or "String".'
|
32
32
|
end
|
33
33
|
assert_validation DateTime.now do
|
34
|
-
error '/', 'Invalid type, expected "Date" or "String".'
|
34
|
+
error '/', 'Invalid type, got type "DateTime", expected "Date" or "String".'
|
35
35
|
end
|
36
36
|
end
|
37
37
|
|
@@ -44,7 +44,7 @@ module Schemacop
|
|
44
44
|
assert_validation DateTime.now
|
45
45
|
assert_validation({}.with_indifferent_access)
|
46
46
|
assert_validation Time.now do
|
47
|
-
error '/', 'Invalid type, expected "Date" or "Hash" or "String".'
|
47
|
+
error '/', 'Invalid type, got type "Time", expected "Date" or "Hash" or "String".'
|
48
48
|
end
|
49
49
|
end
|
50
50
|
|
@@ -74,7 +74,7 @@ module Schemacop
|
|
74
74
|
assert_validation myobj: ''
|
75
75
|
assert_validation myobj: '42'
|
76
76
|
assert_validation myobj: Date.today do
|
77
|
-
error '/myobj', 'Invalid type, expected "String".'
|
77
|
+
error '/myobj', 'Invalid type, got type "Date", expected "String".'
|
78
78
|
end
|
79
79
|
assert_validation({}) do
|
80
80
|
error '/myobj', 'Value must be given.'
|
@@ -134,13 +134,13 @@ module Schemacop
|
|
134
134
|
|
135
135
|
# These will fail, as they aren't of one of the classed we defined above
|
136
136
|
assert_validation([]) do
|
137
|
-
error '/', 'Invalid type, expected "String" or "Symbol" or "TrueClass".'
|
137
|
+
error '/', 'Invalid type, got type "Array", expected "String" or "Symbol" or "TrueClass".'
|
138
138
|
end
|
139
139
|
assert_validation({ qux: '123' }) do
|
140
|
-
error '/', 'Invalid type, expected "String" or "Symbol" or "TrueClass".'
|
140
|
+
error '/', 'Invalid type, got type "Hash", expected "String" or "Symbol" or "TrueClass".'
|
141
141
|
end
|
142
142
|
assert_validation(false) do
|
143
|
-
error '/', 'Invalid type, expected "String" or "Symbol" or "TrueClass".'
|
143
|
+
error '/', 'Invalid type, got type "FalseClass", expected "String" or "Symbol" or "TrueClass".'
|
144
144
|
end
|
145
145
|
end
|
146
146
|
|
@@ -182,6 +182,18 @@ module Schemacop
|
|
182
182
|
schema :one_of
|
183
183
|
end
|
184
184
|
end
|
185
|
+
|
186
|
+
def test_treat_blank_as_nil
|
187
|
+
schema :one_of, treat_blank_as_nil: true do
|
188
|
+
boo
|
189
|
+
str format: :boolean
|
190
|
+
end
|
191
|
+
|
192
|
+
assert_validation(nil)
|
193
|
+
assert_validation('')
|
194
|
+
assert_validation('true')
|
195
|
+
assert_validation(true)
|
196
|
+
end
|
185
197
|
end
|
186
198
|
end
|
187
199
|
end
|
@@ -26,13 +26,13 @@ module Schemacop
|
|
26
26
|
assert_validation(bar: { foo: 'String', baz: { foo: 42 } })
|
27
27
|
|
28
28
|
assert_validation(foo: 42) do
|
29
|
-
error '/foo', 'Invalid type, expected "string".'
|
29
|
+
error '/foo', 'Invalid type, got type "Integer", expected "string".'
|
30
30
|
end
|
31
31
|
assert_validation(bar: { foo: 42 }) do
|
32
|
-
error '/bar/foo', 'Invalid type, expected "string".'
|
32
|
+
error '/bar/foo', 'Invalid type, got type "Integer", expected "string".'
|
33
33
|
end
|
34
34
|
assert_validation(bar: { foo: 'String', baz: { foo: '42' } }) do
|
35
|
-
error '/bar/baz/foo', 'Invalid type, expected "integer".'
|
35
|
+
error '/bar/baz/foo', 'Invalid type, got type "String", expected "integer".'
|
36
36
|
end
|
37
37
|
|
38
38
|
assert_json({
|
@@ -306,7 +306,7 @@ module Schemacop
|
|
306
306
|
with_context context do
|
307
307
|
assert_validation(first_name: 'John', last_name: 'Doe')
|
308
308
|
assert_validation(first_name: 'John', last_name: 42) do
|
309
|
-
error '/last_name', 'Invalid type, expected "string".'
|
309
|
+
error '/last_name', 'Invalid type, got type "Integer", expected "string".'
|
310
310
|
end
|
311
311
|
end
|
312
312
|
|
@@ -3,7 +3,9 @@ require 'test_helper'
|
|
3
3
|
module Schemacop
|
4
4
|
module V3
|
5
5
|
class StringNodeTest < V3Test
|
6
|
-
|
6
|
+
def self.invalid_type_error(type)
|
7
|
+
"Invalid type, got type \"#{type}\", expected \"string\"."
|
8
|
+
end
|
7
9
|
|
8
10
|
def test_basic
|
9
11
|
schema :string
|
@@ -33,7 +35,7 @@ module Schemacop
|
|
33
35
|
assert_json(type: :string)
|
34
36
|
|
35
37
|
assert_validation 42 do
|
36
|
-
error '/',
|
38
|
+
error '/', StringNodeTest.invalid_type_error(Integer)
|
37
39
|
end
|
38
40
|
|
39
41
|
schema { str! :name }
|
@@ -41,11 +43,11 @@ module Schemacop
|
|
41
43
|
assert_json(type: :object, properties: { name: { type: :string } }, required: %i[name], additionalProperties: false)
|
42
44
|
|
43
45
|
assert_validation name: :foo do
|
44
|
-
error '/name',
|
46
|
+
error '/name', StringNodeTest.invalid_type_error(Symbol)
|
45
47
|
end
|
46
48
|
|
47
49
|
assert_validation name: 234 do
|
48
|
-
error '/name',
|
50
|
+
error '/name', StringNodeTest.invalid_type_error(Integer)
|
49
51
|
end
|
50
52
|
end
|
51
53
|
|
@@ -190,7 +192,7 @@ module Schemacop
|
|
190
192
|
assert_validation ''
|
191
193
|
|
192
194
|
assert_validation 234 do
|
193
|
-
error '/',
|
195
|
+
error '/', StringNodeTest.invalid_type_error(Integer)
|
194
196
|
end
|
195
197
|
|
196
198
|
assert_cast(nil, nil)
|
@@ -218,7 +220,7 @@ module Schemacop
|
|
218
220
|
# Integer value 42 is in the enum of allowed values, but it's not a string,
|
219
221
|
# so the validation still fails
|
220
222
|
assert_validation 42 do
|
221
|
-
error '/',
|
223
|
+
error '/', StringNodeTest.invalid_type_error(Integer)
|
222
224
|
end
|
223
225
|
end
|
224
226
|
|
@@ -278,7 +280,7 @@ module Schemacop
|
|
278
280
|
assert_validation(nil)
|
279
281
|
assert_validation('Foo')
|
280
282
|
assert_validation(5) do
|
281
|
-
error '/',
|
283
|
+
error '/', StringNodeTest.invalid_type_error(Integer)
|
282
284
|
end
|
283
285
|
|
284
286
|
assert_cast('Foo', 'Foo')
|
@@ -297,7 +299,7 @@ module Schemacop
|
|
297
299
|
assert_validation(nil)
|
298
300
|
assert_validation('123')
|
299
301
|
assert_validation(5) do
|
300
|
-
error '/',
|
302
|
+
error '/', StringNodeTest.invalid_type_error(Integer)
|
301
303
|
end
|
302
304
|
|
303
305
|
assert_cast('123', 123)
|
@@ -364,13 +366,13 @@ module Schemacop
|
|
364
366
|
# Even we put those types in the enum, they need to fail the validations,
|
365
367
|
# as they are not strings
|
366
368
|
assert_validation(1) do
|
367
|
-
error '/',
|
369
|
+
error '/', StringNodeTest.invalid_type_error(Integer)
|
368
370
|
end
|
369
371
|
assert_validation(:bar) do
|
370
|
-
error '/',
|
372
|
+
error '/', StringNodeTest.invalid_type_error(Symbol)
|
371
373
|
end
|
372
374
|
assert_validation({ qux: 42 }) do
|
373
|
-
error '/',
|
375
|
+
error '/', StringNodeTest.invalid_type_error(Hash)
|
374
376
|
end
|
375
377
|
|
376
378
|
# These need to fail validation, as they are not in the enum list
|
@@ -400,6 +402,53 @@ module Schemacop
|
|
400
402
|
]
|
401
403
|
})
|
402
404
|
end
|
405
|
+
|
406
|
+
def test_cast_empty_or_whitespace_string
|
407
|
+
schema :string
|
408
|
+
|
409
|
+
assert_cast(nil, nil)
|
410
|
+
assert_cast('', '')
|
411
|
+
assert_cast(' ', ' ')
|
412
|
+
assert_cast("\n", "\n")
|
413
|
+
assert_cast("\t", "\t")
|
414
|
+
end
|
415
|
+
|
416
|
+
def test_cast_empty_or_whitespace_string_required
|
417
|
+
schema :string, required: true
|
418
|
+
|
419
|
+
assert_validation(nil) do
|
420
|
+
error '/', 'Value must be given.'
|
421
|
+
end
|
422
|
+
|
423
|
+
assert_cast('', '')
|
424
|
+
assert_cast(' ', ' ')
|
425
|
+
assert_cast("\n", "\n")
|
426
|
+
assert_cast("\t", "\t")
|
427
|
+
end
|
428
|
+
|
429
|
+
def test_empty_or_whitespace_string_blank_not_allowed
|
430
|
+
schema :string, allow_blank: false
|
431
|
+
|
432
|
+
assert_validation(nil) do
|
433
|
+
error '/', 'String is blank but must not be blank!'
|
434
|
+
end
|
435
|
+
|
436
|
+
assert_validation('') do
|
437
|
+
error '/', 'String is blank but must not be blank!'
|
438
|
+
end
|
439
|
+
|
440
|
+
assert_validation(' ') do
|
441
|
+
error '/', 'String is blank but must not be blank!'
|
442
|
+
end
|
443
|
+
|
444
|
+
assert_validation("\n") do
|
445
|
+
error '/', 'String is blank but must not be blank!'
|
446
|
+
end
|
447
|
+
|
448
|
+
assert_validation("\t") do
|
449
|
+
error '/', 'String is blank but must not be blank!'
|
450
|
+
end
|
451
|
+
end
|
403
452
|
end
|
404
453
|
end
|
405
454
|
end
|