ae_easy-qa 0.0.29 → 0.0.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ce6bef710db31f58f1b5aa8be6c56a1236c7ccf351ce7182e25a2591b5b88ec
-  data.tar.gz: 5c1df465ff7784212593c3eea51600e81194eb95a0aaaf272c136990487f3456
+  metadata.gz: ed84890a1e1c73d0b31bd188f1fb159083141e74cffcb8b97e8e9e2636bb3cb0
+  data.tar.gz: 3abeb7da3deee197330ff9520267570585ce425b44987f2425cf20df623c5d9f
 SHA512:
-  metadata.gz: 63bd32612cd55d7da0bae8d6af5844d14503eb0ce14dd991b059c53eccfaec80f090dd850da1aa31f063796e6df9a79dd80dc8c297420e52f8cdea5685436197
-  data.tar.gz: f74ccf359c5f783d7fb2af685ace70dd44aa6ec8466f9b98966feb175c4aacd1eb18a9e6e7b4de12ef9a71fadc665b60ad0f30325e20948b50e9c59ae8915be9
+  metadata.gz: e07fbcce3494f1f07b1848ddb86a036c20d27df581cd665da00dc3dcf56b42e569d7b19fe1da11cde300d5eddf2dd2c345dc50dbd7b346d119da4929c10c9920
+  data.tar.gz: 53fdcb4d8883a0ff1f13b5e207adcb53c09a26a4ae9a75e5003e5006fadca3d18dfd05affdbbee25a7111837941c9c082208031565fe2ed4ee14cf45c62ed7d8

data/lib/ae_easy/qa/helpers.rb

@@ -6,6 +6,26 @@ module AeEasy
         errored_item[:failures][error_name.to_sym] = 'fail'
         errored_item[:item] = data_hash if errored_item[:data].nil?
       end
+
+      def pass_if?(if_params, data_hash)
+        field_name = if_params.keys.first
+        condition_hash = if_params[field_name]
+        case condition_hash.keys.first
+        when 'value'
+          value_hash = condition_hash['value'] #Ex: {"equal"=>"A"}
+          if value_hash['equal']
+            data_hash[field_name] == value_hash['equal']
+          elsif value_hash['regex']
+            data_hash[field_name].to_s =~ Regexp.new(value_hash['regex'], true)
+          elsif value_hash['less_than']
+            data_hash[field_name] < value_hash['less_than']
+          elsif value_hash['greater_than']
+            data_hash[field_name] > value_hash['greater_than']
+          else
+            raise StandardError.new("The if condition '#{value_hash}' is unknown.")
+          end
+        end
+      end
     end
   end
 end

data/lib/ae_easy/qa/validate_rules.rb

@@ -27,12 +27,12 @@ module AeEasy
               options.each{|validation, value|
                 case validation
                 when 'type'
-                  ValidateType.new(data_hash, field_to_validate, value, rules, errored_item).run if options['required']
+                  ValidateType.new(data_hash, field_to_validate, value, rules, errored_item).run
                 when 'value'
-                  ValidateValue.new(data_hash, field_to_validate, value, errored_item).run if options['required']
+                  ValidateValue.new(data_hash, field_to_validate, value, errored_item).run
                 when 'length'
-                  validate_length(data_hash, field_to_validate, value) if options['required']
-                when /required|threshold/
+                  validate_length(data_hash, field_to_validate, value)
+                when /required|threshold|if/
                   nil
                 else
                   unknown_validation_error(validation) if validation !~ /format/
@@ -46,8 +46,17 @@ module AeEasy
 
       def passes_required_check?(options, data_hash, field_to_validate)
         if options['required'] == true && fails_required_check?(data_hash, field_to_validate)
-          add_errored_item(data_hash, field_to_validate, 'required')
-          false
+          if options['if']
+            if pass_if?(options['if'], data_hash)
+              add_errored_item(data_hash, field_to_validate, 'required')
+              false
+            else
+              true
+            end
+          else
+            add_errored_item(data_hash, field_to_validate, 'required')
+            false
+          end
         else
           true
         end

data/lib/ae_easy/qa/validate_value.rb

@@ -13,33 +13,17 @@ module AeEasy
       end
 
       def run
-        condition_exists? ? handle_conditions : main_value_check
+        if_exists? ? handle_if : main_value_check
       end
 
       private
 
-      def condition_exists?
+      def if_exists?
         !params['if'].nil?
       end
 
-      def handle_conditions
-        field_name = params['if'].keys.first
-        condition_hash = params['if'][field_name]
-        case condition_hash.keys.first
-        when 'value'
-          value_hash = condition_hash['value'] #Ex: {"equal"=>"A"}
-          if value_hash['equal']
-            main_value_check if data_hash[field_name] == value_hash['equal']
-          elsif value_hash['regex']
-            main_value_check if data_hash[field_name].to_s =~ Regexp.new(value_hash['regex'], true)
-          elsif params['less_than']
-            main_value_check if data_hash[field_name] < value_hash['less_than']
-          elsif params['greater_than']
-            main_value_check if data_hash[field_name] > value_hash['greater_than']
-          else
-            raise StandardError.new("The if condition '#{value_hash}' is unknown.")
-          end
-        end
+      def handle_if
+        main_value_check if pass_if?(params['if'], data_hash)
       end
 
       def main_value_check

data/lib/ae_easy/qa/version.rb

@@ -1,5 +1,5 @@
 module AeEasy
   module Qa
-    VERSION = "0.0.29"
+    VERSION = "0.0.30"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ae_easy-qa
 version: !ruby/object:Gem::Version
-  version: 0.0.29
+  version: 0.0.30
 platform: ruby
 authors:
 - David Lynam
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-19 00:00:00.000000000 Z
+date: 2019-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: answersengine