Skip to content
This repository was archived by the owner on Jan 25, 2019. It is now read-only.
Open
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
2 changes: 1 addition & 1 deletion Spine/Resource.swift
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ open class Resource: NSObject, NSCoding {

extension Resource {
override open var description: String {
return "\(resourceType)(\(id), \(url))"
return "\(resourceType)(\(String(describing: id)), \(String(describing: url)))"
}

override open var debugDescription: String {
Expand Down
2 changes: 1 addition & 1 deletion Spine/SerializeOperation.swift
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class SerializeOperation: Operation {
// MARK: Serializing

fileprivate func serializeResource(_ resource: Resource) -> [String: Any] {
Spine.logDebug(.serializing, "Serializing resource \(resource) of type '\(resource.resourceType)' with id '\(resource.id)'")
Spine.logDebug(.serializing, "Serializing resource \(resource) of type '\(resource.resourceType)' with id '\(String(describing: resource.id))'")

var serializedData: [String: Any] = [:]

Expand Down
17 changes: 10 additions & 7 deletions Spine/ValueFormatter.swift
Original file line number Diff line number Diff line change
Expand Up @@ -133,13 +133,16 @@ struct ValueFormatterRegistry {
/// If a baseURL has been configured in the URLAttribute, and the given String is not an absolute URL,
/// it will return an absolute URL, relative to the baseURL.
private struct URLValueFormatter: ValueFormatter {
func unformatValue(_ value: String, forAttribute attribute: URLAttribute) -> URL {
return URL(string: value, relativeTo: attribute.baseURL as URL?)!
}

func formatValue(_ value: URL, forAttribute attribute: URLAttribute) -> String {
return value.absoluteString
}
func unformatValue(_ value: String?, forAttribute attribute: URLAttribute) -> URL? {
guard let value = value else {
return nil
}
return URL(string: value, relativeTo: attribute.baseURL)
}

func formatValue(_ value: URL?, forAttribute attribute: URLAttribute) -> String? {
return value?.absoluteString
}
}

/// DateValueFormatter is a value formatter that transforms between NSDate and String, and vice versa.
Expand Down