datacaster 4.0.1 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9709949f8f91c24538332b215d2d08af58a7b1e83869dcde0198512889b1775c
-  data.tar.gz: 791d875d336e229796f302b448256b6b4ad1a3d6f10e10702af49a3cbb6faf4e
+  metadata.gz: 313d4857ebb527af62b00822c82ae25ca81d143fac6d46586704efda3337907d
+  data.tar.gz: cafec5e89d47418b72a3b9a9123699d2c4d8c479f8d7720739f4dd59b47e4d72
 SHA512:
-  metadata.gz: 7631f63485017a7c431993b80ecb9795c060e02c8742a2cf82400866b578e244caa9d2e783769cf7b3d153336d8242790c68daf652c6d53fdbe94f387230a1bc
-  data.tar.gz: 551810cf2025496263579b9b3bfd051970a5149a08bf51fd6ac7a4b6ad40fc74b8819fb3e941e7738a8e2e826f75ac5119759864ea740826e95ca3c30d9e316a
+  metadata.gz: 7929550a2f1ca7c0b3002ccb32b27336a094737647d0aaaffcdc54001d1084ebfebc8c168b98096e59b7d990cccb1dc8e495cf4a4dcd9fbf0cb1168117f43ba1
+  data.tar.gz: 2a7fa2d4528c014fefd3c701c797566ea6eb9bcee08442bbe79f3fa881f9adb473e8424d909b05f0e0a2109ce79265bafb6b700b4873cb89778ab2ff601698c2

data/README.md

