mini_defender 0.5.1 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36f0ca2e9d174da94e991c9eed6300ae0f0315ab57b3d9372921726261318c67
-  data.tar.gz: a4f29b8f5558008c1f5b992722a8ab9dd07dbc93d51d7ec288bd3be5e9d1d91b
+  metadata.gz: 87731b96739bb1b69873c678f424ab5a9e5edf8ff2c084803582865fb6ce353b
+  data.tar.gz: 0e2c1516a69cfa689cccea7a2013bec0817ea9790831986fbe2fff79f51945c0
 SHA512:
-  metadata.gz: 885a3ff5f6a337246c9b47e6ac21b0e9dc21067a11c49d7af2d9135d66f6ab878a620b9f73cafa5b1316d5edc2d74f709f924e37309bbe74bb596500abe8348b
-  data.tar.gz: 3d6a38389f37816a4b6ebbadd7700b6c628e7011c42dfbe0a07ee907f0d354b9b7aaed18179ad97c8350ea01948966ee47182b40e5630370761a5487c58fbe97
+  metadata.gz: d5493f26115c5833ca54f55d4d551751fcd975b6a3c3c4ee8fe53b197f9c78c088d545d60751e026b22598549c3561593023b39b5cc17c8256d952e84f9b4ea1
+  data.tar.gz: ae08110a394548937b2ee193e583399e994f8cb82b6d828c5768d5ffb7cbfaaf663996ec0d9ad61d0d25c06de61d00dad06f1f722640800949dd5142cb1545ef

data/lib/mini_defender/rule.rb

@@ -16,6 +16,13 @@ class MiniDefender::Rule
     true
   end
 
+  # Priority is used to sort rules in a rule set to allow rules to validate data
+  # before rules that will radically change data
+  # @return [Integer]
+  def priority
+    100
+  end
+
   # @param [MiniDefender::Validator] validator
   # @return [Boolean]
   def implicit?(validator)

data/lib/mini_defender/rules/array.rb

@@ -13,6 +13,10 @@ class MiniDefender::Rules::Array < MiniDefender::Rule
     new(args[0] || 'none')
   end
 
+  def priority
+    500
+  end
+
   def coerce(value)
     @data_mode == 'all' ? value : []
   end

data/lib/mini_defender/rules/hash.rb

@@ -19,6 +19,10 @@ class MiniDefender::Rules::Hash < MiniDefender::Rule
     )
   end
 
+  def priority
+    500
+  end
+
   def coerce(value)
     @data_mode == 'all' ? value : {}
   end
@@ -30,6 +34,10 @@ class MiniDefender::Rules::Hash < MiniDefender::Rule
   def passes?(attribute, value, validator)
     passes = value.is_a?(Hash)
 
+    unless passes
+      return false
+    end
+
     if @key_type == 'string'
       passes &= value.all? { |k, _| k.is_a?(String) }
     end

data/lib/mini_defender/rules_factory.rb

@@ -11,16 +11,23 @@ module MiniDefender
     end
 
     def init_set(rule_set)
-      rule_set = rule_set.split('|') if rule_set.is_a?(String)
-      raise ArgumentError, 'Rule set must be a string or an array' unless rule_set.is_a?(Array)
+      if rule_set.is_a?(String)
+        rule_set = rule_set.split('|')
+      end
+
+      unless rule_set.is_a?(Array)
+        raise ArgumentError, 'Rule set must be a string or an array'
+      end
 
-      rule_set.map do |rule|
+      rule_set = rule_set.map do |rule|
         unless rule.is_a?(String) || rule.is_a?(Rule)
           raise ArgumentError, 'Rule must be a string or an instance of MiniDefender::Rule'
         end
 
         rule.is_a?(String) ? init_rule(rule) : rule
       end
+
+      rule_set.sort_by! { |r| r.priority }
     end
 
     def init_rule(signature)

data/lib/mini_defender/validator.rb

@@ -62,7 +62,7 @@ module MiniDefender
 
           value_included &= !rule.excluded?(self)
 
-          if rule.passes?(k, value, self)
+          if rule.passes?(k, coerced, self)
             coerced = rule.coerce(coerced)
             force_coerce = rule.force_coerce?
           else

data/lib/mini_defender/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mini_defender
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.3
 platform: ruby
 authors:
 - Ali Alhoshaiyan
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-01-17 00:00:00.000000000 Z
+date: 2024-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport