datacaster 6.0.3 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 530416943895584aa390aeb22eec1724349a073ff782f56e575d679c700eb636
-  data.tar.gz: 2281df272c23df501134a4b7ad1c0471065cae708b613d5e6c3b74e3ddb6bef7
+  metadata.gz: 01b7b515fe0b568974d1278356098f73459b80550132061b33cd87aec5d19551
+  data.tar.gz: e2d08e1e016df1221b40fcafe0fc6b47f430c0a899c8d1f1519e9e06157070fe
 SHA512:
-  metadata.gz: 23c2bda85de1bab4c3b5e75b274fde4b8caae866a0c2c399b819654b242f915663adebec136bebbc5ce6ce272f00a9c1e9551e9a9acb0c3d7a53dc6231347080
-  data.tar.gz: a953b5397a17a02c3b0833e0e4ab914d3ca8b8c712eccb58be0342ed9e10083e62b06c951e8e8b313a26c13a28be16e1ac83be9db6b2ad1ce98befef4a9e9e78
+  metadata.gz: ee0e18d9b8a2ac16de10dee56785bbcb53a014e0b6480a5f36c48cdff23694061de7d80ab6cc56090f9e435c65efb4b91086fd9e84f7fc6a3dd7d62c750a9a83
+  data.tar.gz: 64c6f333f085f4933e8b093e8feb66a964d4cf4a2797e65ae236c31e618f7aa86becb3be5b99791928161f6b9f7e0e19124ca8ef03bdcc501fb0b7320c5a68dd

data/lib/datacaster/context_node.rb

@@ -5,9 +5,9 @@ module Datacaster
     end
 
     def cast(object, runtime:)
-      @runtime = create_runtime(runtime)
-      result = @base.with_runtime(@runtime).call(object)
-      transform_result(result)
+      runtime = create_runtime(runtime)
+      result = @base.with_runtime(runtime).call(object)
+      transform_result(result, runtime)
     end
 
     def to_json_schema
@@ -28,23 +28,19 @@ module Datacaster
       parent
     end
 
-    def runtime
-      @runtime
-    end
-
-    def transform_result(result)
+    def transform_result(result, runtime)
       if result.valid?
-        Datacaster.ValidResult(transform_success(result.value))
+        Datacaster.ValidResult(transform_success(result.value, runtime))
       else
-        Datacaster.ErrorResult(transform_errors(result.raw_errors))
+        Datacaster.ErrorResult(transform_errors(result.raw_errors, runtime))
       end
     end
 
-    def transform_success(value)
+    def transform_success(value, _runtime)
       value
     end
 
-    def transform_errors(errors)
+    def transform_errors(errors, _runtime)
       errors
     end
   end

data/lib/datacaster/context_nodes/errors_caster.rb

@@ -8,8 +8,8 @@ module Datacaster
 
       private
 
-      def transform_errors(errors)
-        result = @caster.with_runtime(@runtime).(errors)
+      def transform_errors(errors, runtime)
+        result = @caster.with_runtime(runtime).(errors)
         if result.valid?
           result.value
         else

data/lib/datacaster/context_nodes/i18n.rb

@@ -12,7 +12,7 @@ module Datacaster
         Runtimes::I18n.new(parent)
       end
 
-      def transform_errors(errors)
+      def transform_errors(errors, runtime)
         @i18n_value.with_args(runtime.args) * errors
       end
     end

data/lib/datacaster/context_nodes/i18n_keys_mapper.rb

@@ -9,7 +9,7 @@ module Datacaster
 
       private
 
-      def transform_errors(errors)
+      def transform_errors(errors, _runtime)
         return errors unless errors.length == 1 && errors.is_a?(Array)
 
         error = errors.first

data/lib/datacaster/context_nodes/pass_if.rb

@@ -2,8 +2,7 @@ module Datacaster
   module ContextNodes
     class PassIf < Datacaster::ContextNode
       def cast(object, runtime:)
-        @runtime = create_runtime(runtime)
-        result = @base.with_runtime(@runtime).call(object)
+        result = @base.with_runtime(create_runtime(runtime)).call(object)
         result.valid? ? Datacaster::ValidResult(object) : result
       end
     end

