datacaster 3.2.6 → 3.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c44e05c449320297096373bd48d942aae81776c5ad358f831215d875628d0ce2
-  data.tar.gz: 831752e1d0028d3d9e3d9423e515c34b587d13aecdcd24be4b12a1d74d073b61
+  metadata.gz: 7e5f8dec00cd9987c6efe8bbf54939b6a4df8604cffb7bc2be43d3e97fc8c8b7
+  data.tar.gz: a2bf2ab038537307304aade93ec9143fe489ece282ffb6d1bb92cdbe0d241de9
 SHA512:
-  metadata.gz: eb18dda544b94751ed2d389e3191d9372f0e9323a162c489fc10731da26cc643d2151ff55a600152dea496d1831251b24bfc00ebf294b13b22a2954f64173cae
-  data.tar.gz: ae9c906810ff03d978b5b85c07a6042750ad92ed46dbe7ea55318a3a1a61ab85ba2854482de5d9c34aa234aed1c687730d1ff4ee80b8232a8a42a28daeecdfa0
+  metadata.gz: 4a99eaac0cfdb79b651ea7056dd77e279768e0ad0123107fb26f211cfe5d0bd605b0bfd19b649ac6041ac8a527c1314b5202ba790c2dfbea5bd85363a06756a6
+  data.tar.gz: d351457a3693f7a919fe0252cfc664973231c91c7b50dd2404beb4bfefa4d515541147272bafbf9fd53b109e6565f04fd4202adaa9fa347587422f0342b08be4

data/README.md

@@ -31,6 +31,8 @@ It is currently used in production in several projects (mainly as request parame
     - [`hash_with_symbolized_keys(error_key = nil)`](#hash_with_symbolized_keyserror_key--nil)
     - [`integer32(error_key = nil)`](#integer32error_key--nil)
     - [`non_empty_string(error_key = nil)`](#non_empty_stringerror_key--nil)
+    - [`pattern(regexp, error_key = nil)`](#patternregexp-error_key--nil)
+    - [`uuid(error_key = nil)`](#uuiderror_key--nil)
   - [Special types](#special-types)
     - [`absent(error_key = nil, on: nil)`](#absenterror_key--nil-on-nil)
     - [`any(error_key = nil)`](#anyerror_key--nil)
@@ -525,9 +527,29 @@ I18n keys:
 
 Returns ValidResult if and only if provided value is a string and is not empty. Doesn't transform the value.
 
+I18n keys:
+
 * not a string – `error_key`, `'.string'`, `'datacaster.errors.string'`
 * is empty – `error_key`, `'.non_empty_string'`, `'datacaster.errors.non_empty_string'`
 
+#### `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.
+
+I18n keys:
+
+* not a string – `error_key`, `'.string'`, `'datacaster.errors.string'`
+* doesn't satisfy the regexp – `error_key`, `'.pattern'`, `'datacaster.errors.pattern'`
+
+#### `uuid(error_key = nil)`
+
+Returns ValidResult if and only if provided value is a string and UUID. Doesn't transform the value.
+
+I18n keys:
+
+* not a string – `error_key`, `'.string'`, `'datacaster.errors.string'`
+* not UUID – `error_key`, `'.uuid'`, `'datacaster.errors.uuid'`
+
 ### Special types
 
 #### `absent(error_key = nil, on: nil)`
@@ -1327,7 +1349,7 @@ CommonValidator =
   end
 
 PersonValidator =
-  Datacaster.schema do
+  Datacaster.partial_schema do
     hash_schema(
       name: string
     )

data/config/locales/en.yml

@@ -16,6 +16,7 @@ en:
       integer32: is not a 32-bit integer
       iso8601: is not a string with ISO-8601 date and time
       must_be: "is not %{reference}"
+      pattern: has invalid format
       relate: "%{left} should be %{op} %{right}"
       responds_to: "does not respond to %{reference}"
       string: is not a string
@@ -25,3 +26,4 @@ en:
       non_empty_string: should be non-empty string
       switch: is invalid
       try: raised an error
+      uuid: is not UUID

data/lib/datacaster/context_nodes/structure_cleaner.rb

@@ -24,10 +24,15 @@ module Datacaster
       def transform_result(result)
         return result unless result.valid?
         result = cast_success(result)
-        parent_runtime = @runtime.instance_variable_get(:@parent)
-        if parent_runtime.respond_to?(:checked_schema!)
-          parent_runtime.checked_schema!(@runtime.checked_schema)
+
+        # Notify parent runtime of current runtime's schema
+        unless @runtime.unchecked?
+          parent_runtime = @runtime.instance_variable_get(:@parent)
+          if parent_runtime.respond_to?(:checked_schema!)
+            parent_runtime.checked_schema!(@runtime.checked_schema)
+          end
         end
+
         result
       end
 

data/lib/datacaster/predefined.rb

@@ -319,6 +319,12 @@ module Datacaster
       check { |x| x.is_a?(Float) }.i18n_key(*error_keys)
     end
 
+    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)
+    end
+
     # 'hash' would be a bad method name, because it would override built in Object#hash
     def hash_value(error_key = nil)
       error_keys = ['.hash_value', 'datacaster.errors.hash_value']
@@ -360,6 +366,12 @@ module Datacaster
       string(error_key) & check { |x| !x.empty? }.i18n_key(*error_keys)
     end
 
+    def uuid(error_key = nil)
+      error_keys = ['.uuid', 'datacaster.errors.uuid']
+      error_keys.unshift(error_key) if error_key
+      string(error_key) & pattern(/\A\h{8}-\h{4}-\h{4}-\h{4}-\h{12}\z/).i18n_key(*error_keys)
+    end
+
     # Form request types
 
     def iso8601(error_key = nil)

data/lib/datacaster/runtimes/structure_cleaner.rb

@@ -47,6 +47,7 @@ module Datacaster
           @pointer_stack[-1] = true
         # Child runtime's schema should be merged with current runtime's schema
         else
+          will_check!
           @pointer_stack[-1].merge!(schema)
         end
       end

data/lib/datacaster/version.rb

@@ -1,3 +1,3 @@
 module Datacaster
-  VERSION = "3.2.6"
+  VERSION = "3.2.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datacaster
 version: !ruby/object:Gem::Version
-  version: 3.2.6
+  version: 3.2.8
 platform: ruby
 authors:
 - Eugene Zolotarev
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-02-13 00:00:00.000000000 Z
+date: 2024-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel