datacaster 3.2.2 → 3.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd23c11d4adffee6cbdc30b7a74f2f8d6964b4ebcdb0fd2e94576f28c4fc7407
-  data.tar.gz: '0949319f7e070757a51c619cf2e77d355df177ba84f010835a517243d2ad76ec'
+  metadata.gz: 382b6c6e5194c6746baaef5483ef078a06f0494c1c41798e118bf9b63d554436
+  data.tar.gz: 1cc94cf3dbe08b9e660bb0e0a164eaf15567408239fa7b8f84f5353256b6c8b7
 SHA512:
-  metadata.gz: 3c0edbe35ee2b7b8a0f450df81defbb89371b09ad3f18fd72e55a1b9f7e143d765c9cbe72ca1ab8ce84e25c822dec289e20cdddca2c36044551f0c27f577cc2d
-  data.tar.gz: 7cea5130149612f5b73e58d426ec28bf34322c57cef08fb601c83537aaeda1769a91c58ca91641cb964883d32fb8c737e68856633646f6c2ec7b792079dc39e8
+  metadata.gz: a4fc369a63f0a2787d7b7a2706f68cf08a0181771c5c84acb3fa6d60e0f1e2fe2ca097ba611825bfd6e75f344dbf301254d90367cf6ece61264ea29c8b336ea2
+  data.tar.gz: caed96fc02c8020c951f053fa2a71852623ff8a45ac9ce91235c34d999b2cebd4eb3533bfdbc090aa561f4346bd596b940bcbd169ea81e47f4756430b87e6ede

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/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,6 +63,7 @@ module Datacaster
         result = check.with_runtime(runtime).(switch_result)
         next unless result.valid?
 
+        runtime.checked_key!(@pick_key) if !@pick_key.nil? && !@pick_key.is_a?(Array)
         return clause.with_runtime(runtime).(object)
       end
 
@@ -71,7 +76,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.2"
+  VERSION = "3.2.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datacaster
 version: !ruby/object:Gem::Version
-  version: 3.2.2
+  version: 3.2.4
 platform: ruby
 authors:
 - Eugene Zolotarev
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-10-09 00:00:00.000000000 Z
+date: 2024-02-07 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: []