Skip to content

Commit 8029a28

Browse files
author
Karthikeya Udupa KM
committed
Merge pull request #1 from insanoid/release-v0.0.2
Release v0.0.2 Fixes
2 parents dda35f3 + 54fa7dc commit 8029a28

File tree

10 files changed

+261
-194
lines changed

10 files changed

+261
-194
lines changed

Graphics/SwiftyJSON.png

53.9 KB
Loading

Graphics/SwiftyJSON.psd

518 KB
Binary file not shown.

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# SwiftyJSONAccelerator
22

3+
**(Alpha v0.0.2)**
4+
35
[Download the .app (v0.0.1)](https://github.com/insanoid/SwiftyJSONAccelerator/releases/download/v0.0.1/SwiftyJSONAccelerator.zip)
46

57
![Logo](https://raw.githubusercontent.com/insanoid/SwiftyJSONAccelerator/master/SwiftyJSONAccelerator/Assets.xcassets/AppIcon.appiconset/Icon_32x32%402x.png)
@@ -24,13 +26,12 @@ Currently, the pattern is very similar to its Objective-C counterpart. It genera
2426

2527
## TODO
2628

27-
- Instead of taking a single element consider merging all the elements and decide what to do as a while.
28-
- Should also consider the case where the type is an `[[AnyObject],[AnyObject]...]` while handling arrays.
2929
- Handle blank array a bit better.
3030
- Better User Interface and icon.
3131
- Generate both `struct` and `class`.
3232
- Support for generation of models that do not need SwiftyJSON.
3333
- Add tests and integrate with Travis CI.
34+
- Create a Xcode plugin and a command line executor.
3435

3536
---
3637

SwiftyJSONAccelerator.xcodeproj/project.pbxproj

Lines changed: 29 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,19 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
9341A14A1BD6E5FE0048CE2C /* SJModelGenerator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9341A1491BD6E5FE0048CE2C /* SJModelGenerator.swift */; settings = {ASSET_TAGS = (); }; };
11-
9341A14C1BD6E6300048CE2C /* SwiftyJSON.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9341A14B1BD6E6300048CE2C /* SwiftyJSON.swift */; settings = {ASSET_TAGS = (); }; };
12-
9341A14F1BD6E7290048CE2C /* BaseTemplate.txt in Resources */ = {isa = PBXBuildFile; fileRef = 9341A14E1BD6E7290048CE2C /* BaseTemplate.txt */; settings = {ASSET_TAGS = (); }; };
13-
9341A1521BD6E9EC0048CE2C /* SwiftyJSON.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9341A14B1BD6E6300048CE2C /* SwiftyJSON.swift */; settings = {ASSET_TAGS = (); }; };
14-
9361FD141BD18558001ED533 /* LineNumberRulerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9361FD131BD18558001ED533 /* LineNumberRulerView.swift */; settings = {ASSET_TAGS = (); }; };
15-
9362F8661BD07DBA0001372E /* JSONHelperTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9362F8651BD07DBA0001372E /* JSONHelperTests.swift */; settings = {ASSET_TAGS = (); }; };
16-
93CDE7721BD1A00B00B5B234 /* SJTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 93CDE7711BD1A00B00B5B234 /* SJTextView.swift */; settings = {ASSET_TAGS = (); }; };
10+
9341A14A1BD6E5FE0048CE2C /* SJModelGenerator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9341A1491BD6E5FE0048CE2C /* SJModelGenerator.swift */; };
11+
9341A14C1BD6E6300048CE2C /* SwiftyJSON.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9341A14B1BD6E6300048CE2C /* SwiftyJSON.swift */; };
12+
9341A14F1BD6E7290048CE2C /* BaseTemplate.txt in Resources */ = {isa = PBXBuildFile; fileRef = 9341A14E1BD6E7290048CE2C /* BaseTemplate.txt */; };
13+
9341A1521BD6E9EC0048CE2C /* SwiftyJSON.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9341A14B1BD6E6300048CE2C /* SwiftyJSON.swift */; };
14+
9361FD141BD18558001ED533 /* LineNumberRulerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9361FD131BD18558001ED533 /* LineNumberRulerView.swift */; };
15+
9362F8661BD07DBA0001372E /* JSONHelperTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9362F8651BD07DBA0001372E /* JSONHelperTests.swift */; };
16+
93CDE7721BD1A00B00B5B234 /* SJTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 93CDE7711BD1A00B00B5B234 /* SJTextView.swift */; };
1717
93F174431BD0707D007E7DFC /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 93F174421BD0707D007E7DFC /* AppDelegate.swift */; };
1818
93F174451BD0707D007E7DFC /* SJEditorViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 93F174441BD0707D007E7DFC /* SJEditorViewController.swift */; };
1919
93F174471BD0707D007E7DFC /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 93F174461BD0707D007E7DFC /* Assets.xcassets */; };
2020
93F1744A1BD0707D007E7DFC /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 93F174481BD0707D007E7DFC /* Main.storyboard */; };
2121
93F174551BD0707D007E7DFC /* SwiftyJSONAcceleratorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 93F174541BD0707D007E7DFC /* SwiftyJSONAcceleratorTests.swift */; };
22-
93F174601BD070AA007E7DFC /* JSONHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 93F1745F1BD070AA007E7DFC /* JSONHelper.swift */; settings = {ASSET_TAGS = (); }; };
22+
93F174601BD070AA007E7DFC /* JSONHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 93F1745F1BD070AA007E7DFC /* JSONHelper.swift */; };
2323
/* End PBXBuildFile section */
2424

