fix: check to see if prefix is before build and visa versa in isBuild isPr… (#358)

* check to see if prefix is before build and visa versa in isBuild isPreRelease

* add more tests and fix split

* take out extra call to contains

Author: thomaszurkan-optimizely

Sources/Data Model/Audience/SemanticVersion.swift

@@ -40,10 +40,10 @@ extension SemanticVersion {
             } else if !versionParts[idx].isNumber {
                 //Compare strings
                 if versionParts[idx] < targetedVersionParts[idx] {
-                    return -1;
+                    return targetedVersion.isPreRelease && !self.isPreRelease ? 1: -1;
                 }
                 else if versionParts[idx] > targetedVersionParts[idx] {
-                    return 1;
+                    return !targetedVersion.isPreRelease && self.isPreRelease ? -1: 1;
                 }
 
             } else if let part = Int(versionParts[idx]), let target = Int(targetedVersionParts[idx]){
@@ -74,7 +74,8 @@ extension SemanticVersion {
         }
 
         if isPreRelease || isBuild {
-            targetParts = split(separator: isPreRelease ? preReleaseSeperator : buildSeperator)
+            targetParts = split(separator: isPreRelease ? preReleaseSeperator : buildSeperator,
+            maxSplits: 1)
             guard let targetParts = targetParts, targetParts.count > 1 else {
                 throw OptimizelyError.attributeFormatInvalid
             }
@@ -106,11 +107,11 @@ extension SemanticVersion {
     }
 
     var isPreRelease: Bool {
-        return contains("-")
+        return firstIndex(of: "-")?.utf16Offset(in: self) ?? Int.max < firstIndex(of: "+")?.utf16Offset(in: self) ?? Int.max
     }
 
     var isBuild: Bool {
-        return contains("+")
+        return firstIndex(of: "+")?.utf16Offset(in: self) ?? Int.max < firstIndex(of: "-")?.utf16Offset(in: self) ?? Int.max
     }
 
     var buildSeperator:Character {
@@ -127,11 +128,11 @@ extension Substring {
     }
 
     var isPreRelease: Bool {
-        return contains("-")
+        return firstIndex(of: "-")?.utf16Offset(in: self) ?? Int.max < firstIndex(of: "+")?.utf16Offset(in: self) ?? Int.max
     }
 
     var isBuild: Bool {
-        return contains("+")
+        return firstIndex(of: "+")?.utf16Offset(in: self) ?? Int.max < firstIndex(of: "-")?.utf16Offset(in: self) ?? Int.max
     }
 
 }

Tests/OptimizelyTests-DataModel/SemanticVersionTests.swift

@@ -154,6 +154,20 @@ class SemanticVersionTests: XCTestCase {
         XCTAssert(try version.compareVersion(targetedVersion: target) > 0)
     }
 
+    func testTargetBetaComplex() {
+        let target = "2.1.3-beta+1"
+        let version = "2.1.3-beta+1.2.3"
+        
+        XCTAssert(try version.compareVersion(targetedVersion: target) > 0)
+    }
+
+    func testTargetBuildComplex() {
+        let target = "2.1.3+build-1.2.3"
+        let version = "2.1.3+build-1"
+        
+        XCTAssert(try version.compareVersion(targetedVersion: target) < 0)
+    }
+
     func testOtherTests() {
         let targets = ["2.1", "2.1", "2", "2"]
         let versions = ["2.1.0", "2.1.215", "2.12", "2.785.13"]
@@ -162,7 +176,34 @@ class SemanticVersionTests: XCTestCase {
             XCTAssert(try versions[idx].compareVersion(targetedVersion: target) == 0)
         }
     }
-    
+    func testDifferentAttributeAgainstBuild() {
+        let target = "3.7.0"
+        let version = "3.7.0+build"
+        
+        XCTAssert(try (version.compareVersion(targetedVersion: target)) == 0)
+    }
+
+    func testDifferentAttributeAgainstPreRelease() {
+        let target = "3.7.0"
+        let version = "3.7.0-prerelease"
+        
+        XCTAssert(try (version.compareVersion(targetedVersion: target)) < 0)
+    }
+
+    func testDifferentAttributeAgainstPreReleaseToBuild() {
+        let target = "3.7.0-prerelease"
+        let version = "3.7.0+build"
+        
+        XCTAssert(try (version.compareVersion(targetedVersion: target)) > 0)
+    }
+
+    func testDifferentAttributeAgainstPreReleaseToPreRelease() {
+        let target = "3.7.0-prerelease+build"
+        let version = "3.7.0-prerelease-prelrease+rc"
+        
+        XCTAssert(try (version.compareVersion(targetedVersion: target)) > 0)
+    }
+
     func testInvalidAttributes() {
         let target = "2.1.0"
         let versions = ["-", ".", "..", "+", "+test", " ", "2 .3. 0", "2.", ".2.2", "3.7.2.2", "3.x",