fixed compare

Author: Bilal Al

splitio/models/grammar/matchers/semver.py

@@ -7,7 +7,7 @@
 
 _LOGGER = logging.getLogger(__name__)
 
-class Semver(object, metaclass=abc.ABCMeta):
+class Semver(object):
     """Semver class."""
 
     _METADATA_DELIMITER = "+"
@@ -26,14 +26,25 @@ def __init__(self, version):
         self._patch = 0
         self._pre_release = []
         self._is_stable = False
-        self._old_version = version
-        self._parse()
+        self.version = ""
+        self._metadata = ""
+        self._parse(version)
+
+    @classmethod
+    def build(cls, version):
+        try:
+            self = cls(version)
+        except RuntimeError as e:
+            _LOGGER.error("Failed to parse Semver data, incorrect data type:  %s", e)
+            return None
+
+        return self
 
-    def _parse(self):
+    def _parse(self, version):
         """
-        Parse the string in self._old_version to update the other internal variables
+        Parse the string in self.version to update the other internal variables
         """
-        without_metadata = self.remove_metadata_if_exists()
+        without_metadata = self.remove_metadata_if_exists(version)
 
         index = without_metadata.find(self._PRE_RELEASE_DELIMITER)
         if index == -1:
@@ -45,18 +56,19 @@ def _parse(self):
 
         self.set_major_minor_and_patch(without_metadata)
 
-    def remove_metadata_if_exists(self):
+    def remove_metadata_if_exists(self, version):
         """
-        Check if there is any metadata characters in self._old_version.
+        Check if there is any metadata characters in self.version.
 
         :returns: The semver string without the metadata
         :rtype: str
         """
-        index = self._old_version.find(self._METADATA_DELIMITER)
+        index = version.find(self._METADATA_DELIMITER)
         if index == -1:
-            return self._old_version
+            return version
 
-        return  self._old_version[:index]
+        self._metadata = version[index:]
+        return  version[:index]
 
     def set_major_minor_and_patch(self, version):
         """
@@ -74,6 +86,12 @@ def set_major_minor_and_patch(self, version):
         self._minor = int(parts[1])
         self._patch = int(parts[2])
 
+        self.version = "{major}{DELIMITER}{minor}{DELIMITER}{patch}".format(major = self._major, DELIMITER = self._VALUE_DELIMITER,
+                    minor = self._minor, patch = self._patch)
+        self.version += "{DELIMITER}{pre_release}".format(DELIMITER=self._PRE_RELEASE_DELIMITER,
+                    pre_release = '.'.join(self._pre_release)) if len(self._pre_release) > 0 else ""
+        self.version += "{DELIMITER}{metadata}".format(DELIMITER=self._METADATA_DELIMITER, metadata = self._metadata) if self._metadata != "" else ""
+
     def compare(self, to_compare):
         """
         Compare the current Semver object to a given Semver object, return:
@@ -87,7 +105,7 @@ def compare(self, to_compare):
         :returns: integer based on comparison
         :rtype: int
         """
-        if self._old_version == to_compare._old_version:
+        if self.version == to_compare.version:
             return 0
 
         # Compare major, minor, and patch versions numerically
@@ -178,7 +196,7 @@ def _match(self, key, attributes=None, context=None):
         if matching_data is None:
             return False
 
-        return self._semver.compare(Semver(matching_data)) == 0
+        return self._semver.version == Semver(matching_data).version
 
     def __str__(self):
         """Return string Representation."""