Merge pull request #2 from brendan09/master

Make NSCoding / SwiftyJSON optional, add ObjectMapper, add specific numerical types.

Author: Karthikeya Udupa KM

SwiftyJSONAccelerator.xcodeproj/project.pbxproj

@@ -20,6 +20,9 @@
 		93F1744A1BD0707D007E7DFC /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 93F174481BD0707D007E7DFC /* Main.storyboard */; };
 		93F174551BD0707D007E7DFC /* SwiftyJSONAcceleratorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 93F174541BD0707D007E7DFC /* SwiftyJSONAcceleratorTests.swift */; };
 		93F174601BD070AA007E7DFC /* JSONHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 93F1745F1BD070AA007E7DFC /* JSONHelper.swift */; };
+		C667011B1BDCABCE009BA254 /* SwiftyJSONTemplate.txt in Resources */ = {isa = PBXBuildFile; fileRef = C667011A1BDCABCE009BA254 /* SwiftyJSONTemplate.txt */; };
+		C667011D1BDCAF23009BA254 /* ObjectMapperTemplate.txt in Resources */ = {isa = PBXBuildFile; fileRef = C667011C1BDCAF23009BA254 /* ObjectMapperTemplate.txt */; };
+		C667011F1BDCBE1F009BA254 /* NSCodingTemplate.txt in Resources */ = {isa = PBXBuildFile; fileRef = C667011E1BDCBE1F009BA254 /* NSCodingTemplate.txt */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -49,6 +52,9 @@
 		93F174541BD0707D007E7DFC /* SwiftyJSONAcceleratorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwiftyJSONAcceleratorTests.swift; sourceTree = "<group>"; };
 		93F174561BD0707D007E7DFC /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		93F1745F1BD070AA007E7DFC /* JSONHelper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = JSONHelper.swift; sourceTree = "<group>"; };
+		C667011A1BDCABCE009BA254 /* SwiftyJSONTemplate.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = SwiftyJSONTemplate.txt; sourceTree = "<group>"; };
+		C667011C1BDCAF23009BA254 /* ObjectMapperTemplate.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ObjectMapperTemplate.txt; sourceTree = "<group>"; };
+		C667011E1BDCBE1F009BA254 /* NSCodingTemplate.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = NSCodingTemplate.txt; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -73,6 +79,9 @@
 			isa = PBXGroup;
 			children = (
 				9341A14E1BD6E7290048CE2C /* BaseTemplate.txt */,
+				C667011A1BDCABCE009BA254 /* SwiftyJSONTemplate.txt */,
+				C667011C1BDCAF23009BA254 /* ObjectMapperTemplate.txt */,
+				C667011E1BDCBE1F009BA254 /* NSCodingTemplate.txt */,
 			);
 			path = "Base Files";
 			sourceTree = "<group>";
@@ -228,7 +237,10 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				C667011B1BDCABCE009BA254 /* SwiftyJSONTemplate.txt in Resources */,
+				C667011F1BDCBE1F009BA254 /* NSCodingTemplate.txt in Resources */,
 				93F174471BD0707D007E7DFC /* Assets.xcassets in Resources */,
+				C667011D1BDCAF23009BA254 /* ObjectMapperTemplate.txt in Resources */,
 				9341A14F1BD6E7290048CE2C /* BaseTemplate.txt in Resources */,
 				93F1744A1BD0707D007E7DFC /* Main.storyboard in Resources */,
 			);

SwiftyJSONAccelerator/Base Files/BaseTemplate.txt

@@ -5,54 +5,33 @@
 //  Copyright (c) __MyCompanyName__. All rights reserved.
 //
 
-import Foundation{INCLUDE_SWIFTY}
+import Foundation{INCLUDE_SWIFTY}{INCLUDE_OBJECT_MAPPER}
 
-public {OBJECT_KIND} {OBJECT_NAME}: NSObject, NSCoding {
+public {OBJECT_KIND} {OBJECT_NAME}: {OBJECT_BASE_CLASS}{NSCODING_PROTOCOL_SUPPORT} {
 
-	// MARK: Declaration for string constants to be used to decode and also serialize.
+    // MARK: Declaration for string constants to be used to decode and also serialize.
 {STRING_CONSTANT_BLOCK}
 
-	// MARK: Properties
+    // MARK: Properties
 {PROPERTIES}
 
-	// MARK: Initalizers
-    /**
-    Initates the class based on the object
-    - parameter object: The object of either Dictionary or Array kind that was passed.
-    - returns: An initalized instance of the class.
-    */
-    convenience public init(object: AnyObject) {
-        self.init(json: JSON(object))
-    }
+    // MARK: Initalizers
+{SWIFTY_JSON_SUPPORT}
 
-    /**
-    Initates the class based on the JSON that was passed.
-    - parameter json: JSON object from SwiftyJSON.
-    - returns: An initalized instance of the class.
-    */
-    public init(json: JSON) {
-{INITALIZER}
-    }
+{OBJECT_MAPPER_SUPPORT}
 
     /**
     Generates description of the object in the form of a NSDictionary.
     - returns: A Key value pair containing all valid values in the object.
     */
     public func dictionaryRepresentation() -> [String : AnyObject ] {
 
-    var dictionary: [String : AnyObject ] = [ : ]
+        var dictionary: [String : AnyObject ] = [ : ]
 {DESC}
 
-    return dictionary
-    }
-
-    // MARK: NSCoding Protocol
-    required public init(coder aDecoder: NSCoder) {
-{DECODERS}
+        return dictionary
     }
 
-    public func encodeWithCoder(aCoder: NSCoder) {
-{ENCODERS}
-    }
+    {NSCODING_SUPPORT}
 
 }

SwiftyJSONAccelerator/Base Files/NSCodingTemplate.txt

@@ -0,0 +1,8 @@
+// MARK: NSCoding Protocol
+    required public init(coder aDecoder: NSCoder) {
+{DECODERS}
+    }
+
+    public func encodeWithCoder(aCoder: NSCoder) {
+{ENCODERS}
+    }

SwiftyJSONAccelerator/Base Files/ObjectMapperTemplate.txt

@@ -0,0 +1,15 @@
+    /**
+    Map a JSON object to this class using ObjectMapper
+    - parameter map: A mapping from ObjectMapper
+    */
+    required init?(_ map: Map){
+
+    }
+
+    /**
+    Map a JSON object to this class using ObjectMapper
+    - parameter map: A mapping from ObjectMapper
+    */
+    func mapping(map: Map) {
+{OBJECT_MAPPER_INITIALIZER}
+    }

SwiftyJSONAccelerator/Base Files/SwiftyJSONTemplate.txt

@@ -0,0 +1,17 @@
+    /**
+    Initates the class based on the object
+    - parameter object: The object of either Dictionary or Array kind that was passed.
+    - returns: An initalized instance of the class.
+    */
+    convenience public init(object: AnyObject) {
+        self.init(json: JSON(object))
+    }
+
+    /**
+    Initates the class based on the JSON that was passed.
+    - parameter json: JSON object from SwiftyJSON.
+    - returns: An initalized instance of the class.
+    */
+    public init(json: JSON) {
+{INITALIZER}
+    }