Avoid Adding Defaults for Missing Array Objects (#36)

Author: ahoshaiyan

lib/mini_defender/rules/default.rb

@@ -10,7 +10,9 @@ def self.signature
   end
 
   def self.make(args)
-    raise ArgumentError, 'Expected exactly one argument.' unless args.length == 1
+    unless args.length == 1
+      raise ArgumentError, 'Expected exactly one argument.'
+    end
 
     new(args[0])
   end

lib/mini_defender/validator.rb

@@ -27,30 +27,52 @@ def validate
       end
 
       # Set default values for missing data key compared to rules
-      data_rules.each do |k, set|
-        if !@data.key?(k) || missing_value?(@data[k])
-          set.filter{ |r| r.defaults?(self) }.each do |r|
-            @data.merge!({k => r.default_value(self)}.flatten_keys(keep_roots: true))
+      defaults_rules = data_rules.filter { |k, set| set.any? { |r| r.defaults?(self) } }
+      defaults_rules.each do |key_pattern, set|
+        # If element is not inside an array
+        unless key_pattern.match?(/\*/)
+          if missing_value?(@data[key_pattern])
+            @data[key_pattern] = set.map { |r| r.default_value(self) }.reject(&:nil?).first
           end
+
+          next
         end
+
+        parent, sep, child_key = key_pattern.rpartition('*')
+        parent += sep
+
+        # If parent or a sibling exists, add the default value
+        pattern = Regexp.new("\\A#{parent.gsub('*', '\d')}\\z")
+        additions = {}
+        @data.each do |k, _|
+          unless k.match?(pattern)
+            next
+          end
+
+          current_child_key = "#{k}#{child_key}"
+
+          unless missing_value?(@data[current_child_key])
+            next
+          end
+
+          additions[current_child_key] = set.map { |r| r.default_value(self) }.reject(&:nil?).first
+        end
+
+        @data.merge!(additions)
       end
 
       data_rules = @expander.expand(data_rules, @data)
-
       data_rules.each do |k, rule_set|
         @errors[k] = []
 
         value_included = true
         required = rule_set.any? { |r| r.implicit?(self) }
 
-        if !@data.key?(k) || missing_value?(@data[k])
-          rule_set.filter{ |r| r.defaults?(self) }.each do |r|
-            @data.merge!({k => r.default_value(self)}.flatten_keys(keep_roots: true))
+        unless @data.key?(k)
+          if required
+            @errors[k] << 'This field is missing.'
           end
-        end
 
-        unless @data.key?(k)
-          @errors[k] << 'This field is missing.' if required
           next
         end
 

lib/mini_defender/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MiniDefender
-  VERSION = "0.7.4"
+  VERSION = "0.8.0"
 end

test/rules/default_test.rb

@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+
+class DefaultTest < Minitest::Test
+  def setup
+    @validator = MiniDefender::Validator.new({
+      'name' => 'required|string|max:255',
+
+      'laptop' => 'string|default:macbook',
+
+      'address' => 'required|hash',
+      'address.street' => 'required|string|max:255',
+      'address.additional' => 'string|max:255',
+      'address.country' => 'required|string|max:2',
+      'address.components' => 'required|hash',
+      'address.components.c1' => 'required|string',
+      'address.components.c2' => 'string|default:None',
+
+      'dependents' => 'array',
+      'dependents.*.name' => 'string|max:255',
+      'dependents.*.needs' => 'array',
+      'dependents.*.needs.*.id' => 'integer|min:0',
+      'dependents.*.needs.*.description' => 'string|default:None',
+    }, {
+      'name' => 'John Doe',
+      'address' => {
+        'street' => '123 Main St',
+        'country' => 'SA',
+        'components' => {
+          'c1' => '1234567890',
+        }
+      },
+      'dependents' => [
+        { 'name' => 'Jane Doe', 'needs' => [{ 'id' => 1, 'description' => 'Need 1' }] },
+        {
+          'name' => 'Jonny Doe', 'needs' => [
+            { 'id' => 2, 'description' => 'Need 2' },
+            { 'id' => 3, },
+          ]
+        },
+        { 'name' => 'Mary Doe' },
+      ]
+    })
+
+    @validator.validate!
+    @validated = @validator.validated
+  end
+
+  def test_default_value_for_root_element_must_be_set
+    assert_equal('macbook', @validated['laptop'])
+  end
+
+  def test_default_value_for_nested_element_must_be_set
+    assert_equal('None', @validated['address']['components']['c2'])
+  end
+
+  def test_default_value_for_array_element_must_be_set
+    assert_equal('None', @validated['dependents'][1]['needs'][1]['description'])
+  end
+
+  def test_default_value_for_array_element_where_parent_does_not_exist_must_not_be_set
+    assert_nil(@validated['dependents'][2]['needs'])
+  end
+end