Merge pull request #69 from Flagsmith/fix/nil-safe-operators

Make segment operators nil-safe

Author: zachaysan

lib/flagsmith/engine/segments/models.rb

@@ -37,15 +37,15 @@ class Condition
 
         MATCHING_FUNCTIONS = {
           EQUAL => ->(other_value, self_value) { other_value == self_value },
-          GREATER_THAN => ->(other_value, self_value) { other_value > self_value },
-          GREATER_THAN_INCLUSIVE => ->(other_value, self_value) { other_value >= self_value },
-          LESS_THAN => ->(other_value, self_value) { other_value < self_value },
-          LESS_THAN_INCLUSIVE => ->(other_value, self_value) { other_value <= self_value },
+          GREATER_THAN => ->(other_value, self_value) { (other_value || false) && other_value > self_value },
+          GREATER_THAN_INCLUSIVE => ->(other_value, self_value) { (other_value || false) && other_value >= self_value },
+          LESS_THAN => ->(other_value, self_value) { (other_value || false) && other_value < self_value },
+          LESS_THAN_INCLUSIVE => ->(other_value, self_value) { (other_value || false) && other_value <= self_value },
           NOT_EQUAL => ->(other_value, self_value) { other_value != self_value },
-          CONTAINS => ->(other_value, self_value) { other_value.include? self_value },
+          CONTAINS => ->(other_value, self_value) { (other_value || false) && other_value.include?(self_value) },
 
-          NOT_CONTAINS => ->(other_value, self_value) { !other_value.include? self_value },
-          REGEX => ->(other_value, self_value) { other_value.match? self_value }
+          NOT_CONTAINS => ->(other_value, self_value) { (other_value || false) && !other_value.include?(self_value) },
+          REGEX => ->(other_value, self_value) { (other_value || false) && other_value.match?(self_value) }
         }.freeze
 
         def initialize(operator:, value:, property: nil)

spec/engine/unit/segments/models_spec.rb

@@ -13,24 +13,28 @@
   ['EQUAL', true, 'false', false],
   ['EQUAL', 1.23, '1.23', true],
   ['EQUAL', 1.23, '4.56', false],
+  ['GREATER_THAN', nil, '1', false],
   ['GREATER_THAN', 2, '1', true],
   ['GREATER_THAN', 1, '1', false],
   ['GREATER_THAN', 0, '1', false],
   ['GREATER_THAN', 2.1, '2.0', true],
   ['GREATER_THAN', 2.1, '2.1', false],
   ['GREATER_THAN', 2.0, '2.1', false],
+  ['GREATER_THAN_INCLUSIVE', nil, '1', false],
   ['GREATER_THAN_INCLUSIVE', 2, '1', true],
   ['GREATER_THAN_INCLUSIVE', 1, '1', true],
   ['GREATER_THAN_INCLUSIVE', 0, '1', false],
   ['GREATER_THAN_INCLUSIVE', 2.1, '2.0', true],
   ['GREATER_THAN_INCLUSIVE', 2.1, '2.1', true],
   ['GREATER_THAN_INCLUSIVE', 2.0, '2.1', false],
+  ['LESS_THAN', nil, '2', false],
   ['LESS_THAN', 1, '2', true],
   ['LESS_THAN', 1, '1', false],
   ['LESS_THAN', 1, '0', false],
   ['LESS_THAN', 2.0, '2.1', true],
   ['LESS_THAN', 2.1, '2.1', false],
   ['LESS_THAN', 2.1, '2.0', false],
+  ['LESS_THAN_INCLUSIVE', nil, '2', false],
   ['LESS_THAN_INCLUSIVE', 1, '2', true],
   ['LESS_THAN_INCLUSIVE', 1, '1', true],
   ['LESS_THAN_INCLUSIVE', 1, '0', false],
@@ -45,12 +49,15 @@
   ['NOT_EQUAL', false, 'true', true],
   ['NOT_EQUAL', false, 'false', false],
   ['NOT_EQUAL', true, 'true', false],
+  ['CONTAINS', nil, 'b', false],
   ['CONTAINS', 'bar', 'b', true],
   ['CONTAINS', 'bar', 'bar', true],
   ['CONTAINS', 'bar', 'baz', false],
+  ['NOT_CONTAINS', nil, 'b', false],
   ['NOT_CONTAINS', 'bar', 'b', false],
   ['NOT_CONTAINS', 'bar', 'bar', false],
   ['NOT_CONTAINS', 'bar', 'baz', true],
+  ['REGEX', nil, /[a-z]+/, false],
   ['REGEX', 'foo', /[a-z]+/, true],
   ['REGEX', 'FOO', /[a-z]+/, false],
   ['REGEX', '1.2.3', /\d/, true],