Merge pull request #18 from ahoshaiyan/fix-defaults-for-boolean

Fix defaults with boolean types

lib/mini_defender/validates_input.rb

@@ -7,7 +7,7 @@ def validate!(rules, coerced = false)
     data = cleanse_data(params.to_unsafe_hash.deep_stringify_keys)
     validator = MiniDefender::Validator.new(rules, data)
     validator.validate!
-    coerced ? validator.coerced : validator.data
+    coerced ? validator.coerced : validator.validated
   end
 
   private

lib/mini_defender/validator.rb

@@ -28,7 +28,7 @@ def validate
 
       # Set default values for missing data key compared to rules
       data_rules.each do |k, set|
-        if !@data.key?(k) || @data[k].blank?
+        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))
           end
@@ -43,7 +43,7 @@ def validate
         value_included = true
         required = rule_set.any? { |r| r.implicit?(self) }
 
-        if !@data.key?(k) || @data[k].blank?
+        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))
           end
@@ -188,5 +188,12 @@ def compact_keys(hash, current_key = '')
 
       result
     end
+
+    def missing_value?(value)
+      value.nil? ||
+        value.is_a?(String) && value.strip.empty? ||
+        value.is_a?(Hash) && value.empty? ||
+        value.is_a?(Array) && value.empty?
+    end
   end
 end

lib/mini_defender/version.rb

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

test/validator_test.rb

@@ -115,4 +115,27 @@ def test_should_return_neighbors_of_key_in_array
       }
     )
   end
+
+  def test_only_validated_data_should_be_returned
+    v = MiniDefender::Validator.new(
+      {
+        'address' => 'required|hash',
+        'address.is_personal' => 'required|boolean|default:true',
+      },
+      {
+        'address' => {
+          'is_personal' => false
+        },
+        'name' => 'John Doe'
+      }
+    )
+
+    v.validate!
+    data = v.validated
+
+    assert_equal 1, data.length
+    assert data['address'].is_a?(Hash)
+    assert data['address'].key?('is_personal')
+    assert data['address']['is_personal'].is_a?(FalseClass)
+  end
 end