datacaster 6.1.0 → 7.0.0
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/.github/workflows/rspec.yml +1 -1
- data/README.md +16 -7
- data/config/locales/en.yml +1 -0
- data/lib/datacaster/predefined.rb +18 -6
- data/lib/datacaster/runtimes/user_context.rb +0 -2
- data/lib/datacaster/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 2eb003676aab2398449fe5e0a91e3d083959853d8ca8b769efceaca32f66c4db
|
|
4
|
+
data.tar.gz: 4f380194ce17f7d4e39f6341def50e0eda235623fbb155ce6975e9e8fad59694
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: a2552126d48a3ded8257ef14316d67a1a1ac43f87bc695ed81336d23e8733f320a75d67949eac2c655aa17a3f3a08dd7acfa1e3e9750a1958b8e2e9e2c28a62d
|
|
7
|
+
data.tar.gz: 96a170bfac8f943d8c7a6684fff3da4fd284b7a07fdeb4e18bf6566e2c61caf3175ac1e24ac0710bcf588c33726a0adfcaee8fdfc1ff621b41623808fe3ad291
|
data/.github/workflows/rspec.yml
CHANGED
data/README.md
CHANGED
|
@@ -478,11 +478,14 @@ I18n keys: `error_key`, `'.array'`, `'datacaster.errors.array'`.
|
|
|
478
478
|
|
|
479
479
|
#### `decimal(digits = 8, error_key = nil)`
|
|
480
480
|
|
|
481
|
-
Returns ValidResult if and only if provided value is either a float, integer or string representing float/integer.
|
|
481
|
+
Returns ValidResult if and only if provided value is either a float, integer or string representing float/integer. Non-finite values (`Infinity`, `NaN`) are rejected.
|
|
482
482
|
|
|
483
483
|
Transforms the value to the `BigDecimal` instance.
|
|
484
484
|
|
|
485
|
-
I18n keys:
|
|
485
|
+
I18n keys:
|
|
486
|
+
|
|
487
|
+
* not a decimal – `error_key`, `'.decimal'`, `'datacaster.errors.decimal'`
|
|
488
|
+
* not finite – `error_key`, `'.finite'`, `'datacaster.errors.finite'`
|
|
486
489
|
|
|
487
490
|
#### `float(error_key = nil)`
|
|
488
491
|
|
|
@@ -504,11 +507,14 @@ Returns ValidResult if and only if provided value is an integer. Doesn't transfo
|
|
|
504
507
|
|
|
505
508
|
I18n keys: `error_key`, `'.integer'`, `'datacaster.errors.integer'`.
|
|
506
509
|
|
|
507
|
-
#### `numeric(error_key = nil)`
|
|
510
|
+
#### `numeric(error_key = nil, finite: true)`
|
|
508
511
|
|
|
509
|
-
Returns ValidResult if and only if provided value is a number (Ruby's `Numeric`). Doesn't transform the value.
|
|
512
|
+
Returns ValidResult if and only if provided value is a number (Ruby's `Numeric`). With `finite: true` (default) `Infinity` and `NaN` are rejected. Doesn't transform the value.
|
|
510
513
|
|
|
511
|
-
I18n keys:
|
|
514
|
+
I18n keys:
|
|
515
|
+
|
|
516
|
+
* not a number – `error_key`, `'.numeric'`, `'datacaster.errors.numeric'`
|
|
517
|
+
* not finite (when `finite` is `true`) – `error_key`, `'.finite'`, `'datacaster.errors.finite'`
|
|
512
518
|
|
|
513
519
|
#### `string(error_key = nil)`
|
|
514
520
|
|
|
@@ -929,9 +935,12 @@ I18n keys: `error_key`, `'.to_boolean'`, `'datacaster.errors.to_boolean'`
|
|
|
929
935
|
|
|
930
936
|
#### `to_float(error_key = nil)`
|
|
931
937
|
|
|
932
|
-
Returns ValidResult if and only if the value is an integer, float or string representing integer/float. Transforms value to float.
|
|
938
|
+
Returns ValidResult if and only if the value is an integer, float or string representing integer/float, and the resulting float is finite (`"1e999"`, `Infinity` and `NaN` are rejected). Transforms value to float.
|
|
939
|
+
|
|
940
|
+
I18n keys:
|
|
933
941
|
|
|
934
|
-
|
|
942
|
+
* not a float – `error_key`, `'.to_float'`, `'datacaster.errors.to_float'`
|
|
943
|
+
* not finite – `error_key`, `'.finite'`, `'datacaster.errors.finite'`
|
|
935
944
|
|
|
936
945
|
#### `to_integer(error_key = nil)`
|
|
937
946
|
|
data/config/locales/en.yml
CHANGED
|
@@ -326,12 +326,15 @@ module Datacaster
|
|
|
326
326
|
|
|
327
327
|
# Strict types
|
|
328
328
|
|
|
329
|
-
def numeric(error_key = nil)
|
|
329
|
+
def numeric(error_key = nil, finite: true)
|
|
330
330
|
error_keys = ['.numeric', 'datacaster.errors.numeric']
|
|
331
331
|
error_keys.unshift(error_key) if error_key
|
|
332
|
-
check { |x| x.is_a?(Numeric) }.
|
|
332
|
+
caster = check { |x| x.is_a?(Numeric) }.
|
|
333
333
|
i18n_key(*error_keys).
|
|
334
334
|
json_schema(oneOf: [{ 'type' => 'string' }, { 'type' => 'number' }])
|
|
335
|
+
|
|
336
|
+
caster &= finite_value(error_key) if finite
|
|
337
|
+
caster
|
|
335
338
|
end
|
|
336
339
|
|
|
337
340
|
def decimal(digits = 8, error_key = nil)
|
|
@@ -348,7 +351,7 @@ module Datacaster
|
|
|
348
351
|
x = x.to_s if x.is_a?(Float)
|
|
349
352
|
|
|
350
353
|
BigDecimal(x, digits)
|
|
351
|
-
end.i18n_key(*error_keys).json_schema(type: 'string')
|
|
354
|
+
end.i18n_key(*error_keys).json_schema(type: 'string') & finite_value(error_key)
|
|
352
355
|
end
|
|
353
356
|
|
|
354
357
|
def array(error_key = nil)
|
|
@@ -428,7 +431,7 @@ module Datacaster
|
|
|
428
431
|
check { |x| x < max }
|
|
429
432
|
end
|
|
430
433
|
|
|
431
|
-
numeric(error_key) & caster.i18n_key(*error_keys, max:)
|
|
434
|
+
numeric(error_key, finite: false) & caster.i18n_key(*error_keys, max:)
|
|
432
435
|
end
|
|
433
436
|
|
|
434
437
|
def minimum(min, error_key = nil, inclusive: true)
|
|
@@ -446,7 +449,7 @@ module Datacaster
|
|
|
446
449
|
check { |x| x > min }
|
|
447
450
|
end
|
|
448
451
|
|
|
449
|
-
numeric(error_key) & caster.i18n_key(*error_keys, min:)
|
|
452
|
+
numeric(error_key, finite: false) & caster.i18n_key(*error_keys, min:)
|
|
450
453
|
end
|
|
451
454
|
|
|
452
455
|
def string(error_key = nil)
|
|
@@ -523,7 +526,7 @@ module Datacaster
|
|
|
523
526
|
|
|
524
527
|
Trier.new([ArgumentError, TypeError]) do |x|
|
|
525
528
|
Float(x)
|
|
526
|
-
end.i18n_key(*error_keys).json_schema(type: 'number', format: 'float')
|
|
529
|
+
end.i18n_key(*error_keys).json_schema(type: 'number', format: 'float') & finite_value(error_key)
|
|
527
530
|
end
|
|
528
531
|
|
|
529
532
|
def to_integer(error_key = nil)
|
|
@@ -538,5 +541,14 @@ module Datacaster
|
|
|
538
541
|
def optional_param(base)
|
|
539
542
|
transform_if_present { |x| x == '' ? Datacaster::Absent.instance : x } & (absent | base)
|
|
540
543
|
end
|
|
544
|
+
|
|
545
|
+
private
|
|
546
|
+
|
|
547
|
+
# Expects a Numeric, rejects Infinity and NaN.
|
|
548
|
+
def finite_value(error_key = nil)
|
|
549
|
+
error_keys = ['.finite', 'datacaster.errors.finite']
|
|
550
|
+
error_keys.unshift(error_key) if error_key
|
|
551
|
+
check(&:finite?).i18n_key(*error_keys)
|
|
552
|
+
end
|
|
541
553
|
end
|
|
542
554
|
end
|
data/lib/datacaster/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: datacaster
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version:
|
|
4
|
+
version: 7.0.0
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Eugene Zolotarev
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: exe
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2026-
|
|
11
|
+
date: 2026-11-18 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: activemodel
|