Support Level 3 Operators

SwiftScream · May 1, 2018 · db5ded8 · db5ded8
1 parent 4062b66
commit db5ded8
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 3 deletions.
diff --git a/Source/Internal/Components.swift b/Source/Internal/Components.swift
@@ -64,6 +64,12 @@ internal struct ExpressionComponent : Component {
             guard let encodedValue = value.addingPercentEncoding(withAllowedCharacters: configuration.percentEncodingAllowedCharacterSet) else {
                 throw URITemplate.Error.expansionFailure(position: templatePosition, reason: "Failed expanding variable \"\(variableName)\": Percent Encoding Failed")
             }
+            if (configuration.named) {
+                if (encodedValue.isEmpty && configuration.omittOrphanedEquals) {
+                    return String(variableName)
+                }
+                return "\(variableName)=\(encodedValue)"
+            }
             return encodedValue
         }
         if (expansions.count == 0) {

diff --git a/Source/Internal/ExpansionConfiguration.swift b/Source/Internal/ExpansionConfiguration.swift
@@ -18,4 +18,6 @@ internal struct ExpansionConfiguration {
     let percentEncodingAllowedCharacterSet: CharacterSet
     let prefix: String?
     let separator: String
+    let named: Bool
+    let omittOrphanedEquals: Bool
 }
diff --git a/Source/Internal/ExpressionOperator.swift b/Source/Internal/ExpressionOperator.swift
@@ -18,21 +18,62 @@ internal enum ExpressionOperator : Unicode.Scalar {
     case simple = "\0"
     case reserved = "+"
     case fragment = "#"
+    case label = "."
+    case pathSegment = "/"
+    case pathStyle = ";"
+    case query = "?"
+    case queryContinuation = "&"
 
     func expansionConfiguration() -> ExpansionConfiguration {
         switch self {
         case .simple:
             return ExpansionConfiguration(percentEncodingAllowedCharacterSet:unreservedCharacterSet,
                                           prefix:nil,
-                                          separator:",")
+                                          separator:",",
+                                          named:false,
+                                          omittOrphanedEquals:false)
         case .reserved:
             return ExpansionConfiguration(percentEncodingAllowedCharacterSet:reservedAndUnreservedCharacterSet,
                                           prefix:nil,
-                                          separator:",")
+                                          separator:",",
+                                          named:false,
+                                          omittOrphanedEquals:false)
         case .fragment:
             return ExpansionConfiguration(percentEncodingAllowedCharacterSet:reservedAndUnreservedCharacterSet,
                                           prefix:"#",
-                                          separator:",")
+                                          separator:",",
+                                          named:false,
+                                          omittOrphanedEquals:false)
+        case .label:
+            return ExpansionConfiguration(percentEncodingAllowedCharacterSet:unreservedCharacterSet,
+                                          prefix:".",
+                                          separator:".",
+                                          named:false,
+                                          omittOrphanedEquals:false)
+        case .pathSegment:
+            return ExpansionConfiguration(percentEncodingAllowedCharacterSet:unreservedCharacterSet,
+                                          prefix:"/",
+                                          separator:"/",
+                                          named:false,
+                                          omittOrphanedEquals:false)
+        case .pathStyle:
+            return ExpansionConfiguration(percentEncodingAllowedCharacterSet:unreservedCharacterSet,
+                                          prefix:";",
+                                          separator:";",
+                                          named:true,
+                                          omittOrphanedEquals:true)
+        case .query:
+            return ExpansionConfiguration(percentEncodingAllowedCharacterSet:unreservedCharacterSet,
+                                          prefix:"?",
+                                          separator:"&",
+                                          named:true,
+                                          omittOrphanedEquals:false)
+        case .queryContinuation:
+            return ExpansionConfiguration(percentEncodingAllowedCharacterSet:unreservedCharacterSet,
+                                          prefix:"&",
+                                          separator:"&",
+                                          named:true,
+                                          omittOrphanedEquals:false)
         }
     }
 }