mini_defender 0.7.4 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 371d65d32be7408cc86692e4e28bd1cce7c7aed48f32c62ca2871db9153bbed3
-  data.tar.gz: 9288d6445ef40a0e6e6b2b3425c526ba744f055029ae3ed935f9b7f2762082a0
+  metadata.gz: 53ca5d9198b8205b86302ffa2541950931680d2af58486904bbda6835d457c65
+  data.tar.gz: bf41bed9f56f20c8ac67df245e8951657dca5e59208ec4c88a95903813763f17
 SHA512:
-  metadata.gz: 1a70a27998e815e6adcd6a033e87f75b88fd0e5e52e0090b308eaf2b3450bd33d6e98a292acb8122633a3534c18f5cead3055e7b5bda0ff1f28a16d630f0f94f
-  data.tar.gz: e3e390e5420a29d2593811e4fdf24faa131398ad7c2f3dacb978c25b84a5ce1685d986dd0dcc11c8dd2188612dfa31da362e38678e01d7f6008ee8b877f0d0c3
+  metadata.gz: 8a772cfacf137bb67985efe6976308894df48b649058e417c8be4bf66be011b016aebd947f518d8a498f627fe3f292c7a9494cf0a0ea2ace1b74cf470884a4d5
+  data.tar.gz: 6cb8e81c7fea23dd5d27bae9681a47ff3d9fb2a5cbcc004c1269509c189ea343dbbf853d48ad6f22cfb8187e28b31acac0d675441bb4be3357469d4b822075f5

data/lib/mini_defender/rules/default.rb

@@ -10,7 +10,9 @@ class MiniDefender::Rules::Default < MiniDefender::Rule
   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

data/lib/mini_defender/rules/mime_types.rb

@@ -28,9 +28,10 @@ class MiniDefender::Rules::MimeTypes < MiniDefender::Rule
   def passes?(attribute, value, validator)
     @file = value.is_a?(ActionDispatch::Http::UploadedFile)
     content_type = Marcel::MimeType.for(value.read)
+    extension_mime_type = Marcel::MimeType.for(extension: File.extname(value.original_filename))
     value.rewind
 
-    @file && @types.include?(content_type)
+    @file && @types.include?(content_type) && content_type == extension_mime_type
   end
 
   def message(attribute, value, validator)

data/lib/mini_defender/validator.rb

@@ -27,30 +27,52 @@ module MiniDefender
       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
 

data/lib/mini_defender/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: mini_defender
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.8.1
 platform: ruby
 authors:
 - Ali Alhoshaiyan
 bindir: exe
 cert_chain: []
-date: 2025-09-24 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -261,7 +261,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.5
+rubygems_version: 3.6.9
 specification_version: 4
 summary: A small and efficient validation library for Rails and anything that uses
   Ruby.