Merge pull request #24 from alickbass/json-conform-to-json-protocols

Extend JSON to conform to JSONInitializable and JSONRepresentable
alickbass · Mar 22, 2017 · 8786f4b · 8786f4b
2 parents 0182b76 + 04cf5c9
commit 8786f4b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/SwiftyJSONModel/JSONTypes.swift b/SwiftyJSONModel/JSONTypes.swift
@@ -17,6 +17,11 @@ public protocol JSONRepresentable {
     var jsonValue: JSON { get }
 }
 
+extension JSON: JSONInitializable, JSONRepresentable {
+    public init(json: JSON) { self = json }
+    public var jsonValue: JSON { return self }
+}
+
 extension String: JSONInitializable, JSONRepresentable {
     public init(json: JSON) throws { self = try json.value() }
     public var jsonValue: JSON { return JSON(string: self) }

diff --git a/SwiftyJSONModelTests/JSONExtensionTests.swift b/SwiftyJSONModelTests/JSONExtensionTests.swift
@@ -44,4 +44,11 @@ class JSONExtensionTests: XCTestCase {
         XCTAssertEqual(try! JSON(dictionary: json).dictionaryValue(), json)
     }
 
+    func testJSONConformanceToJSONProtocols() {
+        let json: JSON = ["Some"]
+
+        XCTAssertEqual(JSON(json: json), json)
+        XCTAssertEqual(json.jsonValue, json)
+    }
+
 }