@@ -29,27 +29,6 @@ internal final class FromJSON {
 		}
 	}
 
-	/// Raw representable
-	class func rawRepresentable<N: RawRepresentable>(inout field: N, object: N.RawValue?) {
-		if let value = object, enumValue = N(rawValue: value) {
-			field = enumValue
-		}
-	}
-
-	/// Optional raw representable
-	class func rawRepresentable<N: RawRepresentable>(inout field: N?, object: N.RawValue?) {
-		if let value = object {
-			field = N(rawValue: value)
-		}
-	}
-
-	/// Implicitly unwrapped optional basic type
-	class func rawRepresentable<N: RawRepresentable>(inout field: N!, object: N.RawValue?) {
-		if let value = object {
-			field = N(rawValue: value)
-		}
-	}
-
 	/// Array of Raw representable
 	class func rawRepresentableArray<N: RawRepresentable>(inout field: [N], object: [N.RawValue]?) {
 		if let values = object {
 
@@ -54,33 +54,21 @@ public func <- <T>(inout left: T!, right: Map) {
 * Object of Raw Representable type
 */
 public func <- <T: RawRepresentable>(inout left: T, right: Map) {
-	if right.mappingType == MappingType.FromJSON {
-		FromJSON.rawRepresentable(&left, object: right.value())
-	} else {
-		ToJSON.rawRepresentable(left, key: right.currentKey!, dictionary: &right.JSONDictionary)
-	}
+	left <- (right, EnumTransform())
 }
 
 /**
 * Optional Object of Raw Representable type
 */
 public func <- <T: RawRepresentable>(inout left: T?, right: Map) {
-	if right.mappingType == MappingType.FromJSON {
-		FromJSON.rawRepresentable(&left, object: right.value())
-	} else {
-		ToJSON.rawRepresentable(left, key: right.currentKey!, dictionary: &right.JSONDictionary)
-	}
+	left <- (right, EnumTransform())
 }
 
 /**
 * Implicitly Unwrapped Optional Object of Raw Representable type
 */
 public func <- <T: RawRepresentable>(inout left: T!, right: Map) {
-	if right.mappingType == MappingType.FromJSON {
-		FromJSON.rawRepresentable(&left, object: right.value())
-	} else {
-		ToJSON.rawRepresentable(left, key: right.currentKey!, dictionary: &right.JSONDictionary)
-	}
+	left <- (right, EnumTransform())
 }
 
 // MARK:- Arrays of Raw Representable type
 
@@ -99,16 +99,6 @@ internal final class ToJSON {
         }
     }
 
-	class func rawRepresentable<N: RawRepresentable>(field: N, key: String, inout dictionary: [String : AnyObject]) {
-		basicType(field.rawValue, key: key, dictionary: &dictionary)
-	}
-
-  	class func rawRepresentable<N: RawRepresentable>(field: N?, key: String, inout dictionary: [String : AnyObject]) {
-			if let field = field {
-				rawRepresentable(field, key: key, dictionary: &dictionary)
-			}
-	  }
-
 	class func rawRepresentableArray<N: RawRepresentable>(field: [N], key: String, inout dictionary: [String : AnyObject]) {
 		basicType(field.map { e in e.rawValue }, key: key, dictionary: &dictionary)
 	}
 
@@ -14,16 +14,16 @@ public class EnumTransform<T: RawRepresentable>: TransformType {
 
 	public init() {}
 
-	public func transformFromJSON(value: AnyObject?) -> Object? {
+	public func transformFromJSON(value: AnyObject?) -> T? {
 		if let raw = value as? T.RawValue {
-			return T(rawValue: raw) ?? nil
+			return T(rawValue: raw)
 		}
 		return nil
 	}
 
-	public func transformToJSON(value: Object?) -> JSON? {
+	public func transformToJSON(value: T?) -> T.RawValue? {
 		if let obj = value {
-			return obj.rawValue as T.RawValue
+			return obj.rawValue
 		}
 		return nil
 	}
Original file line number	Diff line number	Diff line change
`@@ -99,16 +99,6 @@ internal final class ToJSON {`
`99`	`99`	`}`
`100`	`100`	`}`
`101`	`101`
`102`		`- class func rawRepresentable<N: RawRepresentable>(field: N, key: String, inout dictionary: [String : AnyObject]) {`
`103`		`- basicType(field.rawValue, key: key, dictionary: &dictionary)`
`104`		`- }`
`105`		`-`
`106`		`- class func rawRepresentable<N: RawRepresentable>(field: N?, key: String, inout dictionary: [String : AnyObject]) {`
`107`		`- if let field = field {`
`108`		`- rawRepresentable(field, key: key, dictionary: &dictionary)`
`109`		`- }`
`110`		`- }`
`111`		`-`
`112`	`102`	`class func rawRepresentableArray<N: RawRepresentable>(field: [N], key: String, inout dictionary: [String : AnyObject]) {`
`113`	`103`	`basicType(field.map { e in e.rawValue }, key: key, dictionary: &dictionary)`
`114`	`104`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,16 +14,16 @@ public class EnumTransform<T: RawRepresentable>: TransformType {`
`14`	`14`
`15`	`15`	`public init() {}`
`16`	`16`
`17`		`- public func transformFromJSON(value: AnyObject?) -> Object? {`
	`17`	`+ public func transformFromJSON(value: AnyObject?) -> T? {`
`18`	`18`	`if let raw = value as? T.RawValue {`
`19`		`- return T(rawValue: raw) ?? nil`
	`19`	`+ return T(rawValue: raw)`
`20`	`20`	`}`
`21`	`21`	`return nil`
`22`	`22`	`}`
`23`	`23`
`24`		`- public func transformToJSON(value: Object?) -> JSON? {`
	`24`	`+ public func transformToJSON(value: T?) -> T.RawValue? {`
`25`	`25`	`if let obj = value {`
`26`		`- return obj.rawValue as T.RawValue`
	`26`	`+ return obj.rawValue`
`27`	`27`	`}`
`28`	`28`	`return nil`
`29`	`29`	`}`