2525
/* Begin PBXContainerItemProxy section */
@@ -86,6 +86,25 @@
8686
name = "External Libraries";
8787
sourceTree = "<group>";
8888
};
89+
93A1264E1BDB8B04002A3B11 /* Model Generation */ = {
90+
isa = PBXGroup;
91+
children = (
92+
93F1745F1BD070AA007E7DFC /* JSONHelper.swift */,
93+
9341A1491BD6E5FE0048CE2C /* SJModelGenerator.swift */,
94+
);
95+
name = "Model Generation";
96+
sourceTree = "<group>";
97+
};
98+
93A1264F1BDB8B14002A3B11 /* Application Interface */ = {
99+
isa = PBXGroup;
100+
children = (
101+
93F174421BD0707D007E7DFC /* AppDelegate.swift */,
102+
93F174441BD0707D007E7DFC /* SJEditorViewController.swift */,
103+
93CDE7711BD1A00B00B5B234 /* SJTextView.swift */,
104+
);
105+
name = "Application Interface";
106+
sourceTree = "<group>";
107+
};
89108
93F174361BD0707D007E7DFC = {
90109
isa = PBXGroup;
91110
children = (
@@ -108,12 +127,9 @@
108127
isa = PBXGroup;
109128
children = (
110129
9362D3BC1BD8398A00B927D6 /* External Libraries */,
130+
93A1264E1BDB8B04002A3B11 /* Model Generation */,
111131
9341A14D1BD6E6EF0048CE2C /* Base Files */,
112-
93F174421BD0707D007E7DFC /* AppDelegate.swift */,
113-
93F174441BD0707D007E7DFC /* SJEditorViewController.swift */,
114-
93F1745F1BD070AA007E7DFC /* JSONHelper.swift */,
115-
93CDE7711BD1A00B00B5B234 /* SJTextView.swift */,
116-
9341A1491BD6E5FE0048CE2C /* SJModelGenerator.swift */,
132+
93A1264F1BDB8B14002A3B11 /* Application Interface */,
117133
93F174461BD0707D007E7DFC /* Assets.xcassets */,
118134
93F174481BD0707D007E7DFC /* Main.storyboard */,
119135
93F1744B1BD0707D007E7DFC /* Info.plist */,

SwiftyJSONAccelerator/Base Files/BaseTemplate.txt

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// Copyright (c) __MyCompanyName__. All rights reserved.
66
//
77

8-
import Foundation
8+
import Foundation{INCLUDE_SWIFTY}
99

1010
public {OBJECT_KIND} {OBJECT_NAME}: NSObject, NSCoding {
1111

@@ -18,9 +18,7 @@ public {OBJECT_KIND} {OBJECT_NAME}: NSObject, NSCoding {
1818
// MARK: Initalizers
1919
/**
2020
Initates the class based on the object
21-
2221
- parameter object: The object of either Dictionary or Array kind that was passed.
23-
2422
- returns: An initalized instance of the class.
2523
*/
2624
convenience public init(object: AnyObject) {
@@ -29,9 +27,7 @@ public {OBJECT_KIND} {OBJECT_NAME}: NSObject, NSCoding {
2927

3028
/**
3129
Initates the class based on the JSON that was passed.
32-
3330
- parameter json: JSON object from SwiftyJSON.
34-
3531
- returns: An initalized instance of the class.
3632
*/
3733
public init(json: JSON) {
@@ -40,7 +36,6 @@ public {OBJECT_KIND} {OBJECT_NAME}: NSObject, NSCoding {
4036

4137
/**
4238
Generates description of the object in the form of a NSDictionary.
43-
4439
- returns: A Key value pair containing all valid values in the object.
4540
*/
4641
public func dictionaryRepresentation() -> [String : AnyObject ] {
@@ -60,4 +55,4 @@ public {OBJECT_KIND} {OBJECT_NAME}: NSObject, NSCoding {
6055
{ENCODERS}
6156
}
6257

63-
}
58+
}

0 commit comments

Comments
 (0)