validation_profiler 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd242f26877fb5954baa686b282171c4a23140bf62b9c3aba54b852113e1b010
-  data.tar.gz: 322672ae856dc72c33b2a7a91a0301db199d915c92d40f692781ac8318640011
+  metadata.gz: 043535effac77ff6205ee511cc20214c5dad1de512014ecf1db561891e025791
+  data.tar.gz: 0d8d7081096e6a7375efc624a4a202597a14a6975d21d7d8e7996ba7590df7f2
 SHA512:
-  metadata.gz: a65c9098384d2ea03032be86c4b849c3a4d3f3ab21f8a945218e2690a39a076167bf8eb36b67a1f2b3ae835a2a1e762fa5a730b1ed6c694be3d10675a77039fe
-  data.tar.gz: 01bf3313e874ceb2fd4165007289d38350ced6be514c9208a54e6b0d96131b159df55f5739641847ced169fe964b70b6285805090bd9397600286b42ea3894ed
+  metadata.gz: 4c38cb57d62d8c4f324b27daf6d7eda4371474cfa608b863b7b158a2eeefe96cd8f66dbd32da9003560940eb3d5058c3d1967c2986c76edcf68738368d1c63b0
+  data.tar.gz: ba93d8133e0497e89d5e6d0a60f3d93943eb29424d4eaba0ee5a07b7aa36c5c088a6cc4a2d400730b9465611077f36f28de976d57e83ee164d246a5c58e499a5

data/lib/validation_profiler/manager.rb

@@ -1,6 +1,5 @@
 module ValidationProfiler
   class Manager
-
     # Called to validate an object against a validation profile.
     #
     # @param obj [Object] The object to validate
@@ -8,33 +7,32 @@ module ValidationProfiler
     #
     # @return [ValidationManagerResult] The result of the validation
     def validate(obj, profile, parent = nil)
-
       result = ValidationProfiler::ManagerResult.new
 
       validation_rules = profile.class_variable_get(:@@validation_rules)
 
       validation_rules.each do |r|
 
-        if ValidationProfiler::Rules::Manager.instance == nil
+        if ValidationProfiler::Rules::Manager.instance.nil?
           ValidationProfiler::Rules::Manager.new
         end
 
         rule = ValidationProfiler::Rules::Manager.instance.get_rule(r[:name])
         outcome = rule.validate(obj, r[:field], r[:attributes], parent)
 
-        if outcome.is_a?(ValidationProfiler::ManagerResult) && !outcome.outcome
+        if outcome.is_a?(Array)
+          result.errors = outcome.map(&:errors).flatten
+          result.outcome = result.errors.empty?
+        elsif outcome.is_a?(ValidationProfiler::ManagerResult) && !outcome.outcome
           result.errors = result.errors + outcome.errors
           result.outcome = false
         elsif !outcome
           result.outcome = false
-          result.errors.push({ field: r[:field], message: rule.error_message(r[:field], r[:attributes], parent) })
+          result.errors.push(field: r[:field], message: rule.error_message(r[:field], r[:attributes], parent))
         end
-
       end
 
       result
-
     end
-
   end
-end
+end

data/lib/validation_profiler/rules/child_validation_rule.rb

@@ -1,17 +1,14 @@
 module ValidationProfiler
   module Rules
+    # Validation rule for child attributes
     class ChildValidationRule < ValidationProfiler::Rules::ValidationRule
-
       def error_message(field, attributes = {}, parent = nil)
-
         field_name = field.to_s
-        if parent != nil
-          field_name = "#{parent.to_s}.#{field.to_s}"
-        end
+        field_name = "#{parent}.#{field}" unless parent.nil?
 
-        #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.
+        # 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]
@@ -19,32 +16,41 @@ module ValidationProfiler
       end
 
       def validate(obj, field, attributes = {}, parent = nil)
-
-        #attempt to get the field value from the object
+        # 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
+        return true unless is_required?(field_value, attributes)
+        return false if field_value.nil?
+        return false if field_value.respond_to?(:empty?) && field_value.empty?
 
-        profile = attributes[:profile]
-        if profile == nil
-          raise ValidationProfiler::Exceptions::InvalidValidationRuleAttributes.new(ValidationProfiler::Rules::ChildValidationRule, field)
-        end
+        validation_profile = get_validation_profile(attributes, field)
+        parent_field = build_parent_field(parent, field)
 
-        if field_value == nil
-          return false
-        end
+        validate_field_value(field_value, validation_profile, parent_field)
+      end
 
-        parent_field = field.to_s
-        if parent != nil
-          parent_field = "#{parent.to_s}.#{field.to_s}"
+      def validate_field_value(field_value, profile, parent_field)
+        if field_value.is_a? Array
+          field_value.map { |value| ValidationProfiler::Manager.new.validate(value, profile, parent_field) }
+        else
+          ValidationProfiler::Manager.new.validate(field_value, profile, parent_field)
         end
+      end
 
-        return ValidationProfiler::Manager.new.validate(field_value, profile, parent_field)
+      def build_parent_field(parent, field)
+        return field.to_s if parent.nil?
 
+        "#{parent}.#{field}"
       end
 
+      def get_validation_profile(attributes, field)
+        if attributes[:profile].nil?
+          raise ValidationProfiler::Exceptions::InvalidValidationRuleAttributes
+            .new(ValidationProfiler::Rules::ChildValidationRule, field)
+        end
+
+        attributes[:profile]
+      end
     end
   end
-end
+end

data/lib/validation_profiler/version.rb

@@ -1,5 +1,5 @@
 # Namespace
 module ValidationProfiler
   # :nodoc:
-  VERSION = '1.6.0'.freeze
+  VERSION = '1.7.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: validation_profiler
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Sage One
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-03 00:00:00.000000000 Z
+date: 2019-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -140,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A Validation framework for creating validation profiles, allowing for the