datacaster 3.2.3 → 3.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2b45e5271b85a571b86bd83ff91494d68486b677a2f0cc0f03daeeb5e8d5307
-  data.tar.gz: 7dafa54ec77eee489282217026a845059725a164e381525be695874bbb2cecc3
+  metadata.gz: 6e87035b2c58689f1682294141d8ef6dfe02c6054a810e7bcda3a22f2d934091
+  data.tar.gz: d6262e0130ef3f831731e9b0d6095a40fa7a19bfa9eecd5a0630c5eb8a3d9513
 SHA512:
-  metadata.gz: 37337520c11d06b98d30e5afcb890b2a8b1bfdbc06f05d070fb8d3c3dc52c4adc9263a9f92a29c0cf92051f5b58c57833f9d1330a8f7cb7fe39a46c2fad694f9
-  data.tar.gz: 4792f1c3000d5df28c865e5c8c365a87356e8241009b9a7cbe5e55544422c964749ba43e8d6004aba05585a18e1795967dc6c3a22f2e06a03ef87eca0dd4fced
+  metadata.gz: 6800f34a95b7e8baaad2d2f093f4c6be58e35904220339c2c8c5452fcea375b169224ebf49c699d965073cf9b3777ab00b91adf48184d539c2ff1616accde73f
+  data.tar.gz: b8f9fd1227da11c029af5af57fb336f7e10f29b763123517ed4e5fbae0b27ca9ff6a65367841684edc366066ad27c720d367a318578b09637bfa98680bfcb58c

data/lib/datacaster/context_nodes/structure_cleaner.rb

@@ -47,7 +47,8 @@ module Datacaster
         when Hash
           cast_hash(result, schema)
         else
-          raise "Expected hash or array when checking #{value.inspect}"
+          raise RuntimeError, "Expected hash or array inside result when checking #{result.inspect} " \
+            "(schema is #{schema.inspect})", caller
         end
       end
 

data/lib/datacaster/runtimes/structure_cleaner.rb

@@ -35,8 +35,20 @@ module Datacaster
         @should_check_stack[-1] = true
       end
 
+      # Notify current runtime that some child runtime has built schema,
+      # child runtime's schema is passed as the argument
       def checked_schema!(schema)
-        @pointer_stack[-1].merge!(schema)
+        # Current runtime has marked its schema as checked unconditionally
+        return if @pointer_stack[-1] == true
+
+        # Child runtime marks its schema as checked unconditionally, so
+        # current runtime should do as well
+        if schema == true
+          @pointer_stack[-1] = true
+        # Child runtime's schema should be merged with current runtime's schema
+        else
+          @pointer_stack[-1].merge!(schema)
+        end
       end
 
       def ignore_checks!(&block)

data/lib/datacaster/switch_node.rb

@@ -63,11 +63,8 @@ module Datacaster
         result = check.with_runtime(runtime).(switch_result)
         next unless result.valid?
 
-        if @pick_key.nil?
-          return clause.with_runtime(runtime).(object)
-        else
-          return runtime.checked_key!(@pick_key) { clause.with_runtime(runtime).(object) }
-        end
+        runtime.checked_key!(@pick_key) if !@pick_key.nil? && !@pick_key.is_a?(Array)
+        return clause.with_runtime(runtime).(object)
       end
 
       # all 'on'-s have failed

data/lib/datacaster/version.rb

@@ -1,3 +1,3 @@
 module Datacaster
-  VERSION = "3.2.3"
+  VERSION = "3.2.5"
 end

metadata

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