validation_profiler 0.1.11 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc456f7b7675e026379968f8301308f31e31b289
-  data.tar.gz: bbf98c30843ec7420d4237f0747804251a0a3d80
+  metadata.gz: 27176d2061e3c1cc5b60ad63f95b37f0f94b3997
+  data.tar.gz: c086eb080473ac0f0cb95d7e3ef7c18b2dbfd0cb
 SHA512:
-  metadata.gz: c19ceb8e25b76e3b5ed19a6df1434349ec27ecaeaf5059729f248c2669cad85dd3d08750d85b40ae2a4b449a7697f195e66beec23e7b209af3694adff32592df
-  data.tar.gz: c5a059a2296246f25ca0505752168429be3fcb7f5f845ddc54f5a9dbb3956da641b3549f9d19355f39a6be38cabf00f96b6df6adfafa18c90f9f15aeafa8dbdb
+  metadata.gz: 5da629eb13fa60d7cc371f65550781b956d0c2b6be6bfa721899c86b455ba2e1ad83eadad8071a8511788e633d9355a9f06a57c4500624c564e86a5597a13c9e
+  data.tar.gz: a38bcf9271b406d33a8759380a305c336decf4ef8161163ceafd0078801779f684a7f9c51b7e29873cfa4662b77429682f013fb8b4d64933b25c0d26ecaeed47

data/lib/validation_profiler/rules/rules.rb

@@ -84,25 +84,30 @@ end
 
 class LengthValidationRule < ValidationRule
 
-  def error_message(field, attributes)
+  def error_message(field, attributes, parent = nil)
+    field_name = field.to_s
+    if parent != nil
+      field_name = "#{parent.to_s}.#{field.to_s}"
+    end
+
     #check if a custom error message has been specified in the attributes
     if attributes[:message] == nil
       #no custom error message has been specified so create the default message.
       min = attributes[:min]
       max = attributes[:max]
       if min && max
-        "#{field} must have a min length of #{min} and a max length of #{max}"
+        "#{field_name} must have a min length of #{min} and a max length of #{max}"
       elsif min
-        "#{field} must have a min length of #{min}"
+        "#{field_name} must have a min length of #{min}"
       else
-        "#{field} must have a max length of #{max}"
+        "#{field_name} must have a max length of #{max}"
       end
     else
       attributes[:message]
     end
   end
 
-  def validate(obj, field, attributes)
+  def validate(obj, field, attributes, parent = nil)
 
     min = attributes[:min]
     max = attributes[:max]
@@ -142,18 +147,24 @@ end
 
 class MinValidationRule < ValidationRule
 
-  def error_message(field, attributes)
+  def error_message(field, attributes, parent = nil)
+
+    field_name = field.to_s
+    if parent != nil
+      field_name = "#{parent.to_s}.#{field.to_s}"
+    end
+
     #check if a custom error message has been specified in the attributes
     if attributes[:message] == nil
       #no custom error message has been specified so create the default message.
       min = attributes[:value]
-      "#{field} must have a minimum value of #{min}"
+      "#{field_name} must have a minimum value of #{min}"
     else
       attributes[:message]
     end
   end
 
-  def validate(obj, field, attributes)
+  def validate(obj, field, attributes, parent = nil)
 
     min = attributes[:value]
 
@@ -169,6 +180,10 @@ class MinValidationRule < ValidationRule
       return true
     end
 
+    if field_value == nil
+      return false
+    end
+
     if field_value.is_a?(DateTime) || field_value.is_a?(Numeric)
       field_value >= min
     else
@@ -181,18 +196,24 @@ end
 
 class MaxValidationRule < ValidationRule
 
-  def error_message(field, attributes)
+  def error_message(field, attributes, parent = nil)
+
+    field_name = field.to_s
+    if parent != nil
+      field_name = "#{parent.to_s}.#{field.to_s}"
+    end
+
     #check if a custom error message has been specified in the attributes
     if attributes[:message] == nil
       #no custom error message has been specified so create the default message.
       max = attributes[:value]
-      "#{field} must not have a value greater than #{max}"
+      "#{field_name} must not have a value greater than #{max}"
     else
       attributes[:message]
     end
   end
 
-  def validate(obj, field, attributes)
+  def validate(obj, field, attributes, parent = nil)
 
     max = attributes[:value]
 
@@ -208,6 +229,10 @@ class MaxValidationRule < ValidationRule
       return true
     end
 
+    if field_value == nil
+      return false
+    end
+
     if field_value.is_a?(DateTime) || field_value.is_a?(Numeric)
       field_value <= max
     else
