Skip to content

Commit 88a7154

Browse files
tristanhimmelmantristanhimmelman
committed
- refactored code with "base" keyword to "basic"
1 parent f4a6dcb commit 88a7154

File tree

5 files changed

+32
-32
lines changed

5 files changed

+32
-32
lines changed

‎ObjectMapper/Core/FromJSON.swift‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,23 @@ import Foundation
1010

1111
class FromJSON<CollectionType> {
1212

13-
func baseType<FieldType>(inout field: FieldType, object: AnyObject?) {
14-
baseType(&field, object: object as? FieldType)
13+
func basicType<FieldType>(inout field: FieldType, object: AnyObject?) {
14+
basicType(&field, object: object as? FieldType)
1515
}
1616

17-
func baseType<FieldType>(inout field: FieldType, object: FieldType?) {
17+
func basicType<FieldType>(inout field: FieldType, object: FieldType?) {
1818
if let value = object {
1919
field = value
2020
}
2121
}
2222

23-
func optionalBaseType<FieldType>(inout field: FieldType?, object: AnyObject?) {
23+
func optionalBasicType<FieldType>(inout field: FieldType?, object: AnyObject?) {
2424
if let value: AnyObject = object {
2525
field = value as? FieldType
2626
}
2727
}
2828

29-
func optionalBaseType<FieldType>(inout field: FieldType?, object: FieldType?) {
29+
func optionalBasicType<FieldType>(inout field: FieldType?, object: FieldType?) {
3030
if let value: FieldType = object {
3131
field = value
3232
}

‎ObjectMapper/Core/Operators.swift‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,18 @@ import Foundation
1515
// MARK: basic type
1616
public func <=<T, U>(inout left: T, right: Mapper<U>) {
1717
if right.mappingType == MappingType.fromJSON {
18-
FromJSON<T>().baseType(&left, object: right.currentValue)
18+
FromJSON<T>().basicType(&left, object: right.currentValue)
1919
} else {
20-
ToJSON().baseType(left, key: right.currentKey!, dictionary: &right.JSONDictionary);
20+
ToJSON().basicType(left, key: right.currentKey!, dictionary: &right.JSONDictionary);
2121
}
2222
}
2323

2424
// Optional basic type
2525
public func <=<T, U>(inout left: T?, right: Mapper<U>) {
2626
if right.mappingType == MappingType.fromJSON {
27-
FromJSON<T>().optionalBaseType(&left, object: right.currentValue)
27+
FromJSON<T>().optionalBasicType(&left, object: right.currentValue)
2828
} else {
29-
ToJSON().optionalBaseType(left, key: right.currentKey!, dictionary: &right.JSONDictionary)
29+
ToJSON().optionalBasicType(left, key: right.currentKey!, dictionary: &right.JSONDictionary)
3030
}
3131
}
3232

@@ -35,11 +35,11 @@ public func <=<T, U, N>(inout left: T, right: (Mapper<U>, MapperTransform<T, N>)
3535
if right.0.mappingType == MappingType.fromJSON {
3636
var value: T? = right.1.transformFromJSON(right.0.currentValue)
3737
//println("FromJSON \(value)");
38-
FromJSON<T>().baseType(&left, object: value)
38+
FromJSON<T>().basicType(&left, object: value)
3939
} else {
4040
var value: N? = right.1.transformToJSON(left)
4141
//println("\(left) toJSON \(value)")
42-
ToJSON().optionalBaseType(value, key: right.0.currentKey!, dictionary: &right.0.JSONDictionary)
42+
ToJSON().optionalBasicType(value, key: right.0.currentKey!, dictionary: &right.0.JSONDictionary)
4343
}
4444
}
4545

@@ -48,11 +48,11 @@ public func <=<T, U, N>(inout left: T?, right: (Mapper<U>, MapperTransform<T, N>
4848
if right.0.mappingType == MappingType.fromJSON {
4949
var value: T? = right.1.transformFromJSON(right.0.currentValue)
5050
//println("FromJSON \(value)");
51-
FromJSON<T>().optionalBaseType(&left, object: value)
51+
FromJSON<T>().optionalBasicType(&left, object: value)
5252
} else {
5353
var value: N? = right.1.transformToJSON(left)
5454
//println("\(left) toJSON \(value)")
55-
ToJSON().optionalBaseType(value, key: right.0.currentKey!, dictionary: &right.0.JSONDictionary)
55+
ToJSON().optionalBasicType(value, key: right.0.currentKey!, dictionary: &right.0.JSONDictionary)
5656
}
5757
}
5858

@@ -95,18 +95,18 @@ public func <=<T: Mappable, U>(inout left: Dictionary<String, T>?, right: Mapper
9595
// MARK: Dictionary <String, AnyObject>
9696
public func <=<U>(inout left: Dictionary<String, AnyObject>, right: Mapper<U>) {
9797
if right.mappingType == MappingType.fromJSON {
98-
FromJSON<AnyObject>().baseType(&left, object: right.currentValue)
98+
FromJSON<AnyObject>().basicType(&left, object: right.currentValue)
9999
} else {
100-
ToJSON().baseDictionary(left, key: right.currentKey!, dictionary: &right.JSONDictionary)
100+
ToJSON().basicDictionary(left, key: right.currentKey!, dictionary: &right.JSONDictionary)
101101
}
102102
}
103103

104104
// Optional dictionary <String, AnyObject>
105105
public func <=<U>(inout left: Dictionary<String, AnyObject>?, right: Mapper<U>) {
106106
if right.mappingType == MappingType.fromJSON {
107-
FromJSON<AnyObject>().optionalBaseType(&left, object: right.currentValue)
107+
FromJSON<AnyObject>().optionalBasicType(&left, object: right.currentValue)
108108
} else {
109-
ToJSON().optionalBaseDictionary(left, key: right.currentKey!, dictionary: &right.JSONDictionary)
109+
ToJSON().optionalBasicDictionary(left, key: right.currentKey!, dictionary: &right.JSONDictionary)
110110
}
111111
}
112112

@@ -131,17 +131,17 @@ public func <=<T: Mappable, U>(inout left: Array<T>?, right: Mapper<U>) {
131131
// MARK: Array<AnyObject>
132132
public func <=<U>(inout left: Array<AnyObject>, right: Mapper<U>) {
133133
if right.mappingType == MappingType.fromJSON {
134-
FromJSON<AnyObject>().baseType(&left, object: right.currentValue)
134+
FromJSON<AnyObject>().basicType(&left, object: right.currentValue)
135135
} else {
136-
ToJSON().baseArray(left, key: right.currentKey!, dictionary: &right.JSONDictionary)
136+
ToJSON().basicArray(left, key: right.currentKey!, dictionary: &right.JSONDictionary)
137137
}
138138
}
139139

140140
// Optional array of String type
141141
public func <=<U>(inout left: Array<AnyObject>?, right: Mapper<U>) {
142142
if right.mappingType == MappingType.fromJSON {
143-
FromJSON<AnyObject>().optionalBaseType(&left, object: right.currentValue)
143+
FromJSON<AnyObject>().optionalBasicType(&left, object: right.currentValue)
144144
} else {
145-
ToJSON().optionalBaseArray(left, key: right.currentKey!, dictionary: &right.JSONDictionary)
145+
ToJSON().optionalBasicArray(left, key: right.currentKey!, dictionary: &right.JSONDictionary)
146146
}
147147
}

‎ObjectMapper/Core/ToJSON.swift‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import Foundation
1010

1111
class ToJSON {
1212

13-
func baseType<N>(field: N, key: String, inout dictionary: [String : AnyObject]) {
13+
func basicType<N>(field: N, key: String, inout dictionary: [String : AnyObject]) {
1414

1515
var temp = dictionary
1616
var currentKey = key
@@ -57,29 +57,29 @@ class ToJSON {
5757
}
5858
}
5959

60-
func optionalBaseType<N>(field: N?, key: String, inout dictionary: [String : AnyObject]) {
60+
func optionalBasicType<N>(field: N?, key: String, inout dictionary: [String : AnyObject]) {
6161
if let field = field {
62-
baseType(field, key: key, dictionary: &dictionary)
62+
basicType(field, key: key, dictionary: &dictionary)
6363
}
6464
}
6565

66-
func baseArray(field: Array<AnyObject>, key: String, inout dictionary: [String : AnyObject]){
66+
func basicArray(field: Array<AnyObject>, key: String, inout dictionary: [String : AnyObject]){
6767
dictionary[key] = NSArray(array: field)
6868
}
6969

70-
func optionalBaseArray(field: Array<AnyObject>?, key: String, inout dictionary: [String : AnyObject]){
70+
func optionalBasicArray(field: Array<AnyObject>?, key: String, inout dictionary: [String : AnyObject]){
7171
if let value = field {
72-
baseArray(value, key: key, dictionary: &dictionary)
72+
basicArray(value, key: key, dictionary: &dictionary)
7373
}
7474
}
7575

76-
func baseDictionary(field: Dictionary<String, AnyObject>, key: String, inout dictionary: [String : AnyObject]){
76+
func basicDictionary(field: Dictionary<String, AnyObject>, key: String, inout dictionary: [String : AnyObject]){
7777
dictionary[key] = NSDictionary(dictionary: field)
7878
}
7979

80-
func optionalBaseDictionary(field: Dictionary<String, AnyObject>?, key: String, inout dictionary: [String : AnyObject]){
80+
func optionalBasicDictionary(field: Dictionary<String, AnyObject>?, key: String, inout dictionary: [String : AnyObject]){
8181
if let value = field {
82-
baseDictionary(value, key: key, dictionary: &dictionary)
82+
basicDictionary(value, key: key, dictionary: &dictionary)
8383
}
8484
}
8585

‎ObjectMapper/Transforms/DateTransform.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//
22
// DateTransform.swift
3-
// BaseClient
3+
// ObjectMapper
44
//
55
// Created by Tristan Himmelman on 2014-10-13.
66
// Copyright (c) 2014 hearst. All rights reserved.

‎ObjectMapper/Transforms/MapperTransform.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//
22
// MapperTransform.swift
3-
// BaseClient
3+
// ObjectMapper
44
//
55
// Created by Tristan Himmelman on 2014-10-07.
66
// Copyright (c) 2014 hearst. All rights reserved.

0 commit comments

Comments
 (0)