datacaster 6.0.1 → 6.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0072ba53600fb794462c13dba4fe31c9134aac67e5a7687f0e91e17483cf10b1
-  data.tar.gz: b35c2f8b667d884bcf641be2d79747c65a68b97a7da20abc718776b3fe532af6
+  metadata.gz: 530416943895584aa390aeb22eec1724349a073ff782f56e575d679c700eb636
+  data.tar.gz: 2281df272c23df501134a4b7ad1c0471065cae708b613d5e6c3b74e3ddb6bef7
 SHA512:
-  metadata.gz: 16903213c77a60b38d8a034ac88b39deaddf926474fcc9eeb575c7633d4742a3aab51c1a6e56b094bcbbc6dff5ae5ed5911a9c4e17bd12cc14df51f1f230e790
-  data.tar.gz: 5f3da501cb763c39f330cc8406bbd9a4e6db76db255612884c92fbb89a5fca0f8d8f81f72295941bc078b969bf5a3f1e2cfd1552eccda9cff30930c244398961
+  metadata.gz: 23c2bda85de1bab4c3b5e75b274fde4b8caae866a0c2c399b819654b242f915663adebec136bebbc5ce6ce272f00a9c1e9551e9a9acb0c3d7a53dc6231347080
+  data.tar.gz: a953b5397a17a02c3b0833e0e4ab914d3ca8b8c712eccb58be0342ed9e10083e62b06c951e8e8b313a26c13a28be16e1ac83be9db6b2ad1ce98befef4a9e9e78

data/README.md

@@ -34,6 +34,7 @@ It is currently used in production in several projects (mainly as request parame
     - [`maximum(max, error_key = nil, inclusive: true)`](#maximummax-error_key--nil-inclusive-true)
     - [`minimum(min, error_key = nil, inclusive: true)`](#minimummin-error_key--nil-inclusive-true)
     - [`non_empty_string(error_key = nil)`](#non_empty_stringerror_key--nil)
+    - [`non_empty_array(error_keys = {}`](#non_empty_arrayerror_keys--)
     - [`pattern(regexp, error_key = nil)`](#patternregexp-error_key--nil)
     - [`uuid(error_key = nil)`](#uuiderror_key--nil)
   - [Special types](#special-types)
@@ -159,7 +160,7 @@ validator.("test")  # Datacaster::ErrorResult(["is invalid"])
 
 In the code above we ensure that validated value is:
 
-a) a string,  
+a) a string,\
 b) has length > 5.
 
 If first condition is not met, second one is not evaluated at all (i.e. evaluation is always "short-circuit", just as one might expect).
@@ -203,9 +204,9 @@ Validating hashes is the main case scenario for datacaster. Several specific con
 
 Let's assume we want to validate that a hash (which represents data about a person):
 
-a) is, in fact, a Hash;  
-b) has exactly 2 keys, `name` and `salary`,  
-c) key 'name' is a string,  
+a) is, in fact, a Hash;\
+b) has exactly 2 keys, `name` and `salary`,\
+c) key 'name' is a string,\
 d) key 'salary' is an integer:
 
 ```ruby
@@ -561,6 +562,15 @@ I18n keys:
 * not a string – `error_key`, `'.string'`, `'datacaster.errors.string'`
 * is empty – `error_key`, `'.non_empty_string'`, `'datacaster.errors.non_empty_string'`
 
+#### `non_empty_array(error_keys = {})`
+
+Returns ValidResult if and only if provided value is an array and is not empty. Doesn't transform the value.
+
+I18n keys:
+
+* not an array – `error_keys[:array]`, `'.array'`, `'datacaster.errors.array'`
+* empty array – `error_keys[:empty]`, `'.empty'`, `'datacaster.errors.empty'`
+
 #### `pattern(regexp, error_key = nil)`
 
 Returns ValidResult if and only if provided value is a string and satisfies regexp. Doesn't transform the value. Don't forget to provide start/end markers in the regexp if needed, e.g. `/\A\d+\z/` for digits-only string.
@@ -742,7 +752,7 @@ I18n keys:
 
 Returns ValidResult if and only if the value `#is_a?(klass)`. Doesn't transform the value.
 
-I18n keys: `error_key`,  `'.must_be'`, `'datacaster.errors.must_be'`. Adds `reference` i18n variable, setting it to `klass.name`. 
+I18n keys: `error_key`,  `'.must_be'`, `'datacaster.errors.must_be'`. Adds `reference` i18n variable, setting it to `klass.name`.
 
 #### `optional(base, on: nil)`
 
@@ -1162,12 +1172,12 @@ Notice that extra keys of inner hashes could be validated only if each element i
 
 Formally, `array_of(x, error_keys = {})` will return ValidResult if and only if:
 
-a) provided value implements basic array methods (`#map`, `#zip`),  
-b) provided value is not `#empty?`,  
+a) provided value implements basic array methods (`#map`, `#zip`),\
+b) provided value is not `#empty?`,\
 c) each element of the provided value passes validation of `x`.
 
