Skip to content
This repository has been archived by the owner on Feb 8, 2021. It is now read-only.

Add global default logger #282

Merged
merged 2 commits into from
Mar 30, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion Sources/Decoder.swift
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,17 @@ Decodes JSON to objects.
*/
public struct Decoder {

/// Default logger
public static var logger: Logger = GlossLogger()

/**
Decodes JSON to a generic value.

- parameter key: Key used in JSON for decoded value.

- returns: Value decoded from JSON.
*/
public static func decode<T>(key: String, keyPathDelimiter: String = GlossKeyPathDelimiter, logger: Logger = GlossLogger()) -> (JSON) -> T? {
public static func decode<T>(key: String, keyPathDelimiter: String = GlossKeyPathDelimiter, logger: Logger = logger) -> (JSON) -> T? {
return {
json in

Expand Down
10 changes: 10 additions & 0 deletions Tests/GlossTests/DecoderTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,16 @@ class DecoderTests: XCTestCase {
XCTAssertTrue(fakeLogger.wasMessageLogged, "Message should be logged when an unknown type is attempted to be decoded.")
}

func testDecodingModelWithUnknownTypeLogsErrorMessageInInjectedDefaultLogger() {
let fakeLogger = FakeLogger()
Decoder.logger = fakeLogger

let value: UnknownType? = Decoder.decode(key: "value")(testUnknownTypeJSON!)

XCTAssertNil(value)
XCTAssertTrue(fakeLogger.wasMessageLogged, "Message should be logged when an unknown type is attempted to be decoded.")
}

func testInitializingFailableObjectsWithBadDataCanFail() {
let result = TestFailableModel(json: testFailableModelJSONInvalid!)

Expand Down