data/lib/datacaster/context_nodes/structure_cleaner.rb

@@ -21,26 +21,26 @@ module Datacaster
         Runtimes::StructureCleaner.new(parent)
       end
 
-      def transform_result(result)
+      def transform_result(result, runtime)
         return result unless result.valid?
-        result = cast_success(result)
+        result = cast_success(result, runtime)
 
         # Notify parent runtime of current runtime's schema
-        unless @runtime.unchecked?
-          parent_runtime = @runtime.instance_variable_get(:@parent)
+        unless runtime.unchecked?
+          parent_runtime = runtime.instance_variable_get(:@parent)
           if parent_runtime.respond_to?(:checked_schema!)
-            parent_runtime.checked_schema!(@runtime.checked_schema)
+            parent_runtime.checked_schema!(runtime.checked_schema)
           end
         end
 
         result
       end
 
-      def cast_success(result)
+      def cast_success(result, runtime)
         return result if @strategy == :pass
-        return result if @runtime.unchecked?
+        return result if runtime.unchecked?
 
-        cast_value(result, @runtime.checked_schema)
+        cast_value(result, runtime.checked_schema)
       end
 
       def cast_value(result, schema)

data/lib/datacaster/message_keys_merger.rb

@@ -7,11 +7,12 @@ module Datacaster
     def cast(object, runtime:)
       return Datacaster.ErrorResult(I18nValues::Key.new(['.hash_value', 'datacaster.errors.hash_value'], value: object)) unless object.is_a?(Hash)
 
-      result = set_initial_value(object)
+      hash_merger = @keys.any? { |k| object[k].is_a?(Hash) }
+      result = hash_merger ? {} : []
 
       @keys.each do |k|
         result =
-          if need_hash_merger?(object)
+          if hash_merger
             merge_hash(result, object[k])
           else
             merge_array_or_scalar(result, object[k])
@@ -27,15 +28,6 @@ module Datacaster
 
     private
 
-    def set_initial_value(object)
-      need_hash_merger?(object) ? {} : []
-    end
-
-    def need_hash_merger?(object)
-      @need_hash_merger =
-        @need_hash_merger.nil? ? @keys.any? { |k| object[k].is_a?(Hash) } : @need_hash_merger
-    end
-
     def merge_array_or_scalar(unit, merge_with)
       merge_with = [merge_with] unless merge_with.is_a?(Array)
       unit = [unit] unless unit.is_a?(Array)

data/lib/datacaster/or_node.rb

@@ -6,7 +6,7 @@ module Datacaster
     end
 
     def cast(object, runtime:)
-      left_result = @left.with_runtime(runtime).(object)
+      left_result = runtime.record_checks_on_success { @left.with_runtime(runtime).(object) }
 
       return left_result if left_result.valid?
 

data/lib/datacaster/predefined.rb

@@ -161,17 +161,17 @@ module Datacaster
         return (absent | base).json_schema { base.to_json_schema }.json_schema_attributes(required: false)
       end
 
-      caster = cast do |x|
-        if x == Datacaster.absent ||
-          (!on.nil? && x.respond_to?(on) && x.public_send(on))
-          Datacaster.ValidResult(Datacaster.absent)
-        else
-          base.(x)
-        end
+      unless on.is_a?(Symbol)
+        raise RuntimeError, "`on` should be a Symbol"
       end
 
+      caster =
+        absent |
+          (check { |x| x.respond_to?(on) && x.public_send(on) } & transform { Datacaster.absent }) |
+          base
+
       caster
-        .json_schema(base.to_json_schema)
+        .json_schema { base.to_json_schema }
         .json_schema_attributes(required: false)
     end
 
@@ -342,6 +342,11 @@ module Datacaster
         # strictly validate format of string, BigDecimal() doesn't do that
         Float(x)
 
+        # BigDecimal(Float, digits) keeps `digits` significant digits, so
+        # BigDecimal(1234567.89, 8) is 1234567.9. The Float's own string
+        # form parses exactly: BigDecimal("1234567.89") is 1234567.89.
+        x = x.to_s if x.is_a?(Float)
+
         BigDecimal(x, digits)
       end.i18n_key(*error_keys).json_schema(type: 'string')
     end