-If a) fails, `ErrorResult(["should be an array"]) is returned. 
-If b) fails, `ErrorResult(["should not be empty"])` is returned.  
+If a) fails, `ErrorResult(["should be an array"])` is returned.\
+If b) fails, `ErrorResult(["should not be empty"])` is returned.\
 If c) fails, `ErrorResult({0 => ..., 1 => ...})` is returned. Wrapped hash contains keys which correspond to initial array's indices, and values correspond to failure returned from `x` validator, called for the corresponding element.
 
 Array schema transforms array if inner type (`x`) transforms element (in this case `array_schema` works more or less like `map` function). Otherwise, it doesn't transform.
@@ -1201,12 +1211,12 @@ person.(name: "John Smith", salary: "100_000")
 
 Formally, hash schema returns ValidResult if and only if:
 
-a) provided value `is_a?(Hash)`,  
-b) all values, fetched by keys mentioned in `hash_schema(...)` definition, pass corresponding validations,  
+a) provided value `is_a?(Hash)`,\
+b) all values, fetched by keys mentioned in `hash_schema(...)` definition, pass corresponding validations,\
 c) after all checks (including logical operators), there are no unchecked keys in the hash.
 
-If a) fails, `ErrorResult(["is not a hash"])` is returned.  
-if b) fails, `ErrorResult(key1 => [errors...], key2 => [errors...])` is returned. Each key of wrapped "error hash" corresponds to the key of validated hash, and each value of "error hash" contains array of errors, returned by the corresponding validator.  
+If a) fails, `ErrorResult(["is not a hash"])` is returned.\
+if b) fails, `ErrorResult(key1 => [errors...], key2 => [errors...])` is returned. Each key of wrapped "error hash" corresponds to the key of validated hash, and each value of "error hash" contains array of errors, returned by the corresponding validator.\
 If b) is fulfilled, then and only then validated hash is checked for extra keys. If they are found, `ErrorResult(extra_key_1 => ["should be absent"], ...)` is returned.
 
 I18n keys:
@@ -1500,10 +1510,10 @@ Of course, order of keys in the definition hash doesn't change the result.
 
 Formally, `transform_to_hash`:
 
-a) transforms (any) value to hash;  
-b) this hash will contain keys listed in `transform_to_hash` definition;  
-c) value of these keys will be: initial value (*not the corresponding key of it, the value altogether*) transformed with the corresponding validator/type;  
-d) if any of the values from c) happen to be `Datacaster.absent`, this value *with its key* is removed from the resultant hash;  
+a) transforms (any) value to hash;\
+b) this hash will contain keys listed in `transform_to_hash` definition;\
+c) value of these keys will be: initial value (*not the corresponding key of it, the value altogether*) transformed with the corresponding validator/type;\
+d) if any of the values from c) happen to be `Datacaster.absent`, this value *with its key* is removed from the resultant hash;\
 e) if the initial value happens to also be a hash, all its unvalidated (unused) keys are merged to the resultant hash.
 
 `transform_to_hash` will return ValidResult if and only if all transformations return ValidResults.

data/datacaster.gemspec

@@ -29,4 +29,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'dry-monads', '>= 1.3', '< 1.4'
 
   spec.add_runtime_dependency 'zeitwerk', '>= 2', '< 3'
+  spec.add_runtime_dependency 'js_regex'
 end

data/lib/datacaster/predefined.rb

@@ -1,3 +1,5 @@
+require 'js_regex'
+
 module Datacaster
   module Predefined
     extend self
@@ -363,8 +365,12 @@ module Datacaster
     def pattern(regexp, error_key = nil)
       error_keys = ['.pattern', 'datacaster.errors.pattern']
       error_keys.unshift(error_key) if error_key
-      string(error_key) & check { |x| x.match?(regexp) }.i18n_key(*error_keys, reference: regexp.inspect).
-        json_schema(pattern: regexp.inspect)
+
+      ecma_regexp = JsRegex.new(regexp).to_s
+
+      string(error_key) & check { |x| x.match?(regexp) }.
+        i18n_key(*error_keys, reference: ecma_regexp).
+        json_schema(pattern: ecma_regexp)
     end
 
     # 'hash' would be a bad method name, because it would override built in Object#hash
@@ -451,10 +457,16 @@ module Datacaster
       string(error_key) & check { |x| !x.empty? }.i18n_key(*error_keys)
     end
 
+    def non_empty_array(error_keys = {})
+      array_of(any, error_keys, allow_empty: false)
+    end
+
     def uuid(error_key = nil)
       error_keys = ['.uuid', 'datacaster.errors.uuid']
       error_keys.unshift(error_key) if error_key
-      pattern(/\A\h{8}-\h{4}-\h{4}-\h{4}-\h{12}\z/, error_key).i18n_key(*error_keys)
+      pattern(/\A\h{8}-\h{4}-\h{4}-\h{4}-\h{12}\z/, error_key).
+        i18n_key(*error_keys).
+        json_schema { { 'type' => 'string', 'format' => 'uuid' } }
     end
 
     # Form request types

data/lib/datacaster/version.rb

@@ -1,3 +1,3 @@
 module Datacaster
-  VERSION = "6.0.1"
+  VERSION = "6.0.3"
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: datacaster
 version: !ruby/object:Gem::Version
-  version: 6.0.1
+  version: 6.0.3
 platform: ruby
 authors:
 - Eugene Zolotarev
-autorequire: 
 bindir: exe
 cert_chain: []
-date: 2025-10-14 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -106,7 +105,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '3'
-description: 
+- !ruby/object:Gem::Dependency
+  name: js_regex
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 email:
 - eugzol@gmail.com
 executables: []
@@ -181,7 +193,6 @@ licenses:
 - MIT
 metadata:
   source_code_uri: https://github.com/EugZol/datacaster
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -196,8 +207,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Run-time type checker and transformer for Ruby
 test_files: []