Skip to content

Commit

Permalink
Add rule priority to allow rules to validate data before rules that w…
Browse files Browse the repository at this point in the history
…ill radically change data (#16)
  • Loading branch information
ahoshaiyan committed Jan 22, 2024
1 parent d246190 commit 9ec61c8
Show file tree
Hide file tree
Showing 7 changed files with 48 additions and 5 deletions.
7 changes: 7 additions & 0 deletions lib/mini_defender/rule.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,13 @@ def self.available?
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)
Expand Down
4 changes: 4 additions & 0 deletions lib/mini_defender/rules/array.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ def self.make(args)
new(args[0] || 'none')
end

def priority
500
end

def coerce(value)
@data_mode == 'all' ? value : []
end
Expand Down
4 changes: 4 additions & 0 deletions lib/mini_defender/rules/hash.rb
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ def self.make(args)
)
end

def priority
500
end

def coerce(value)
@data_mode == 'all' ? value : {}
end
Expand Down
13 changes: 10 additions & 3 deletions lib/mini_defender/rules_factory.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,23 @@ def self.register(klass)
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)
Expand Down
2 changes: 1 addition & 1 deletion lib/mini_defender/validator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ def validate

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
Expand Down
2 changes: 1 addition & 1 deletion lib/mini_defender/version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# frozen_string_literal: true

module MiniDefender
VERSION = "0.5.1"
VERSION = "0.5.2"
end
21 changes: 21 additions & 0 deletions test/rules/hash_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -147,4 +147,25 @@ def test_hash_must_return_all_elements_when_all_mode_is_used_2
assert_equal 'foo', validator.coerced['metadata']['1']
assert_equal 'bar', validator.coerced['metadata']['2']
end

def test_hash_should_be_delayed_to_all_size_rules_validation
validator = MiniDefender::Validator.new(
{
'metadata' => 'required|hash|size:2|max:2|min:2',
'metadata.foo' => 'required|string',
'metadata.zee' => 'required|string'
},
{
'metadata' => {
'foo' => 'bar',
'zee' => 'mee'
}
}
)

assert validator.passes?

assert_equal 2, validator.coerced['metadata'].length
assert_equal 'bar', validator.coerced['metadata']['foo']
end
end

0 comments on commit 9ec61c8

Please sign in to comment.