Skip to content

Add array and dictionary support for mapping with transform #117

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 30, 2015
Merged

Add array and dictionary support for mapping with transform #117

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
465ddab
Add array and dictionary support for mapping with transform
ikesyo Apr 30, 2015
22bb1ab
Refactor RawRepresentable mapping using EnumTransform
ikesyo Apr 30, 2015
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
Prev Previous commit
Refactor RawRepresentable mapping using EnumTransform
  • Loading branch information
@ikesyo
ikesyo committed Apr 30, 2015
commit 22bb1ab05eee41997174bfd7cf6bab9b889634d3
42 changes: 0 additions & 42 deletions ObjectMapper/Core/FromJSON.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,48 +29,6 @@ internal final class FromJSON {
}
}

/// Array of Raw representable
class func rawRepresentableArray<N: RawRepresentable>(inout field: [N], object: [N.RawValue]?) {
if let values = object {
field = values.filterMap { N(rawValue: $0) }
}
}

/// Array of Raw representable
class func rawRepresentableArray<N: RawRepresentable>(inout field: [N]?, object: [N.RawValue]?) {
if let values = object {
field = values.filterMap { N(rawValue: $0) }
}
}

/// Array of Raw representable
class func rawRepresentableArray<N: RawRepresentable>(inout field: [N]!, object: [N.RawValue]?) {
if let values = object {
field = values.filterMap { N(rawValue: $0) }
}
}

/// Dictionary of Raw representable
class func rawRepresentableDict<N: RawRepresentable>(inout field: [String: N], object: [String: N.RawValue]?) {
if let values = object {
field = values.filterMap { N(rawValue: $0) }
}
}

/// Dictionary of Raw representable
class func rawRepresentableDict<N: RawRepresentable>(inout field: [String: N]?, object: [String: N.RawValue]?) {
if let values = object {
field = values.filterMap { N(rawValue: $0) }
}
}

/// Dictionary of Raw representable
class func rawRepresentableDict<N: RawRepresentable>(inout field: [String: N]!, object: [String: N.RawValue]?) {
if let values = object {
field = values.filterMap { N(rawValue: $0) }
}
}

/// Mappable object
class func object<N: Mappable>(inout field: N, object: AnyObject?) {
if let value: N = Mapper().map(object) {
Expand Down
36 changes: 6 additions & 30 deletions ObjectMapper/Core/Operators.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,67 +76,43 @@ public func <- <T: RawRepresentable>(inout left: T!, right: Map) {
* Array of Raw Representable object
*/
public func <- <T: RawRepresentable>(inout left: [T], right: Map) {
if right.mappingType == MappingType.FromJSON {
FromJSON.rawRepresentableArray(&left, object: right.value())
} else {
ToJSON.rawRepresentableArray(left, key: right.currentKey!, dictionary: &right.JSONDictionary)
}
left <- (right, EnumTransform())
}

/**
* Array of Raw Representable object
*/
public func <- <T: RawRepresentable>(inout left: [T]?, right: Map) {
if right.mappingType == MappingType.FromJSON {
FromJSON.rawRepresentableArray(&left, object: right.value())
} else {
ToJSON.rawRepresentableArray(left, key: right.currentKey!, dictionary: &right.JSONDictionary)
}
left <- (right, EnumTransform())
}

/**
* Array of Raw Representable object
*/
public func <- <T: RawRepresentable>(inout left: [T]!, right: Map) {
if right.mappingType == MappingType.FromJSON {
FromJSON.rawRepresentableArray(&left, object: right.value())
} else {
ToJSON.rawRepresentableArray(left, key: right.currentKey!, dictionary: &right.JSONDictionary)
}
left <- (right, EnumTransform())
}

// MARK:- Dictionaries of Raw Representable type
/**
* Dictionary of Raw Representable object
*/
public func <- <T: RawRepresentable>(inout left: [String: T], right: Map) {
if right.mappingType == MappingType.FromJSON {
FromJSON.rawRepresentableDict(&left, object: right.value())
} else {
ToJSON.rawRepresentableDict(left, key: right.currentKey!, dictionary: &right.JSONDictionary)
}
left <- (right, EnumTransform())
}

/**
* Dictionary of Raw Representable object
*/
public func <- <T: RawRepresentable>(inout left: [String: T]?, right: Map) {
if right.mappingType == MappingType.FromJSON {
FromJSON.rawRepresentableDict(&left, object: right.value())
} else {
ToJSON.rawRepresentableDict(left, key: right.currentKey!, dictionary: &right.JSONDictionary)
}
left <- (right, EnumTransform())
}

/**
* Dictionary of Raw Representable object
*/
public func <- <T: RawRepresentable>(inout left: [String: T]!, right: Map) {
if right.mappingType == MappingType.FromJSON {
FromJSON.rawRepresentableDict(&left, object: right.value())
} else {
ToJSON.rawRepresentableDict(left, key: right.currentKey!, dictionary: &right.JSONDictionary)
}
left <- (right, EnumTransform())
}

// MARK:- Transforms
Expand Down
23 changes: 0 additions & 23 deletions ObjectMapper/Core/ToJSON.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,29 +99,6 @@ internal final class ToJSON {
}
}

class func rawRepresentableArray<N: RawRepresentable>(field: [N], key: String, inout dictionary: [String : AnyObject]) {
basicType(field.map { e in e.rawValue }, key: key, dictionary: &dictionary)
}

class func rawRepresentableArray<N: RawRepresentable>(field: [N]?, key: String, inout dictionary: [String : AnyObject]) {
if let field = field {
rawRepresentableArray(field, key: key, dictionary: &dictionary)
}
}

class func rawRepresentableDict<N: RawRepresentable>(field: [String: N], key: String, inout dictionary: [String : AnyObject]) {
let raw: [String: N.RawValue] = field.map { key, value in
return (key, value.rawValue)
}
basicType(raw, key: key, dictionary: &dictionary)
}

class func rawRepresentableDict<N: RawRepresentable>(field: [String: N]?, key: String, inout dictionary: [String : AnyObject]) {
if let field = field {
rawRepresentableDict(field, key: key, dictionary: &dictionary)
}
}

class func object<N: Mappable>(field: N, key: String, inout dictionary: [String : AnyObject]) {
setValue(Mapper().toJSON(field), forKey: key, dictionary: &dictionary)
}
Expand Down