datacaster 3.2.1 → 3.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed24c848eb7b909ee24655728013ccddad59fa7ad0c497326d767fcbe0ea369b
-  data.tar.gz: 6bc155f410e73bcd09a9941055e23c63aefc79caff1fcff47110d7d03b02b145
+  metadata.gz: f2b45e5271b85a571b86bd83ff91494d68486b677a2f0cc0f03daeeb5e8d5307
+  data.tar.gz: 7dafa54ec77eee489282217026a845059725a164e381525be695874bbb2cecc3
 SHA512:
-  metadata.gz: e59a0fc79dc9fbc350ec581d7741bc61d064439aea06f66cc814fba82e9678423f140ce0a5eeef17aa51a39c3f2457c5bc1b1909ab10db2b7e44ba1d214d2ac6
-  data.tar.gz: e53f422a189dcaee5f898f8f2b59fb9538fe26e9551b66f0bb3da467f4f1f91aad7480b2237df90b05892a4f72a2bdd56b446ad5691adca5f1d38b39ccfdb27a
+  metadata.gz: 37337520c11d06b98d30e5afcb890b2a8b1bfdbc06f05d070fb8d3c3dc52c4adc9263a9f92a29c0cf92051f5b58c57833f9d1330a8f7cb7fe39a46c2fad694f9
+  data.tar.gz: 4792f1c3000d5df28c865e5c8c365a87356e8241009b9a7cbe5e55544422c964749ba43e8d6004aba05585a18e1795967dc6c3a22f2e06a03ef87eca0dd4fced

data/lib/datacaster/context_nodes/structure_cleaner.rb

@@ -24,8 +24,9 @@ module Datacaster
       def transform_result(result)
         return result unless result.valid?
         result = cast_success(result)
-        if @runtime.instance_variable_get(:@parent).respond_to?(:checked_schema=)
-          @runtime.instance_variable_get(:@parent).checked_schema = @runtime.checked_schema
+        parent_runtime = @runtime.instance_variable_get(:@parent)
+        if parent_runtime.respond_to?(:checked_schema!)
+          parent_runtime.checked_schema!(@runtime.checked_schema)
         end
         result
       end

data/lib/datacaster/runtimes/structure_cleaner.rb

@@ -35,6 +35,10 @@ module Datacaster
         @should_check_stack[-1] = true
       end
 
+      def checked_schema!(schema)
+        @pointer_stack[-1].merge!(schema)
+      end
+
       def ignore_checks!(&block)
         @ignore = true
         result = yield

data/lib/datacaster/switch_node.rb

@@ -1,11 +1,15 @@
 module Datacaster
   class SwitchNode < Base
-    def initialize(base = nil, on_casters = [], else_caster = nil)
+    def initialize(base = nil, on_casters: [], else_caster: nil, pick_key: nil)
       @base = base
+      @pick_key = pick_key
 
       if Datacaster::Utils.pickable?(@base)
-        @base = Datacaster::Predefined.run { checked_key!(base) } &
-          Datacaster::Predefined.pick(base)
+        unless @pick_key.nil?
+          raise RuntimeError, "pick_key expected to be nil because #{@base.inspect} is pickable"
+        end
+        @pick_key = base
+        @base = Datacaster::Predefined.pick(base)
       end
 
       if !@base.nil? && !Datacaster.instance?(@base)
@@ -34,12 +38,12 @@ module Datacaster
 
       clause = DefinitionDSL.expand(clause)
 
-      self.class.new(@base, @ons + [[caster, clause]], @else)
+      self.class.new(@base, on_casters: @ons + [[caster, clause]], else_caster: @else, pick_key: @pick_key)
     end
 
     def else(else_caster)
       raise ArgumentError, "Datacaster: double else clause is not permitted", caller if @else
-      self.class.new(@base, @ons, else_caster)
+      self.class.new(@base, on_casters: @ons, else_caster: else_caster, pick_key: @pick_key)
     end
 
     def cast(object, runtime:)
@@ -59,7 +63,11 @@ module Datacaster
         result = check.with_runtime(runtime).(switch_result)
         next unless result.valid?
 
-        return clause.with_runtime(runtime).(object)
+        if @pick_key.nil?
+          return clause.with_runtime(runtime).(object)
+        else
+          return runtime.checked_key!(@pick_key) { clause.with_runtime(runtime).(object) }
+        end
       end
 
       # all 'on'-s have failed
@@ -71,7 +79,7 @@ module Datacaster
     end
 
     def inspect
-      "#<Datacaster::SwitchNode base: #{@base.inspect} on: #{@ons.inspect} else: #{@else.inspect}>"
+      "#<Datacaster::SwitchNode base: #{@base.inspect} on: #{@ons.inspect} else: #{@else.inspect} pick_key: #{@pick_key.inspect}>"
     end
   end
 end

data/lib/datacaster/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datacaster
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.2.3
 platform: ruby
 authors:
 - Eugene Zolotarev
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-10-09 00:00:00.000000000 Z
+date: 2024-02-06 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.4.6
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: Run-time type checker and transformer for Ruby
 test_files: []