@@ -220,18 +245,24 @@ end
 
 class RequiredValidationRule < ValidationRule
 
-  def error_message(field, attributes = {})
+  def error_message(field, attributes = {}, parent = nil)
+
+    field_name = field.to_s
+    if parent != nil
+      field_name = "#{parent.to_s}.#{field.to_s}"
+    end
+
     #check if a custom error message has been specified in the attributes
     if attributes[:message] == nil
       #no custom error message has been specified so create the default message.
-      "#{field} is required"
+      "#{field_name} is required"
     else
       attributes[:message]
     end
   end
 
 
-  def validate(obj, field, attributes = {})
+  def validate(obj, field, attributes = {}, parent = nil)
 
     #attempt to get the field value from the object
     field_value = get_field_value(obj, field)
@@ -254,18 +285,24 @@ class EmailValidationRule < ValidationRule
 
   REGEX = /^[^@]+@[^@]+\.[^@]+$/
 
-  def error_message(field, attributes = {})
+  def error_message(field, attributes = {}, parent = nil)
+
+    field_name = field.to_s
+    if parent != nil
+      field_name = "#{parent.to_s}.#{field.to_s}"
+    end
+
     #check if a custom error message has been specified in the attributes
     if attributes[:message] == nil
       #no custom error message has been specified so create the default message.
-      "#{field} is not a valid email address"
+      "#{field_name} is not a valid email address"
     else
       attributes[:message]
     end
   end
 
 
-  def validate(obj, field, attributes = {})
+  def validate(obj, field, attributes = {}, parent = nil)
 
     #attempt to get the field value from the object
     field_value = get_field_value(obj, field)
@@ -287,18 +324,24 @@ end
 
 class RegexValidationRule < ValidationRule
 
-  def error_message(field, attributes = {})
+  def error_message(field, attributes = {}, parent = nil)
+
+    field_name = field.to_s
+    if parent != nil
+      field_name = "#{parent.to_s}.#{field.to_s}"
+    end
+
     #check if a custom error message has been specified in the attributes
     if attributes[:message] == nil
       #no custom error message has been specified so create the default message.
-      "#{field} is not a valid"
+      "#{field_name} is not a valid"
     else
       attributes[:message]
     end
   end
 
 
-  def validate(obj, field, attributes)
+  def validate(obj, field, attributes, parent = nil)
 
     #attempt to get the field value from the object
     field_value = get_field_value(obj, field)
@@ -325,21 +368,26 @@ end
 
 class MatchValidationRule < ValidationRule
 
-  def error_message(field, attributes)
+  def error_message(field, attributes, parent = nil)
+
+    field_name = field.to_s
+    if parent != nil
+      field_name = "#{parent.to_s}.#{field.to_s}"
+    end
 
     match_field = attributes[:field]
 
     #check if a custom error message has been specified in the attributes
     if attributes[:message] == nil
       #no custom error message has been specified so create the default message.
-      "#{field} does not match #{match_field}"
+      "#{field_name} does not match #{match_field}"
     else
       attributes[:message]
     end
   end
 
 
-  def validate(obj, field, attributes)
+  def validate(obj, field, attributes, parent = nil)
 
     #attempt to get the field value from the object
     field_value = get_field_value(obj, field)
@@ -363,21 +411,24 @@ end
 
 class ConditionValidationRule < ValidationRule
 
-  def error_message(field, attributes = {})
+  def error_message(field, attributes = {}, parent = nil)
 
-    match_field = attributes[:field]
+    field_name = field.to_s
+    if parent != nil
+      field_name = "#{parent.to_s}.#{field.to_s}"
+    end
 
     #check if a custom error message has been specified in the attributes
     if attributes[:message] == nil
       #no custom error message has been specified so create the default message.
-      "#{field} is not valid"
+      "#{field_name} is not valid"
     else
       attributes[:message]
     end
   end
 
 
-  def validate(obj, field, attributes)
+  def validate(obj, field, attributes, parent = nil)
 
     #attempt to get the field value from the object
     value = get_field_value(obj, field)
@@ -450,18 +501,24 @@ end
 
 class NotAllowedValidationRule < ValidationRule
 
-  def error_message(field, attributes = {})
+  def error_message(field, attributes = {}, parent = nil)
+
+    field_name = field.to_s
+    if parent != nil
+      field_name = "#{parent.to_s}.#{field.to_s}"
+    end
+
     #check if a custom error message has been specified in the attributes
     if attributes[:message] == nil
       #no custom error message has been specified so create the default message.