data/lib/datacaster/runtimes/base.rb

@@ -38,6 +38,10 @@ module Datacaster
         !@parent.nil? && @parent.respond_to?(m, include_private)
       end
 
+      def record_checks_on_success(&block)
+        @parent ? @parent.record_checks_on_success(&block) : yield
+      end
+
       def after_call!(sender)
         @parent.after_call!(sender) if @parent
       end

data/lib/datacaster/runtimes/structure_cleaner.rb

@@ -21,8 +21,9 @@ module Datacaster
           return
         end
 
-        @pointer_stack.last[key] ||= {}
-        @pointer_stack.push(@pointer_stack.last[key])
+        entry = (@pointer_stack.last[key] ||= {})
+        # A key checked unconditionally stays so; checks made inside it are dropped
+        @pointer_stack.push(entry == true ? {} : entry)
         @should_check_stack.push(false)
         result = yield if block_given?
         was_checked = @should_check_stack.pop
@@ -53,10 +54,33 @@ module Datacaster
         # Child runtime's schema should be merged with current runtime's schema
         else
           will_check!
-          @pointer_stack[-1].merge!(schema)
+          Utils.merge_checks!(@pointer_stack[-1], schema)
         end
       end
 
+      # Records the checks made by the block only if its result is valid,
+      # as a nested schema reports its checks to the parent only on success
+      def record_checks_on_success
+        level = @pointer_stack[-1]
+        saved_should_check = @should_check_stack[-1]
+        @pointer_stack[-1] = {}
+
+        result = yield
+        branch = @pointer_stack[-1]
+        @pointer_stack[-1] = level
+
+        if result.valid?
+          if branch == true
+            @pointer_stack[-1] = true unless level == true
+          elsif level != true
+            Utils.merge_checks!(level, branch)
+          end
+        else
+          @should_check_stack[-1] = saved_should_check
+        end
+        result
+      end
+
       def ignore_checks!(&block)
         @ignore = true
         result = yield

data/lib/datacaster/switch_node.rb

@@ -63,7 +63,7 @@ module Datacaster
       end
 
       @ons.each do |check, clause|
-        result = check.with_runtime(runtime).(switch_result)
+        result = runtime.record_checks_on_success { check.with_runtime(runtime).(switch_result) }
         next unless result.valid?
 
         runtime.checked_key!(@pick_key) if !@pick_key.nil? && !@pick_key.is_a?(Array)

data/lib/datacaster/then_node.rb

@@ -17,7 +17,7 @@ module Datacaster
         raise ArgumentError.new('Datacaster: use "a & b" instead of "a.then(b)" when there is no else-clause')
       end
 
-      left_result = @left.with_runtime(runtime).(object)
+      left_result = runtime.record_checks_on_success { @left.with_runtime(runtime).(object) }
 
       if left_result.valid?
         @then.with_runtime(runtime).(left_result.value)

data/lib/datacaster/utils.rb

@@ -9,6 +9,12 @@ module Datacaster
       first.merge(second.to_h, &merger)
     end
 
+    # Merges checked schemas key by key: a key accepted whole (true) on either side
+    # stays accepted whole, nested checks on both sides combine
+    def merge_checks!(into, from)
+      into.merge!(from) { |_, a, b| a == true || b == true ? true : merge_checks!(a, b) }
+    end
+
     def deep_freeze(value, copy: true)
       Ractor.make_shareable(value, copy:)
     end

data/lib/datacaster/version.rb

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

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datacaster
 version: !ruby/object:Gem::Version
-  version: 6.0.3
+  version: 6.1.0
 platform: ruby
 authors:
 - Eugene Zolotarev
+autorequire:
 bindir: exe
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2026-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -119,6 +120,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+description:
 email:
 - eugzol@gmail.com
 executables: []
@@ -193,6 +195,7 @@ licenses:
 - MIT
 metadata:
   source_code_uri: https://github.com/EugZol/datacaster
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -207,7 +210,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 3.5.20
+signing_key:
 specification_version: 4
 summary: Run-time type checker and transformer for Ruby
 test_files: []