[F] Alter pointerValue to be a JSONSubscriptType.

sschmidt · Jan 21, 2016 · b13d363 · b13d363
1 parent 255eb8b
commit b13d363
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/JsonPatchSwift/JPSJsonPatch.swift b/JsonPatchSwift/JPSJsonPatch.swift
@@ -100,13 +100,15 @@ extension JPSJsonPatch {
             throw JPSJsonPatchInitialisationError.InvalidPatchFormat(message: "Operation '\(operation)' is invalid.")
         }
 
+        let pointer = try JPSJsonPointer(rawValue: path)
+
         switch JPSOperation.JPSOperationType(rawValue: operation)! {
-        case .Add: return JPSOperation(type: JPSOperation.JPSOperationType.Add)
-        case .Remove: return JPSOperation(type: JPSOperation.JPSOperationType.Remove)
-        case .Replace: return JPSOperation(type: JPSOperation.JPSOperationType.Replace)
-        case .Move: return JPSOperation(type: JPSOperation.JPSOperationType.Move)
-        case .Copy: return JPSOperation(type: JPSOperation.JPSOperationType.Copy)
-        case .Test: return JPSOperation(type: JPSOperation.JPSOperationType.Test)
+        case .Add: return JPSOperation(type: JPSOperation.JPSOperationType.Add, pointer: pointer)
+        case .Remove: return JPSOperation(type: JPSOperation.JPSOperationType.Remove, pointer: pointer)
+        case .Replace: return JPSOperation(type: JPSOperation.JPSOperationType.Replace, pointer: pointer)
+        case .Move: return JPSOperation(type: JPSOperation.JPSOperationType.Move, pointer: pointer)
+        case .Copy: return JPSOperation(type: JPSOperation.JPSOperationType.Copy, pointer: pointer)
+        case .Test: return JPSOperation(type: JPSOperation.JPSOperationType.Test, pointer: pointer)
         }
     }
 

diff --git a/JsonPatchSwift/JPSJsonPointer.swift b/JsonPatchSwift/JPSJsonPointer.swift
@@ -20,7 +20,7 @@ enum JPSJsonPointerError: ErrorType {
 struct JPSJsonPointer {
 
     let rawValue: String
-    let pointerValue: [String]
+    let pointerValue: [JSONSubscriptType]
 
 }
 
@@ -39,7 +39,7 @@ extension JPSJsonPointer {
 
         let pointerValueWithoutFirstDelimiter = Array(rawValue.componentsSeparatedByString("/").dropFirst())
         let pointerValueAfterDecodingDelimiter = pointerValueWithoutFirstDelimiter.map { $0.stringByReplacingOccurrencesOfString("~1", withString: "/") }
-        let pointerValue = pointerValueAfterDecodingDelimiter.map { $0.stringByReplacingOccurrencesOfString("~0", withString: "~") }
+        let pointerValue: [JSONSubscriptType] = pointerValueAfterDecodingDelimiter.map { $0.stringByReplacingOccurrencesOfString("~0", withString: "~")}
 
         self.init(rawValue: rawValue, pointerValue: pointerValue)
     }
@@ -57,10 +57,10 @@ extension JPSJsonPointer {
 
         for i in 0..<pointer.pointerValue.count {
             if tempJson.type == .Array {
-                if "-" == pointer.pointerValue[i] {
+                if let value = pointer.pointerValue[i] as? String where "-" == value {
                     tempJson = tempJson.arrayValue.last!
-                } else {
-                    tempJson = tempJson[Int(pointer.pointerValue[i])!]
+                } else if let value = pointer.pointerValue[i] as? Int {
+                    tempJson = tempJson[value]
                 }
             } else {
                 tempJson = tempJson[pointer.pointerValue[i]]