-      "#{field} is not allowed."
+      "#{field_name} is not allowed."
     else
       attributes[:message]
     end
   end
 
 
-  def validate(obj, field, attributes = {})
+  def validate(obj, field, attributes = {}, parent = nil)
 
     #attempt to get the field value from the object
     field_value = get_field_value(obj, field)
@@ -478,18 +535,24 @@ end
 
 class ListValidationRule < ValidationRule
 
-  def error_message(field, attributes = {})
+  def error_message(field, attributes = {}, parent = nil)
+
+    field_name = field.to_s
+    if parent != nil
+      field_name = "#{parent.to_s}.#{field.to_s}"
+    end
+
     #check if a custom error message has been specified in the attributes
     if attributes[:message] == nil
       #no custom error message has been specified so create the default message.
-      "#{field} is not an accepted value."
+      "#{field_name} is not an accepted value."
     else
       attributes[:message]
     end
   end
 
 
-  def validate(obj, field, attributes = {})
+  def validate(obj, field, attributes = {}, parent = nil)
 
     #attempt to get the field value from the object
     field_value = get_field_value(obj, field)
@@ -498,6 +561,10 @@ class ListValidationRule < ValidationRule
       return true
     end
 
+    if field_value == nil
+      return false
+    end
+
     list = attributes[:list]
     if list == nil || !list.is_a?(Array)
       raise InvalidRuleAttributes.new(ListValidationRule, field)
@@ -511,4 +578,55 @@ class ListValidationRule < ValidationRule
 
   end
 
+end
+
+class ChildValidationRule < ValidationRule
+
+  def initialize
+    @validation_manager = ValidationManager.new
+  end
+
+  def error_message(field, attributes = {}, parent = nil)
+
+    field_name = field.to_s
+    if parent != nil
+      field_name = "#{parent.to_s}.#{field.to_s}"
+    end
+
+    #check if a custom error message has been specified in the attributes
+    if attributes[:message] == nil
+      #no custom error message has been specified so create the default message.
+      "#{field_name} is required."
+    else
+      attributes[:message]
+    end
+  end
+
+  def validate(obj, field, attributes = {}, parent = nil)
+
+    #attempt to get the field value from the object
+    field_value = get_field_value(obj, field)
+
+    if !is_required?(field_value, attributes)
+      return true
+    end
+
+    profile = attributes[:profile]
+    if profile == nil
+      raise InvalidRuleAttributes.new(ChildValidationRule, field)
+    end
+
+    if field_value == nil
+      return false
+    end
+
+    parent_field = field.to_s
+    if parent != nil
+      parent_field = "#{parent.to_s}.#{field.to_s}"
+    end
+
+    return @validation_manager.validate(field_value, profile, parent_field)
+
+  end
+
 end

data/lib/validation_profiler/rules/validation_rule_manager.rb

@@ -64,6 +64,7 @@ class ValidationRuleManager
       @rules.push({ key: :condition, instance: ConditionValidationRule.new })
       @rules.push({ key: :not_allowed, instance: NotAllowedValidationRule.new })
       @rules.push({ key: :list, instance: ListValidationRule.new })
+      @rules.push({ key: :child, instance: ChildValidationRule.new })
 
   end
 

data/lib/validation_profiler/version.rb

@@ -1,3 +1,3 @@
 module ValidationProfiler
-  VERSION = "0.1.11"
+  VERSION = "0.2.0"
 end

data/lib/validation_profiler.rb

@@ -36,7 +36,7 @@ class ValidationManager
   # @param profile [ClassName] The class name of the validation profile to validate against
   #
   # @return [ValidationManagerResult] The result of the validation
-  def validate(obj, profile)
+  def validate(obj, profile, parent = nil)
 
     result = ValidationManagerResult.new
 
@@ -49,11 +49,13 @@ class ValidationManager
       end
 
       rule = ValidationRuleManager.instance.get_rule(r[:name])
-      outcome = rule.validate(obj, r[:field], r[:attributes])
+      outcome = rule.validate(obj, r[:field], r[:attributes], parent)
 
-      if !outcome
+      if outcome.is_a?(ValidationManagerResult)
+        result = outcome
+      elsif !outcome
         result.outcome = false
-        result.errors.push({ field: r[:field], message: rule.error_message(r[:field], r[:attributes]) })
+        result.errors.push({ field: r[:field], message: rule.error_message(r[:field], r[:attributes], parent) })
       end
 
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: validation_profiler
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.2.0
 platform: ruby
 authors:
 - vaughanbrittonsage
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-14 00:00:00.000000000 Z
+date: 2016-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler