ae_easy-qa 0.0.30 → 0.0.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed84890a1e1c73d0b31bd188f1fb159083141e74cffcb8b97e8e9e2636bb3cb0
-  data.tar.gz: 3abeb7da3deee197330ff9520267570585ce425b44987f2425cf20df623c5d9f
+  metadata.gz: 416c61a1278ed49302c21159cafdc417a98076530cd9645676d251f863f9e20d
+  data.tar.gz: f2c31c16cb3acbdbaf213c7b8b0990016b2a094b66284191ba6e205d9dc7d591
 SHA512:
-  metadata.gz: e07fbcce3494f1f07b1848ddb86a036c20d27df581cd665da00dc3dcf56b42e569d7b19fe1da11cde300d5eddf2dd2c345dc50dbd7b346d119da4929c10c9920
-  data.tar.gz: 53fdcb4d8883a0ff1f13b5e207adcb53c09a26a4ae9a75e5003e5006fadca3d18dfd05affdbbee25a7111837941c9c082208031565fe2ed4ee14cf45c62ed7d8
+  metadata.gz: f7cce174631df9b2f1b652b62512d18bf9de2b16cf2c2dfaced10f25f1743578b47cc5c48b2335274cff19e03d88b264444f1bff8b2acee13c8c258ed8bfac89
+  data.tar.gz: f36b9f6dad009c01f20d6865c380b4b01e790d0c7e2fdd946fcb2f9fc8b6e04be084b74c502007a9dcbd021636aac03088af239d49fcc41b807728acf819829e

data/lib/ae_easy/qa/helpers.rb

@@ -8,19 +8,34 @@ module AeEasy
       end
 
       def pass_if?(if_params, data_hash)
-        field_name = if_params.keys.first
-        condition_hash = if_params[field_name]
+        case if_params.keys.first
+        when 'and', 'or'
+          operator = if_params.keys.first
+          evaluations = if_params[operator].collect{|child_if_params|
+            field_name = child_if_params.keys.first
+            condition_hash = child_if_params[field_name]
+            evaluate_condition(field_name, condition_hash, data_hash)
+          }
+          operator == 'and' ? evaluations.all? : evaluations.any?
+        else
+          field_name = if_params.keys.first
+          condition_hash = if_params[field_name]
+          evaluate_condition(field_name, condition_hash, data_hash)
+        end
+      end
+
+      def evaluate_condition(field_name, condition_hash, data_hash)
         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)
+            !(data_hash[field_name].to_s =~ Regexp.new(value_hash['regex'], true)).nil?
           elsif value_hash['less_than']
-            data_hash[field_name] < value_hash['less_than']
+            data_hash[field_name].to_i < value_hash['less_than'].to_i
           elsif value_hash['greater_than']
-            data_hash[field_name] > value_hash['greater_than']
+            data_hash[field_name].to_i > value_hash['greater_than'].to_i
           else
             raise StandardError.new("The if condition '#{value_hash}' is unknown.")
           end

data/lib/ae_easy/qa/validate_value.rb

@@ -36,9 +36,9 @@ module AeEasy
         elsif params['regex']
           add_errored_item(data_hash, field_to_validate, 'value') if (data_hash[field_to_validate].to_s !~ Regexp.new(params['regex'], true))
         elsif params['less_than']
-          add_errored_item(data_hash, field_to_validate, 'value') if !(data_hash[field_to_validate] < params['less_than'])
+          add_errored_item(data_hash, field_to_validate, 'value') if !(data_hash[field_to_validate].to_i < params['less_than'].to_i)
         elsif params['greater_than']
-          add_errored_item(data_hash, field_to_validate, 'value') if !(data_hash[field_to_validate] > params['greater_than'])
+          add_errored_item(data_hash, field_to_validate, 'value') if !(data_hash[field_to_validate].to_i > params['greater_than'].to_i)
         else
           unknown_value_error
         end

data/lib/ae_easy/qa/version.rb

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

metadata

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