Merge pull request #71 from JaviSoto/master

Fixed typo (recieved instead of received)
Anviking · Jan 22, 2016 · 459c505 · 459c505
2 parents 8e3fea1 + 84a9d08
commit 459c505
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/Sources/Castable.swift b/Sources/Castable.swift
@@ -13,7 +13,7 @@ public protocol Castable: Decodable {}
 extension Castable {
     public static func decode(j: AnyObject) throws -> Self {
         guard let result = j as? Self else {
-            throw TypeMismatchError(expectedType: self, recievedType: j.dynamicType, object: j)
+            throw TypeMismatchError(expectedType: self, receivedType: j.dynamicType, object: j)
         }
         return result
     }

diff --git a/Sources/Decodable.swift b/Sources/Decodable.swift
@@ -15,7 +15,7 @@ public protocol Decodable {
 extension NSDictionary {
     public static func decode(j: AnyObject) throws -> NSDictionary {
         guard let result = j as? NSDictionary else {
-            throw TypeMismatchError(expectedType: self, recievedType: j.dynamicType, object: j)
+            throw TypeMismatchError(expectedType: self, receivedType: j.dynamicType, object: j)
         }
         return result
     }
@@ -24,7 +24,7 @@ extension NSDictionary {
 extension NSArray {
     public static func decode(j: AnyObject) throws -> NSArray {
         guard let result = j as? NSArray else {
-            throw TypeMismatchError(expectedType: self, recievedType: j.dynamicType, object: j)
+            throw TypeMismatchError(expectedType: self, receivedType: j.dynamicType, object: j)
         }
         return result
     }

diff --git a/Sources/DecodingError.swift b/Sources/DecodingError.swift
@@ -32,22 +32,22 @@ extension DecodingError {
 
 public struct TypeMismatchError: DecodingError {
 
-    public init(expectedType: Any.Type, recievedType: Any.Type, object: AnyObject) {
+    public init(expectedType: Any.Type, receivedType: Any.Type, object: AnyObject) {
         self.expectedType = expectedType
-        self.recievedType = recievedType
+        self.receivedType = receivedType
         self.object = object
         self.path = []
     }
 
     public let expectedType: Any.Type
-    public let recievedType: Any.Type
+    public let receivedType: Any.Type
 
     public var path: [String]
     public let object: AnyObject
     public var rootObject: AnyObject?
 
     public var debugDescription: String {
-        return "TypeMismatchError expected: \(expectedType) but \(object) is of type \(recievedType) in \(formattedPath)"    }
+        return "TypeMismatchError expected: \(expectedType) but \(object) is of type \(receivedType) in \(formattedPath)"    }
 }
 
 public struct MissingKeyError: DecodingError {

diff --git a/Sources/NSValueCastable.swift b/Sources/NSValueCastable.swift
@@ -24,7 +24,7 @@ extension NSValueCastable {
     private typealias PointerOfSelf = UnsafeMutablePointer<Self> // Why do we have to do this?
     public static func decode(j: AnyObject) throws -> Self {
         guard let value = j as? NSValue else {
-            throw TypeMismatchError(expectedType: NSValue.self, recievedType: j.dynamicType, object: j)
+            throw TypeMismatchError(expectedType: NSValue.self, receivedType: j.dynamicType, object: j)
         }
 
         let pointer = PointerOfSelf.alloc(1)

diff --git a/Tests/DecodableOperatorsTests.swift b/Tests/DecodableOperatorsTests.swift
@@ -110,7 +110,7 @@ class DecodableOperatorsTests: XCTestCase {
             print(a)
             XCTFail()
         } catch let error as TypeMismatchError {
-            XCTAssertEqual(String(error.recievedType), "__NSCFNumber")
+            XCTAssertEqual(String(error.receivedType), "__NSCFNumber")
         } catch let error {
             XCTFail("should not throw \(error)")
         }
@@ -167,7 +167,7 @@ class DecodableOperatorsTests: XCTestCase {
         } catch let error as TypeMismatchError where error.expectedType == NSDictionary.self {
             // then
             XCTAssertTrue(true)
-            XCTAssertEqual(String(error.recievedType), "__NSCFString")
+            XCTAssertEqual(String(error.receivedType), "__NSCFString")
             XCTAssertEqual(error.formattedPath, "")
             XCTAssertEqual(error.object as? NSString, noDictionary)
         } catch let error {
@@ -204,7 +204,7 @@ class DecodableOperatorsTests: XCTestCase {
         } catch let error as TypeMismatchError where error.expectedType == NSDictionary.self {
             // then
             XCTAssertTrue(true)
-            XCTAssertEqual(String(error.recievedType), "__NSCFString")
+            XCTAssertEqual(String(error.receivedType), "__NSCFString")
             XCTAssertEqual(error.formattedPath, "")
             XCTAssertEqual(error.object as? NSString, noDictionary)
         } catch let error {

diff --git a/Tests/ErrorPathTests.swift b/Tests/ErrorPathTests.swift
@@ -70,7 +70,7 @@ class ErrorPathTests: XCTestCase {
         do {
             try dict => "object" => "repo" => "owner" => "login" as String
         } catch let error as TypeMismatchError {
-            XCTAssertEqual(String(error.recievedType), "__NSCFNumber")
+            XCTAssertEqual(String(error.receivedType), "__NSCFNumber")
             XCTAssertEqual(error.formattedPath, "object.repo.owner.login")
             XCTAssertEqual(error.object as? Int, 0)
         } catch let error {
@@ -86,7 +86,7 @@ class ErrorPathTests: XCTestCase {
             try Tree.decode(dict)
             XCTFail()
         } catch let error as TypeMismatchError {
-            XCTAssertEqual(String(error.recievedType), "__NSCFNumber")
+            XCTAssertEqual(String(error.receivedType), "__NSCFNumber")
             XCTAssertEqual(error.formattedPath, "apples.color.name")
         } catch let error {
             XCTFail("should not throw this exception: \(error)")