Merge pull request #510 from splitio/semver-greater-equalto-matcher

added greater or equal to semver matcher

Author: chillaq

splitio/models/grammar/matchers/__init__.py

@@ -8,7 +8,7 @@
 from splitio.models.grammar.matchers.string import ContainsStringMatcher, \
     EndsWithMatcher, RegexMatcher, StartsWithMatcher, WhitelistMatcher
 from splitio.models.grammar.matchers.misc import BooleanMatcher, DependencyMatcher
-from splitio.models.grammar.matchers.semver import EqualToSemverMatcher
+from splitio.models.grammar.matchers.semver import EqualToSemverMatcher, GreaterThanOrEqualToSemverMatcher
 
 
 MATCHER_TYPE_ALL_KEYS = 'ALL_KEYS'
@@ -29,7 +29,7 @@
 MATCHER_TYPE_EQUAL_TO_BOOLEAN = 'EQUAL_TO_BOOLEAN'
 MATCHER_TYPE_MATCHES_STRING = 'MATCHES_STRING'
 MATCHER_TYPE_EQUAL_TO_SEMVER = 'EQUAL_TO_SEMVER'
-
+MATCHER_GREATER_THAN_OR_EQUAL_TO_SEMVER = 'GREATER_THAN_OR_EQUAL_TO_SEMVER'
 
 _MATCHER_BUILDERS = {
     MATCHER_TYPE_ALL_KEYS: AllKeysMatcher,
@@ -49,11 +49,10 @@
     MATCHER_TYPE_IN_SPLIT_TREATMENT: DependencyMatcher,
     MATCHER_TYPE_EQUAL_TO_BOOLEAN: BooleanMatcher,
     MATCHER_TYPE_MATCHES_STRING: RegexMatcher,
-    MATCHER_TYPE_EQUAL_TO_SEMVER: EqualToSemverMatcher
-
+    MATCHER_TYPE_EQUAL_TO_SEMVER: EqualToSemverMatcher,
+    MATCHER_GREATER_THAN_OR_EQUAL_TO_SEMVER: GreaterThanOrEqualToSemverMatcher
 }
 
-
 def from_raw(raw_matcher):
     """
     Parse a condition from a JSON portion of splitChanges.

splitio/models/grammar/matchers/semver.py

@@ -214,3 +214,52 @@ def __str__(self):
     def _add_matcher_specific_properties_to_json(self):
         """Add matcher specific properties to base dict before returning it."""
         return {'matcherType': 'EQUAL_TO_SEMVER', 'stringMatcherData': self._data}
+
+class GreaterThanOrEqualToSemverMatcher(Matcher):
+    """A matcher for Semver greater than or equal to."""
+
+    def _build(self, raw_matcher):
+        """
+        Build a GreaterThanOrEqualToSemverMatcher.
+
+        :param raw_matcher: raw matcher as fetched from splitChanges response.
+        :type raw_matcher: dict
+        """
+        self._data = raw_matcher.get('stringMatcherData')
+        self._semver = Semver.build(self._data)
+
+    def _match(self, key, attributes=None, context=None):
+        """
+        Evaluate user input against a matcher and return whether the match is successful.
+
+        :param key: User key.
+        :type key: str.
+        :param attributes: Custom user attributes.
+        :type attributes: dict.
+        :param context: Evaluation context
+        :type context: dict
+
+        :returns: Wheter the match is successful.
+        :rtype: bool
+        """
+        if self._data is None or self._semver is None:
+            _LOGGER.error("stringMatcherData is required for GREATER_THAN_OR_EQUAL_TO_SEMVER matcher type")
+            return False
+
+        matching_data = Sanitizer.ensure_string(self._get_matcher_input(key, attributes))
+        if matching_data is None:
+            return False
+
+        matching_semver = Semver.build(matching_data)
+        if matching_semver is None:
+            return False
+
+        return matching_semver.compare(self._semver) in [0, 1]
+
+    def __str__(self):
+        """Return string Representation."""
+        return 'greater than or equal to semver {data}'.format(data=self._data)
+
+    def _add_matcher_specific_properties_to_json(self):
+        """Add matcher specific properties to base dict before returning it."""
+        return {'matcherType': 'GREATER_THAN_OR_EQUAL_TO_SEMVER', 'stringMatcherData': self._data}

tests/models/grammar/test_matchers.py

@@ -926,3 +926,45 @@ def test_to_str(self):
         """Test that the object serializes to str properly."""
         as_str = matchers.EqualToSemverMatcher(self.raw)
         assert str(as_str) == "equal semver 2.1.8"
+
+class GreaterThanOrEqualToSemverMatcherTests(MatcherTestsBase):
+    """Semver greater or equalto matcher test cases."""
+
+    raw = {
+        'negate': False,
+        'matcherType': 'GREATER_THAN_OR_EQUAL_TO_SEMVER',
+        'stringMatcherData': "2.1.8"
+    }
+
+    def test_from_raw(self, mocker):
+        """Test parsing from raw json/dict."""
+        parsed = matchers.from_raw(self.raw)
+        assert isinstance(parsed, matchers.GreaterThanOrEqualToSemverMatcher)
+        assert parsed._data == "2.1.8"
+        assert isinstance(parsed._semver, Semver)
+        assert parsed._semver._major == 2
+        assert parsed._semver._minor == 1
+        assert parsed._semver._patch == 8
+        assert parsed._semver._pre_release == []
+
+    def test_matcher_behaviour(self, mocker):
+        """Test if the matcher works properly."""
+        parsed = matchers.from_raw(self.raw)
+        assert parsed._match("2.1.8+rc")
+        assert parsed._match("2.1.8")
+        assert parsed._match("2.1.11")
+        assert not parsed._match("2.1.5")
+        assert not parsed._match("2.1.5-rc1")
+        assert not parsed._match(None)
+        assert not parsed._match("semver")
+
+    def test_to_json(self):
+        """Test that the object serializes to JSON properly."""
+        as_json = matchers.GreaterThanOrEqualToSemverMatcher(self.raw).to_json()
+        assert as_json['matcherType'] == 'GREATER_THAN_OR_EQUAL_TO_SEMVER'
+        assert as_json['stringMatcherData'] == "2.1.8"
+
+    def test_to_str(self):
+        """Test that the object serializes to str properly."""
+        as_str = matchers.GreaterThanOrEqualToSemverMatcher(self.raw)
+        assert str(as_str) == "greater than or equal to semver 2.1.8"