validation_profiler 1.3.5 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7829ec1df6578a2bfe80d7724bd7fadce92494f5
-  data.tar.gz: b196fe267a544e1046774a9bbcb6428bc537a5b7
+  metadata.gz: b30c9295a13e83dfcf6acbf158e520f1679ee1cd
+  data.tar.gz: b096548df1dceba53873a7bd3b165d9476c72d68
 SHA512:
-  metadata.gz: 78d04018153cc0434f32436b1d42b1d4cde2ea409906d25dec22f1b20c3c603c2e7716101ae35bedba91359d0f15c218f3650dca3e1d3608891fb805e3b4c414
-  data.tar.gz: cae3746d4cd3ac17ba7fa5c827073f51cfc84ca3c0d038fc7c2e11c9970c8e1e475cb619e2e53113272a873ed9957a8899f1592aea9a449bc80feeffb5b49db5
+  metadata.gz: 62c0c1e1f28d8a74fe83ba003924d33f4949e920b1a4d7e1fd7933fe47505c7c695b89c6440d9728ae2b5258660a932f3f1c019ec4ac5699488969096c1c3e32
+  data.tar.gz: a6ba25274094599fc17fe07b4a5a42599a853d53172ef7c51081c031c7da82bbe93f00590c00d7cd835353933e594d3a3e9f198897791f97d4aaba658f6691ef

data/lib/validation_profiler/rules/condition_validation_rule.rb

@@ -1,93 +1,74 @@
 module ValidationProfiler
   module Rules
+    # Defines the ConditionValidationRule class
     class ConditionValidationRule < 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 not valid"
         else
           attributes[:message]
         end
       end
 
-
-      def validate(obj, field, attributes, parent = nil)
-
-        #attempt to get the field value from the object
+      def validate(obj, field, attributes, _parent = nil)
+        # attempt to get the field value from the object
         value = get_field_value(obj, field)
 
         condition_field = attributes[:condition_field]
-        if condition_field == nil
-          raise ValidationProfiler::Exceptions::InvalidValidationRuleAttributes.new(ValidationProfiler::Rules::ConditionValidationRule, field)
+        if condition_field.nil?
+          raise ValidationProfiler::Exceptions::InvalidValidationRuleAttributes
+            .new(ValidationProfiler::Rules::ConditionValidationRule, field)
         end
 
         condition_value = attributes[:condition_value]
-        if condition_value == nil
-          raise ValidationProfiler::Exceptions::InvalidValidationRuleAttributes.new(ValidationProfiler::Rules::ConditionValidationRule, field)
+        if condition_value.nil?
+          raise ValidationProfiler::Exceptions::InvalidValidationRuleAttributes
+            .new(ValidationProfiler::Rules::ConditionValidationRule, field)
         end
 
         condition_expression = attributes[:condition_expression]
-        if condition_expression == nil
-          raise ValidationProfiler::Exceptions::InvalidValidationRuleAttributes.new(ValidationProfiler::Rules::ConditionValidationRule, field)
+        if condition_expression.nil?
+          raise ValidationProfiler::Exceptions::InvalidValidationRuleAttributes
+            .new(ValidationProfiler::Rules::ConditionValidationRule, field)
         end
 
         field_expression = attributes[:field_expression]
-        if field_expression == nil
-          raise ValidationProfiler::Exceptions::InvalidValidationRuleAttributes.new(ValidationProfiler::Rules::ConditionValidationRule, field)
+        if field_expression.nil?
+          raise ValidationProfiler::Exceptions::InvalidValidationRuleAttributes
+            .new(ValidationProfiler::Rules::ConditionValidationRule, field)
         end
 
         field_value = attributes[:field_value]
-        if field_value == nil
-          raise ValidationProfiler::Exceptions::InvalidValidationRuleAttributes.new(ValidationProfiler::Rules::ConditionValidationRule, field)
+        if field_value.nil?
+          raise ValidationProfiler::Exceptions::InvalidValidationRuleAttributes
+            .new(ValidationProfiler::Rules::ConditionValidationRule, field)
         end
 
-        if !is_required?(value, attributes)
-          return true
-        end
+        return true unless is_required?(value, attributes)
 
         condition_field_value = get_field_value(obj, condition_field)
 
-        #check if the condition is valid
+        # check if the condition is valid
         if confirm_expression?(condition_field_value, condition_expression, condition_value)
-          #check if the field value is correct for the condition
-          if confirm_expression?(value, field_expression, field_value)
-            return true
-          else
-            return false
-          end
+          # check if the field value is correct for the condition
+          return false unless confirm_expression?(value, field_expression, field_value)
+          return true
         end
 
-        return true
-
+        true
       end
 
       def confirm_expression?(value_a, expression, value_b)
         a = value_a
         b = value_b
 
-        if value_a.is_a?(String)
-          a = "'#{value_a}'"
-        elsif value_a == nil
-          a = 'nil'
-        end
-
-        if value_b.is_a?(String)
-          b = "'#{value_b}'"
-        elsif value_b == nil
-          b = 'nil'
-        end
-
-        eval("#{a} #{expression} #{b}")
+        a.public_send(expression.to_s, b)
       end
-
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: validation_profiler
 version: !ruby/object:Gem::Version
-  version: 1.3.5
+  version: 1.4.0
 platform: ruby
 authors:
 - Sage One
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-08 00:00:00.000000000 Z
+date: 2017-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -126,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: A Validation framework for creating validation profiles, allowing for the