mini_defender 0.5.7 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42cffd5eb5cd6e4e6735ac05f335fd0d2cb856430b666893e8b4477c5ac65262
-  data.tar.gz: 2af39ecec258011f4f4f7d20b447fcf984d239a27b6db4d4f26acd185bfe1031
+  metadata.gz: 4afc89ccb1f98c186e927a88b6bd85e9a5194f4dd74c7b45653f8a63feeb8f79
+  data.tar.gz: 53c21490530615efe4e8ba51c52ac26e2a448f8b3c555af66744dd7c0ce238df
 SHA512:
-  metadata.gz: 06c12dedec9bcf79df20573f7de5553f5b5eeff4f00f6c39132f3f4b901009b4903403821f1fbec828ef49f65c6d0e5e0843eef06ee7db06163505055ebc47bc
-  data.tar.gz: af62aaeffc7200becfeec360a4192f0fd184dede43c16f953a1ab0e4ff3b51dc434e22d0744906d3e2e6062511d284eafa739822646285d69220759918bf12b6
+  metadata.gz: 9cd0c033f42766e22cb7900b0903d275f3454df9293c553a5f2766154ed73760d7c28cd392ccd051d80bffa4c09027687ef7ca361d375b6f4037d706f26d6435
+  data.tar.gz: 9a50f0cc9ab6e9cd751d978cd5e37ec48ee2c742f80b5d058af6e82db2c1d2d9fdbf2de155c967fcf5baf1e7079d6fb77ad01dbd7e1d3ed025e0f3a5f0916501

data/lib/mini_defender/rules/integer.rb

@@ -1,19 +1,83 @@
 # frozen_string_literal: true
 
 class MiniDefender::Rules::Integer < MiniDefender::Rule
+  attr_reader :mode
+  attr_reader :parsed
+
+  DIGIT_MAP = {
+    # Arabic-Indic Digits
+    "\u0660" => '0',
+    "\u0661" => '1',
+    "\u0662" => '2',
+    "\u0663" => '3',
+    "\u0664" => '4',
+    "\u0665" => '5',
+    "\u0666" => '6',
+    "\u0667" => '7',
+    "\u0668" => '8',
+    "\u0669" => '9',
+
+    # Extended Arabic-Indic Digits
+    "\u06F0" => '0',
+    "\u06F1" => '1',
+    "\u06F2" => '2',
+    "\u06F3" => '3',
+    "\u06F4" => '4',
+    "\u06F5" => '5',
+    "\u06F6" => '6',
+    "\u06F7" => '7',
+    "\u06F8" => '8',
+    "\u06F9" => '9',
+  }
+
+  def initialize(mode = 'strict')
+    @mode = mode
+  end
+
   def self.signature
     'integer'
   end
 
+  def self.make(args)
+    new(args[0] || 'strict')
+  end
+
   def coerce(value)
-    value.to_i
+    @parsed
   end
 
   def passes?(attribute, value, validator)
-    value.is_a?(Integer) || value.is_a?(String) && value.match?(/^\d+$/)
+    # Avoid converting integers to string and back
+    if value.is_a?(Integer)
+      @parsed = value
+      return true
+    end
+
+    value = value.to_s
+
+    if @mode == 'relaxed'
+      value = normalize_digits(value)
+    end
+
+    @parsed = Integer(value)
+  rescue
+    false
   end
 
   def message(attribute, value, validator)
     "The value must be an integer."
   end
+
+  def normalize_digits(data)
+    # Check if arabic digits exist or avoid expensive string creation operation
+    unless data.match?(/[\u0660-\u0669\u06F0-\u06F9]/)
+      return data
+    end
+
+    DIGIT_MAP.each do |k, v|
+      data = data.gsub(k, v)
+    end
+
+    data
+  end
 end

data/lib/mini_defender/rules_expander.rb

@@ -33,9 +33,22 @@ module MiniDefender
     end
 
     def array_patterns(rules)
-      rules
-        .filter { |key, _| key.include?('*') }
-        .map { |key, _| Regexp.compile('\A' + key.gsub(/\*/, '\d+') + '\Z') }
+      unless rules.is_a?(Hash)
+        raise ArgumentError, 'Rules must be a Hash'
+      end
+
+      result = rules.keys.filter { |key| key.include?('*') }
+
+      # If the user hasn't add a rule for each of the array elements, add it manually
+      rules.keys.each do |key|
+        current = []
+        key.split('.').each do |section|
+          current << section
+          result << current.join('.') if section == '*'
+        end
+      end
+
+      result.sort.uniq.map { |key| Regexp.compile('\A' + key.gsub(/\*/, '\d+') + '\Z') }
     end
   end
 end

data/lib/mini_defender/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mini_defender
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.6.0
 platform: ruby
 authors:
 - Ali Alhoshaiyan
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-02-10 00:00:00.000000000 Z
+date: 2024-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport