mini_defender 0.1.3 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a699d084ae691ee23d0df09ce95ed6dddc7bad0f47fdc1888025cbcc7a546aa2
-  data.tar.gz: c5bd193ab55f4bdb8d850225425aac884aac3d70cf86cfa763f11a9aed0ddb07
+  metadata.gz: c249768a094c4518199ffd28c11b23cedc2795f2fd7b314066dd1ab8735ad64a
+  data.tar.gz: 03db289c1919edc2d6cfffd6db6f5ae70011a679edb1af8ae5ee7b915faa06b2
 SHA512:
-  metadata.gz: 847de8ae3fd9563ff61013ebd36a660946a5ad8bbfdce2b82dee8d81d90abdef0704acdd976425cf5f20bf62bca9ea0353d888f0331964b4accf44f9afdad585
-  data.tar.gz: cec864f4236ba28b34bf3b44987f59ebc22695e37b79b318aa1deed35308caa43981c3b58081b6ed244415632de2c8d62853013749601df5623af5554efa24d0
+  metadata.gz: bcb1491ce3eaef31ea2e713afd7651a5dd397ace80467eeab303086cda2ab1f23e8e044ace47f999ea49c62a31318650387044e4ae28c5e5d2204563c2746c33
+  data.tar.gz: 6bacb39daaf34e5e5d2685bb6e93629a8d390dc5dc0f7776495a4a1b003cb3e4939d9c67b2a3ccbe481758f24617707776b5768dc5b34b20d14995e1c33e67f4

data/lib/mini_defender/rule.rb

@@ -74,4 +74,16 @@ class MiniDefender::Rule
   def message(attribute, value, validator)
     raise NotImplementedError, 'Use a concrete implementation.'
   end
+
+  def with_message(message)
+    @message = message
+    self
+  end
+
+  # @param [Object] attribute
+  # @param [Object] value
+  # @param [MiniDefender::Validator] validator
+  def error_message(attribute, value, validator)
+    @message || message(attribute, value, validator)
+  end
 end

data/lib/mini_defender/rules/hostname.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+class MiniDefender::Rules::Hostname < MiniDefender::Rule
+  HOSTNAME_REGEX = /\A[a-zA-Z0-9][a-zA-Z0-9\-]{1,63}(\.[a-zA-Z0-9][a-zA-Z0-9\-]{1,63})+\.?\z/
+
+  def self.signature
+    'hostname'
+  end
+
+  def coerce(value)
+    value.to_s.downcase.strip
+  end
+
+  def passes?(attribute, value, validator)
+    value = value.to_s.downcase.strip
+    return false if value.length > 255
+
+    value.match?(HOSTNAME_REGEX)
+  end
+
+  def message(attribute, value, validator)
+    'Invalid hostname.'
+  end
+end

data/lib/mini_defender/rules/iban.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+class MiniDefender::Rules::Iban < MiniDefender::Rule
+  LENGTH_MATRIX = {
+    'SA' => 24
+  }
+
+  def self.signature
+    'iban'
+  end
+
+  def coerce(value)
+    value.to_s.upcase.gsub(/\s/, '')
+  end
+
+  def passes?(attribute, value, validator)
+    value = coerce(value)
+    value.match?(/[A-Z]{2}\d+/i) && valid_length?(value) && valid_checksum?(value)
+  end
+
+  def valid_checksum?(iban)
+    iban = "#{iban[4..]}#{letter_code(iban[0])}#{letter_code(iban[1])}#{iban[2..3]}".to_i
+    iban % 97 === 1
+  end
+
+  def valid_length?(iban)
+    iban.length == (LENGTH_MATRIX[iban[0..1]] || iban.length)
+  end
+
+  def message(attribute, value, validator)
+    "The value should be a valid IBAN."
+  end
+
+  private
+
+  def letter_code(letter)
+    # letter is assumed to be an upcase ASCII alphabet letter (A-Z)
+    letter.ord - 55
+  end
+end

data/lib/mini_defender/rules/not_regex.rb

@@ -12,9 +12,9 @@ class MiniDefender::Rules::NotRegex < MiniDefender::Rule
   end
 
   def self.make(args)
-    raise ArgumentError, 'Expected a pattern as input.' unless args.length == 1
+    raise ArgumentError, 'Expected a pattern as input.' unless args.length > 0
 
-    new(Regexp.compile(args[0]))
+    new(Regexp.compile(args.join(',')))
   end
 
   def passes?(attribute, value, validator)

data/lib/mini_defender/rules/regex.rb

@@ -12,9 +12,9 @@ class MiniDefender::Rules::Regex < MiniDefender::Rule
   end
 
   def self.make(args)
-    raise ArgumentError, 'Expected a pattern as input.' unless args.length == 1
+    raise ArgumentError, 'Expected a pattern as input.' unless args.length > 0
 
-    new(Regexp.compile(args[0]))
+    new(Regexp.compile(args.join(',')))
   end
 
   def passes?(attribute, value, validator)

data/lib/mini_defender/rules/unique.rb

@@ -1,13 +1,18 @@
 # frozen_string_literal: true
 
 class MiniDefender::Rules::Unique < MiniDefender::Rule
-  def initialize(model, column)
-    raise ArgumentError, 'model name must be a string or ActiveRecord::Base' unless model.is_a?(String)
-    raise ArgumentError, 'Column name must be a string' unless column.is_a?(String)
+  def initialize(model, column = nil)
+    unless model.is_a?(String) || model.is_a?(Class) && model.ancestors.include?(ActiveRecord::Base)
+      raise ArgumentError, 'model name must be a string or ActiveRecord::Base'
+    end
 
-    @model = model.camelcase.constantize
+    raise ArgumentError, 'Column name must be a string' unless column.is_a?(String) || column.nil?
+
+    @model = model
+    @model = @model.camelcase.constantize if model.is_a?(String)
     @column = column
     @ignore = nil
+    @additional_scope = nil
   end
 
   def self.signature
@@ -19,6 +24,11 @@ class MiniDefender::Rules::Unique < MiniDefender::Rule
     self
   end
 
+  def scope_by(callback)
+    @additional_scope = callback
+    self
+  end
+
   def self.make(args)
     raise ArgumentError, 'Model and column are required.' unless args.length == 2
 
@@ -26,9 +36,13 @@ class MiniDefender::Rules::Unique < MiniDefender::Rule
   end
 
   def passes?(attribute, value, validator)
+    @column = attribute.split('.')[-1] if @column.nil?
+
     query = @model.where(@column => value)
+    query = @additional_scope.call(query) unless @additional_scope.nil?
     query = query.where.not(@column, @ignore) unless @ignore.nil?
-    query.exists?
+
+    !query.exists?
   end
 
   def message(attribute, value, validator)

data/lib/mini_defender/validator.rb

@@ -57,7 +57,7 @@ module MiniDefender
           value_included &= !rule.excluded?(self)
 
           unless rule.passes?(k, value, self)
-            @errors[k] << rule.message(k, value, self)
+            @errors[k] << rule.error_message(k, value, self)
           end
         end
 

data/lib/mini_defender/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mini_defender
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.6
 platform: ruby
 authors:
 - Ali Alhoshaiyan
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-11-24 00:00:00.000000000 Z
+date: 2022-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -74,9 +74,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".DS_Store"
 - CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.md
 - README.md
 - RULES.md
@@ -127,6 +127,8 @@ files:
 - lib/mini_defender/rules/greater_than.rb
 - lib/mini_defender/rules/greater_than_or_equal.rb
 - lib/mini_defender/rules/hash.rb
+- lib/mini_defender/rules/hostname.rb
+- lib/mini_defender/rules/iban.rb
 - lib/mini_defender/rules/image.rb
 - lib/mini_defender/rules/in.rb
 - lib/mini_defender/rules/in_field.rb
@@ -198,7 +200,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: A small and efficient validation library for Rails and anything that uses

data/Gemfile.lock

@@ -1,70 +0,0 @@
-PATH
-  remote: .
-  specs:
-    mini_defender (0.1.2)
-      actionpack (>= 6.0)
-      activemodel (>= 6.0)
-      activesupport (>= 6.0)
-      countries
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionpack (7.0.4)
-      actionview (= 7.0.4)
-      activesupport (= 7.0.4)
-      rack (~> 2.0, >= 2.2.0)
-      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (7.0.4)
-      activesupport (= 7.0.4)
-      builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activemodel (7.0.4)
-      activesupport (= 7.0.4)
-    activesupport (7.0.4)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      tzinfo (~> 2.0)
-    builder (3.2.4)
-    concurrent-ruby (1.1.10)
-    countries (5.2.0)
-      unaccent (~> 0.3)
-    crass (1.0.6)
-    erubi (1.11.0)
-    i18n (1.12.0)
-      concurrent-ruby (~> 1.0)
-    loofah (2.19.0)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    minitest (5.16.3)
-    nokogiri (1.13.9-arm64-darwin)
-      racc (~> 1.4)
-    racc (1.6.0)
-    rack (2.2.4)
-    rack-test (2.0.2)
-      rack (>= 1.3)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.3)
-      loofah (~> 2.3)
-    rake (13.0.6)
-    tzinfo (2.0.5)
-      concurrent-ruby (~> 1.0)
-    unaccent (0.4.0)
-
-PLATFORMS
-  arm64-darwin-21
-
-DEPENDENCIES
-  mini_defender!
-  minitest (~> 5.0)
-  rake (~> 13.0)
-
-BUNDLED WITH
-   2.3.20