Merge pull request #27 from insanoid/releases/v0.0.6

Releases/v0.0.6

Author: Karthikeya Udupa KM

SwiftyJSONAccelerator/LineNumberRulerView.swift

@@ -53,9 +53,8 @@ extension NSTextView {
         }
 
         postsFrameChangedNotifications = true
-        NSNotificationCenter.defaultCenter().addObserver(self, selector: "lnv_framDidChange:", name: NSViewFrameDidChangeNotification, object: self)
-
-        NSNotificationCenter.defaultCenter().addObserver(self, selector: "lnv_textDidChange:", name: NSTextDidChangeNotification, object: self)
+        NSNotificationCenter.defaultCenter().addObserver(self, selector: #selector(NSTextView.lnv_framDidChange(_:)), name: NSViewFrameDidChangeNotification, object: self)
+        NSNotificationCenter.defaultCenter().addObserver(self, selector: #selector(NSTextView.lnv_textDidChange(_:)), name: NSTextDidChangeNotification, object: self)
     }
 
     func lnv_framDidChange(notification: NSNotification) {
@@ -141,12 +140,12 @@ class LineNumberRulerView: NSRulerView {
                         }
 
                         // Move to next glyph line
-                        glyphLineCount++
+                        glyphLineCount += 1
                         glyphIndexForGlyphLine = NSMaxRange(effectiveRange)
                     }
 
                     glyphIndexForStringLine = NSMaxRange(glyphRangeForStringLine)
-                    lineNumber++
+                    lineNumber += 1
                 }
 
                 // Draw line number for the extra line at the end of the text

SwiftyJSONAccelerator/SJEditorViewController.swift

@@ -170,16 +170,16 @@ class SJEditorViewController: NSViewController, NSTextViewDelegate {
         var lineNumber = 0
         var characterPosition = 0
         for line in string.componentsSeparatedByString("\n") {
-            lineNumber++
+            lineNumber += 1
             var columnNumber = 0
             for column in line.characters {
-                characterPosition++
-                columnNumber++
+                characterPosition += 1
+                columnNumber += 1
                 if characterPosition == position {
                     return (String(column), lineNumber, columnNumber )
                 }
             }
-            characterPosition++
+            characterPosition += 1
             if characterPosition == position {
                 return ("\n", lineNumber, columnNumber+1 )
             }

SwiftyJSONAccelerator/SJModelGenerator.swift

@@ -197,7 +197,7 @@ public class ModelGenerator {
 
             if self.supportNSCoding! {
                 if let nscodingBase = try? String(contentsOfFile: NSBundle.mainBundle().pathForResource("NSCodingTemplate", ofType: "txt")!) {
-                    content = content.stringByReplacingOccurrencesOfString("{NSCODING_PROTOCOL_SUPPORT}", withString: ", NSCoding, NSObject")
+                    content = content.stringByReplacingOccurrencesOfString("{NSCODING_PROTOCOL_SUPPORT}", withString: ", NSCoding")
                     content = content.stringByReplacingOccurrencesOfString("{NSCODING_SUPPORT}", withString: nscodingBase)
 
                     content = content.stringByReplacingOccurrencesOfString("{ENCODERS}", withString: encoders)
@@ -318,7 +318,7 @@ public class ModelGenerator {
      - returns: A generated string representation of the variable name.
      */
     internal func variableNameBuilder(variableName: String) -> String {
-        var variableName = replaceInternalKeywordsForVariableName(variableName).stringByReplacingOccurrencesOfString("_", withString: " ")
+        var variableName = replaceSeperatorsWithSpace(replaceInternalKeywordsForVariableName(variableName))
         variableName = variableName.stringByTrimmingCharactersInSet(NSCharacterSet.whitespaceAndNewlineCharacterSet())
         var finalVariableName: String = ""
         for (index, element) in variableName.componentsSeparatedByString(" ").enumerate() {
@@ -335,6 +335,13 @@ public class ModelGenerator {
 
     }
 
+    /**
+     Replaces the seperator characters between words with space.
+     */
+    internal func replaceSeperatorsWithSpace(variableName: String) -> String {
+        return variableName.stringByReplacingOccurrencesOfString("_", withString: " ").stringByReplacingOccurrencesOfString("-", withString: " ")
+    }
+
     /**
      Generate a variable name to store the key of the variable in the JSON for later use (generating JSON file, encoding and decoding). the format is k{ClassName}{VariableName}Key.
 
@@ -343,9 +350,10 @@ public class ModelGenerator {
 
      - returns: A generated string that can be used to store the key of the variable in the JSON.
      */
-    internal func variableNameKeyBuilder(className: String, var variableName: String) -> String {
-        variableName.replaceRange(variableName.startIndex...variableName.startIndex, with: String(variableName[variableName.startIndex]).uppercaseString)
-        return "k\(className)\(variableName)Key"
+    internal func variableNameKeyBuilder(className: String, variableName: String) -> String {
+        var _variableName = variableName
+        _variableName.replaceRange(variableName.startIndex...variableName.startIndex, with: String(variableName[variableName.startIndex]).uppercaseString)
+        return "k\(className)\(_variableName)Key"
     }
 
     /**
@@ -445,9 +453,9 @@ public class ModelGenerator {
      - parameter key:          Key against which the value is stored.
      - returns: A single line declaration of the variable which is an array of primitive kind.
      */
-    internal func initalizerForPrimitiveVariableArray(variableName: String, key: String, var type: String) -> String {
-        type = typeToSwiftType(type)
-        return  "\t\t\(variableName) = []\n\t\tif let items = json[\(key)].array {\n\t\t\tfor item in items {\n\t\t\t\tif let tempValue = item.\(type) {\n\t\t\t\t\(variableName)?.append(tempValue)\n\t\t\t\t}\n\t\t\t}\n\t\t} else {\n\t\t\t\(variableName) = nil\n\t\t}"
+    internal func initalizerForPrimitiveVariableArray(variableName: String, key: String, type: String) -> String {
+        let _type = typeToSwiftType(type)
+        return  "\t\t\(variableName) = []\n\t\tif let items = json[\(key)].array {\n\t\t\tfor item in items {\n\t\t\t\tif let tempValue = item.\(_type) {\n\t\t\t\t\(variableName)?.append(tempValue)\n\t\t\t\t}\n\t\t\t}\n\t\t} else {\n\t\t\t\(variableName) = nil\n\t\t}"
     }
 
     //MARK: Encoders and Decoder Generators
@@ -648,9 +656,10 @@ public class ModelGenerator {
      - parameter type: VariableType
      - returns: swift variable type.
      */
-    internal func typeToSwiftType(var type: String) -> String {
-        type.replaceRange(type.startIndex...type.startIndex, with: String(type[type.startIndex]).lowercaseString)
-        return type
+    internal func typeToSwiftType(type: String) -> String {
+        var _type = type
+        _type.replaceRange(type.startIndex...type.startIndex, with: String(type[type.startIndex]).lowercaseString)
+        return _type
     }
 
 

SwiftyJSONAccelerator/SwiftyJSON.swift

@@ -385,7 +385,9 @@ public struct JSONGenerator : GeneratorType {
         switch self.type {
         case .Array:
             if let o = self.arrayGenerate!.next() {
-                return (String(self.arrayIndex++), JSON(o))
+                let oldValue = self.arrayIndex
+                self.arrayIndex+=1
+                return (String(oldValue), JSON(o))
             } else {
                 return nil
             }