Merge pull request #709 from bautrey37/fix-rule.each-on-optional-value

Fix rule.each on optional value

Closes #708

lib/dry/validation/rule.rb

@@ -82,7 +82,7 @@ def each(*macros, &block)
         @keys = []
 
         @block = proc do
-          unless result.base_error?(root) || !values.key?(root)
+          unless result.base_error?(root) || !values.key?(root) || values[root].nil?
             values[root].each_with_index do |_, idx|
               path = [*Schema::Path[root].to_a, idx]
 

lib/dry/validation/values.rb

@@ -65,7 +65,6 @@ def [](*args)
       def key?(key, hash = data)
         return hash.key?(key) if key.is_a?(Symbol)
 
-        # rubocop: disable Lint/DuplicateBranch
         Schema::Path[key].reduce(hash) do |a, e|
           if e.is_a?(Array)
             result = e.all? { |k| key?(k, a) }
@@ -81,8 +80,6 @@ def key?(key, hash = data)
           end
           a[e]
         end
-        # rubocop: enable Lint/DuplicateBranch
-
         true
       end
       # rubocop: enable Metrics/PerceivedComplexity

spec/unit/rule_spec.rb

@@ -50,4 +50,24 @@
       end
     end
   end
+
+  context "with an optional value" do
+    let(:contract_class) do
+      Class.new(Dry::Validation::Contract) do
+        schema do
+          required(:tags).maybe(:array)
+        end
+      end
+    end
+
+    context "when using .each macro" do
+      it "does not fail when input is nil" do
+        contract_class.rule(:tags).each do
+          key.failure("should not be called")
+        end
+
+        expect(contract.(tags: nil).errors.to_h).to eq({})
+      end
+    end
+  end
 end