Switch marks selected field as checked; included_in accepts array ins… (

#14)

* Switch marks selected field as checked
* included_in accepts array instead of varargs

README.md

@@ -58,7 +58,7 @@ It is currently used in production in several projects (mainly as request parame
     - [`try(error_key = nil, catched_exception:) { |value| ... }`](#tryerror_key--nil-catched_exception--value--)
     - [`validate(active_model_validations, name = 'Anonymous')`](#validateactive_model_validations-name--anonymous)
     - [`compare(reference_value, error_key = nil)`](#comparereference_value-error_key--nil)
-    - [`included_in(*reference_values, error_key: nil)`](#included_inreference_values-error_key-nil)
+    - [`included_in(reference_values, error_key: nil)`](#included_inreference_values-error_key-nil)
     - [`relate(left, op, right, error_key: nil)`](#relateleft-op-right-error_key-nil)
     - [`run { |value| ... }`](#run--value--)
     - [`transform { |value| ... }`](#transform--value--)
@@ -988,7 +988,7 @@ agreed_with_tos =
 
 I18n keys: `error_key`, `'.compare'`, `'datacaster.errors.compare'`. Adds `reference` i18n variable, setting it to `reference_value.to_s`.
 
-#### `included_in(*reference_values, error_key: nil)`
+#### `included_in(reference_values, error_key: nil)`
 
 Returns ValidResult if and only if `reference_values.include?` the value.
 

lib/datacaster/predefined.rb

@@ -330,7 +330,7 @@ def hash_with_symbolized_keys(error_key = nil)
       hash_value(error_key) & transform { |x| x.symbolize_keys }
     end
 
-    def included_in(*values, error_key: nil)
+    def included_in(values, error_key: nil)
       error_keys = ['.included_in', 'datacaster.errors.included_in']
       error_keys.unshift(error_key) if error_key
       check { |x| values.include?(x) }.i18n_key(*error_keys, reference: values.map(&:to_s).join(', '))

lib/datacaster/switch_node.rb

@@ -4,7 +4,8 @@ def initialize(base = nil, on_casters = [], else_caster = nil)
       @base = base
 
       if Datacaster::Utils.pickable?(@base)
-        @base = Datacaster::Predefined.pick(@base)
+        @base = Datacaster::Predefined.run { checked_key!(base) } &
+          Datacaster::Predefined.pick(base)
       end
 
       if !@base.nil? && !Datacaster.instance?(@base)

lib/datacaster/version.rb

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

spec/datacaster_spec.rb

@@ -87,7 +87,7 @@
   end
 
   describe "included_in typecasting" do
-    subject { described_class.schema { included_in(1, '2', ['test']) } }
+    subject { described_class.schema { included_in([1, '2', ['test']]) } }
 
     it "passes one of the exact values and fails on everything else" do
       expect(subject.(1).to_dry_result).to eq Success(1)

spec/switch_node_spec.rb

@@ -126,5 +126,15 @@
 
       expect(caster.(3).to_dry_result).to eq Failure(["is invalid"])
     end
+
+    it 'marks matched-on value as checked' do
+      caster =
+        Datacaster.schema do
+          switch(:kind).
+            on(1, hash_schema(name: string))
+        end
+
+      expect(caster.(kind: 1, name: '1').to_dry_result).to eq Success(kind: 1, name: '1')
+    end
   end
 end