validation_profiler 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91535ba345c6a0bd0054c4bf41d535e933fed864f19e2bd28b84a0d5c459a4b3
-  data.tar.gz: 96ecb4ee6c75bdca5dd536964e79120e35d1733ed31e6711bc86bf9f54de9052
+  metadata.gz: cd242f26877fb5954baa686b282171c4a23140bf62b9c3aba54b852113e1b010
+  data.tar.gz: 322672ae856dc72c33b2a7a91a0301db199d915c92d40f692781ac8318640011
 SHA512:
-  metadata.gz: b32686a6c08567f043be516baf9389911d13a0e940d4e57e5df752c4345b88fbb4360723cf3ef9c0bb1ebd199bc0e4ca088fb08edfd4b52591561a4fcfdeed41
-  data.tar.gz: ab4d1e452e567edce9c30b1637d211f422eb179be236dbf2cf67944ee8f93fc2a8129b2fcde35c4d514d0861621a3f7ab30406cb010bc1e85d73729f521c77a9
+  metadata.gz: a65c9098384d2ea03032be86c4b849c3a4d3f3ab21f8a945218e2690a39a076167bf8eb36b67a1f2b3ae835a2a1e762fa5a730b1ed6c694be3d10675a77039fe
+  data.tar.gz: 01bf3313e874ceb2fd4165007289d38350ced6be514c9208a54e6b0d96131b159df55f5739641847ced169fe964b70b6285805090bd9397600286b42ea3894ed

data/lib/validation_profiler/rules/list_validation_rule.rb

@@ -1,50 +1,47 @@
 module ValidationProfiler
   module Rules
+    # ListValidationRule class
     class ListValidationRule < 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.
+        if attributes[:message].nil?
           "#{field_name} is not an accepted value."
         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
-
-        if field_value == nil
-          return false
-        end
+        return true unless is_required?(field_value, attributes)
+        return false if field_value.nil?
 
         list = attributes[:list]
-        if list == nil || !list.is_a?(Array)
-          raise ValidationProfiler::Exceptions::InvalidValidationRuleAttributes.new(ValidationProfiler::Rules::ListValidationRule, field)
-        end
+        regex = attributes[:regex]
 
-        if !list.include?(field_value)
-          return false
-        end
+        raise_invalid_exception!(field) if regex.nil? && list.nil?
 
-        return true
+        if list
+          raise_invalid_exception!(field) unless list.is_a?(Array)
+          return false unless list.include?(field_value)
+        elsif regex
+          field_value.each do |value|
+            return false unless value =~ regex
+          end
+        end
 
+        true
       end
 
+      private
+
+      def raise_invalid_exception!(field)
+        raise ValidationProfiler::Exceptions::InvalidValidationRuleAttributes
+          .new(ValidationProfiler::Rules::ListValidationRule, field)
+      end
     end
   end
-end
+end

data/lib/validation_profiler/version.rb

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

metadata

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