@@ -26,10 +26,13 @@ It is currently used in production in several projects (mainly as request parame
     - [`float(error_key = nil)`](#floaterror_key--nil)
     - [`hash_value(error_key = nil)`](#hash_valueerror_key--nil)
     - [`integer(error_key = nil)`](#integererror_key--nil)
+    - [`numeric(error_key = nil)`](#numericerror_key--nil)
     - [`string(error_key = nil)`](#stringerror_key--nil)
   - [Convenience types](#convenience-types)
     - [`hash_with_symbolized_keys(error_key = nil)`](#hash_with_symbolized_keyserror_key--nil)
     - [`integer32(error_key = nil)`](#integer32error_key--nil)
+    - [`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)
     - [`pattern(regexp, error_key = nil)`](#patternregexp-error_key--nil)
     - [`uuid(error_key = nil)`](#uuiderror_key--nil)
@@ -500,6 +503,12 @@ Returns ValidResult if and only if provided value is an integer. Doesn't transfo
 
 I18n keys: `error_key`, `'.integer'`, `'datacaster.errors.integer'`.
 
+#### `numeric(error_key = nil)`
+
+Returns ValidResult if and only if provided value is a number (Ruby's `Numeric`). Doesn't transform the value.
+
+I18n keys: `error_key`, `'.numeric'`, `'datacaster.errors.numeric'`.
+
 #### `string(error_key = nil)`
 
 Returns ValidResult if and only if provided value is a string. Doesn't transform the value.
@@ -523,6 +532,26 @@ I18n keys:
 * not an integer – `error_key`, `'.integer'`, `'datacaster.errors.integer'`
 * too big – `error_key`, `'.integer32'`, `'datacaster.errors.integer32'`
 
+#### `maximum(max, error_key = nil, inclusive: true)`
+
+Returns ValidResult if and only if provided value is a number and is less than `max`. If `inclusive` set to true, provided value should be less than or equal to `max`. Doesn't transform the value.
+
+I18n keys:
+
+* not a number – `error_key`, `'.numeric'`, `'datacaster.errors.numeric'`
+* is less (when `inclusive` is `true`) – `error_key`, `'.maximum.lteq'`, `'datacaster.errors.maximum.lteq'`
+* is less (when `inclusive` is `false`) – `error_key`, `'.maximum.lt'`, `'datacaster.errors.maximum.lt'`
+
+#### `minimum(min, error_key = nil, inclusive: true)`
+
+Returns ValidResult if and only if provided value is a number and is greater than `min`. If `inclusive` set to true, provided value should be greater than or equal to `min`. Doesn't transform the value.
+
+I18n keys:
+
+* not a number – `error_key`, `'.numeric'`, `'datacaster.errors.numeric'`
+* is greater (when `inclusive` is `true`) – `error_key`, `'.minimum.gteq'`, `'datacaster.errors.minimum.gteq'`
+* is greater (when `inclusive` is `false`) – `error_key`, `'.minimum.gt'`, `'datacaster.errors.minimum.gt'`
+
 #### `non_empty_string(error_key = nil)`
 
 Returns ValidResult if and only if provided value is a string and is not empty. Doesn't transform the value.
@@ -1547,6 +1576,18 @@ schema.with_context(five: 15).(nil)
 # => Datacaster::ValidResult(nil)
 ```
 
+Method `has_key?` could be used to determine whether key is available in the context
+
+```ruby
+schema =
+  Datacaster.schema do
+    check { context.has_key?(:five) }
+  end
+
+schema.with_context(five: 15).(nil)
+# => Datacaster::ValidResult(nil)
+```
+
 **Note**
 
 `context` can be accesed only in casters' blocks. It can't be used in schema definition itself:

data/config/locales/en.yml

@@ -15,7 +15,14 @@ en:
       integer: is not an integer
       integer32: is not a 32-bit integer
       iso8601: is not a string with ISO-8601 date and time
+      maximum:
+        lt: '%{value} should be less than %{max}'
+        lteq: '%{value} should be less than or equal to %{max}'
+      minimum:
+        gt: '%{value} should be greater than %{min}'
+        gteq: '%{value} should be greater than or equal to %{min}'
       must_be: "is not %{reference}"
+      numeric: is not a number
       pattern: has invalid format
       relate: "%{left} should be %{op} %{right}"
       responds_to: "does not respond to %{reference}"

data/lib/datacaster/predefined.rb

@@ -296,6 +296,12 @@ module Datacaster
 
     # Strict types
 
+    def numeric(error_key = nil)
+      error_keys = ['.numeric', 'datacaster.errors.numeric']
+      error_keys.unshift(error_key) if error_key
+      check { |x| x.is_a?(Numeric) }.i18n_key(*error_keys)
+    end
+
     def decimal(digits = 8, error_key = nil)
       error_keys = ['.decimal', 'datacaster.errors.decimal']
       error_keys.unshift(error_key) if error_key
@@ -355,6 +361,42 @@ module Datacaster
       integer(error_key) & check { |x| x.abs <= 2_147_483_647 }.i18n_key(*error_keys)
     end
 
+    def maximum(max, error_key = nil, inclusive: true)
+      subkey = 'lt'
+      subkey += 'eq' if inclusive
+
+      error_keys = [".maximum.#{subkey}", "datacaster.errors.maximum.#{subkey}"]
+
+      error_keys.unshift(error_key) if error_key
+
+      caster =
+        if inclusive
+          check { |x| x <= max }
+        else
+          check { |x| x < max }
+        end
+
+      numeric(error_key) & caster.i18n_key(*error_keys, max:)
+    end
+
+    def minimum(min, error_key = nil, inclusive: true)
+      subkey = 'gt'
+      subkey += 'eq' if inclusive
+
+      error_keys = [".minimum.#{subkey}", "datacaster.errors.minimum.#{subkey}"]
+
+      error_keys.unshift(error_key) if error_key
+
+      caster =
+        if inclusive
+          check { |x| x >= min }
+        else
+          check { |x| x > min }
+        end
+
+      numeric(error_key) & caster.i18n_key(*error_keys, min:)
+    end
+
     def string(error_key = nil)
       error_keys = ['.string', 'datacaster.errors.string']
       error_keys.unshift(error_key) if error_key

data/lib/datacaster/runtimes/user_context.rb

@@ -4,6 +4,10 @@ module Datacaster
   module Runtimes
     class UserContext < Base
       class ContextStruct
+        def self.context_has_key?(context, key)
+          context.respond_to?(:key?) && context.key?(key) || context.to_h.key?(key.to_sym)
+        end
+
         def initialize(context, node)
           @context = context
           @node = node
@@ -14,10 +18,7 @@ module Datacaster
             return super
           end
 
-          key_present = @context.respond_to?(:key?) && @context.key?(m) ||
-            @context.to_h.key?(m.to_sym)
-
-          if key_present && args.empty?
+          if self.class.context_has_key?(@context, m) && args.empty?
             return @context[m]
           end
 
@@ -31,6 +32,12 @@ module Datacaster
             raise NoMethodError.new("Key #{m.inspect} is not found in the context")
           end
         end
+
+        def has_key?(key)
+          self.class.context_has_key?(@context, key) || @node.class.send_to_parent(@node, :context).has_key?(key)
+        rescue NoMethodError
+          false
+        end
       end
 
       def initialize(parent, user_context)

data/lib/datacaster/version.rb

@@ -1,3 +1,3 @@
 module Datacaster
-  VERSION = "4.0.1"
+  VERSION = "4.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datacaster
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.2.0
 platform: ruby
 authors:
 - Eugene Zolotarev
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-10-08 00:00:00.000000000 Z
+date: 2025-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -106,7 +106,7 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '3'
-description: 
+description:
 email:
 - eugzol@gmail.com
 executables: []
@@ -178,7 +178,7 @@ licenses:
 - MIT
 metadata:
   source_code_uri: https://github.com/EugZol/datacaster
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -193,8 +193,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.21
-signing_key: 
+rubygems_version: 3.5.20
+signing_key:
 specification_version: 4
 summary: Run-time type checker and transformer for Ruby
 test_files: []