mini_defender 0.5.0 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce828ce2c5bbb54c61b4251dbb22c7a2c47c454d8e2c40200e87def85331960b
-  data.tar.gz: 5e68bda0f0104af4d084458191a59626e29323b07cb738959784d723e44e670a
+  metadata.gz: f7eb4878351ebf49bb42e33a10f8fefd34745b4067bdf40b50180792d2883819
+  data.tar.gz: 93ec54964db744a7f2f03a7fc23bf96b6458637d94dbfb00c4307a0e5e598964
 SHA512:
-  metadata.gz: 3e77385c0db7fb62dd8b4cce604919fd9d0d0ae5e0fad90edf4d891f63d256cb99a9a07321114688168a2e899c7dc177d9f92e61f6b3eaa063217d2a079d73a7
-  data.tar.gz: efc638b587907dd095dc31ad90a87396e778f1eb147f48010664b6a39f11117286f1f2d342cd62900c851eddb081c39ecadbac1faada9ec0cf6541227091820d
+  metadata.gz: a04dc7d2a819a0d3f8e443342900bd29db0c7e9b730128ff7d8f266f7853e52079166903997f660ef87c26c3965dd689c229bd5e533a0ff824debd3548f65417
+  data.tar.gz: cd0109845a3f6f2ddc22c23448856124384554b6e3bbc75f1d952773c589797a421c1f7e04da15ed3461713f65ee436a8c102776ff0377dbbdeecc96da746196

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

data/lib/mini_defender/rules_expander.rb

@@ -15,14 +15,27 @@ module MiniDefender
         end
 
         k_pattern = Regexp.compile('\A' + rule_key.gsub(/\*/, '\d+') + '\Z')
+        k_pattern_result = {}
 
         flat_data.each do |value_key, _|
           next unless k_pattern.match?(value_key)
-          result[value_key] = rule_set
+          k_pattern_result[value_key] = rule_set
         end
+
+        if k_pattern_result.empty?
+          k_pattern_result[k_pattern.source.gsub(/\\[AZ]/, '').gsub('\d+', '0')] = rule_set
+        end
+
+        result.merge!(k_pattern_result)
       end
 
       result
     end
+
+    def array_patterns(rules)
+      rules
+        .filter { |key, _| key.include?('*') }
+        .map { |key, _| Regexp.compile('\A' + key.gsub(/\*/, '\d+') + '\Z') }
+    end
   end
 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

@@ -12,10 +12,13 @@ module MiniDefender
       @coerced = {}
       @expander = RulesExpander.new
       @factory = RulesFactory.new
+      @array_patterns = @expander.array_patterns(rules)
     end
 
     def validate
-      return unless @errors.nil?
+      unless @errors.nil?
+        return
+      end
 
       @errors = {}
 
@@ -59,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
@@ -77,15 +80,15 @@ module MiniDefender
         end
       end
 
-      @validated = @validated.expand
-      @coerced = @coerced.expand
-
       @errors.reject! { |_, v| v.empty? }
     end
 
     def validate!
       validate if @errors.nil?
-      raise ValidationError.new('Data validation failed', @errors) unless @errors.empty?
+
+      unless @errors.empty?
+        raise ValidationError.new('Data validation failed', @errors)
+      end
     end
 
     def passes?
@@ -99,12 +102,12 @@ module MiniDefender
 
     def validated
       validate! if @errors.nil?
-      @validated
+      @validated_compacted ||= compact_expanded(@validated)
     end
 
     def coerced
       validate! if @errors.nil?
-      @coerced
+      @coerced_compacted = compact_expanded(@coerced)
     end
 
     # @return [Hash]
@@ -133,5 +136,57 @@ module MiniDefender
 
       Regexp.compile("\\A#{search_key.reverse.join('\.')}\\z")
     end
+
+    def compact_expanded(hash)
+      expanded = {}
+
+      hash.each do |k, v|
+        keys = k.split('.')
+        node = expanded
+
+        while keys.length > 1
+          next_key = keys.shift
+          next_node = (node[next_key] ||= {})
+
+          if next_node.is_a?(Array)
+            node[next_key] = next_node = next_node.each_with_index.to_h do |value, index|
+              [index.to_s, value]
+            end
+          end
+
+          node = next_node
+        end
+
+        node[keys.shift] = v
+      end
+
+      compact_keys(expanded)
+    end
+
+    def compact_keys(hash, current_key = '')
+      current_key_suffixed = if current_key == ''
+        ''
+      else
+        "#{current_key}."
+      end
+
+      result = hash.to_h do |k, v|
+        [k, v.is_a?(Hash) ? compact_keys(v, current_key_suffixed + k) : v]
+      end
+
+      if result.empty?
+        return result
+      end
+
+      unless @array_patterns.any? { |p| p.match?("#{current_key_suffixed}#{result.keys.first}") }
+        return result
+      end
+
+      if result.all? { |k, _v| k.match?(/\A\d+\z/) }
+        return result.values
+      end
+
+      result
+    end
   end
 end

data/lib/mini_defender/version.rb

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

data/lib/mini_defender.rb

@@ -13,7 +13,6 @@ require_relative 'mini_defender/validation_helpers'
 
 # Extensions to Ruby Core
 require_relative 'mini_defender/extensions/enumerable'
-require_relative 'mini_defender/extensions/hash'
 
 module MiniDefender
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mini_defender
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.2
 platform: ruby
 authors:
 - Ali Alhoshaiyan
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-01-16 00:00:00.000000000 Z
+date: 2024-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -97,7 +97,6 @@ files:
 - Rakefile
 - lib/mini_defender.rb
 - lib/mini_defender/extensions/enumerable.rb
-- lib/mini_defender/extensions/hash.rb
 - lib/mini_defender/handles_validation_errors.rb
 - lib/mini_defender/rule.rb
 - lib/mini_defender/rules.rb

data/lib/mini_defender/extensions/hash.rb

@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-class Hash
-  def expand
-    expanded = {}
-
-    each do |k, v|
-      keys = k.split('.')
-      node = expanded
-
-      while keys.length > 1
-        next_key = keys.shift
-        next_node = (node[next_key] ||= {})
-
-        if next_node.is_a?(Array)
-          node[next_key] = next_node = next_node.each_with_index.to_h { |value, index| [index.to_s, value] }
-        end
-
-        node = next_node
-      end
-
-      node[keys.shift] = v
-    end
-
-    expanded.compact_keys
-  end
-
-  def compact_keys
-    result = to_h do |k, v|
-      [k, v.is_a?(Hash) ? v.compact_keys : v]
-    end
-
-    if !result.empty? && result.all? { |k, _v| k.match?(/\A\d+\z/) }
-      result.values
-    else
-      result
-    end
-  end
-end