Merge pull request #66 from yeti/swift-template-fixes

Minor fixes in swift templates
yeti · Nov 22, 2015 · d28d272 · d28d272
2 parents 10db873 + 85ce83b
commit d28d272
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 11 deletions.
diff --git a/signals/generators/ios/core_data.py b/signals/generators/ios/core_data.py
@@ -130,7 +130,7 @@ def add_relationships(model, objects):
             for entity in model.iter("entity"):
                 if entity.get('name') == get_proper_object_name(object_name):
                     first_entity = entity
-                elif entity.get('name') == get_proper_object_name(relationship.related_object):
+                elif entity.get('name') == get_proper_object_name(relationship.related_object.name):
                     second_entity = entity
 
             first_entity_name = first_entity.get('name').lower().replace("response", "")

diff --git a/signals/generators/ios/templates/swift/api_method.j2 b/signals/generators/ios/templates/swift/api_method.j2
@@ -2,7 +2,7 @@
     let sharedMgr = RKObjectManager.sharedManager()
     sharedMgr.requestSerializationMIMEType = {{ content_type(api) }}
     {% if is_oauth(api) %}
-    sharedMgr.HTTPClient.setDefaultHeader("Authorization", value: NSString.stringWithFormat("Bearer \(_delegate.getAccessToken())"))
+    sharedMgr.HTTPClient.setDefaultHeader("Authorization", value: NSString(format: "Bearer \(delegate!.getAccessToken())") as String)
     {% endif %}
     {% if api.parameters_object %}
     {% include 'methods/parameters.j2' %}

diff --git a/signals/generators/ios/templates/swift/data_model.swift.j2 b/signals/generators/ios/templates/swift/data_model.swift.j2
@@ -33,18 +33,19 @@ class DataModel: NSObject {
 
   func setup(delegate: DataModelDelegate) {
     // Initialize RestKit
-    let _delegate = delegate;
+    let _delegate = delegate
+    self.delegate = delegate
     let baseURL = NSURL(string: _delegate.getBaseURLString())
     let objectManager = RKObjectManager(baseURL: baseURL)
 
     // Enable Activity Indicator Spinner
-    AFNetworkActivityIndicatorManager.sharedManager().enabled = true;
+    AFNetworkActivityIndicatorManager.sharedManager().enabled = true
 
     // Initialize managed object store
     let managedObjectModel = NSManagedObjectModel.mergedModelFromBundles(nil)
     let managedObjectStore = RKManagedObjectStore(managedObjectModel: managedObjectModel)
 
-    objectManager.managedObjectStore = managedObjectStore;
+    objectManager.managedObjectStore = managedObjectStore
 
     // MARK: RestKit Entity Mappings
     {% for name, data_object in schema.data_objects.iteritems() %}

diff --git a/signals/generators/ios/templates/swift/entity_mapping.j2 b/signals/generators/ios/templates/swift/entity_mapping.j2
@@ -3,7 +3,7 @@
     {% if data_object.fields|length > 0 %}
     {% for field in data_object.fields %}
       {% if field.primary_key %}
-    {{ mapping_name }}Mapping.identificationAttributes = ["\({{ sanitize_field_name(field.name) }})"]
+    {{ mapping_name }}Mapping.identificationAttributes = ["{{ sanitize_field_name(field.name) }}"]
       {% endif %}
     {% endfor %}
     {{ mapping_name }}Mapping.addAttributeMappingsFromDictionary([ {{ attribute_mappings(data_object.fields) }} ])

diff --git a/tests/generators/ios/swift/files/APIMethod.swift b/tests/generators/ios/swift/files/APIMethod.swift
@@ -1,6 +1,6 @@
   func getPostWithSuccess(success: RestKitSuccess, failure: RestKitError) {
     let sharedMgr = RKObjectManager.sharedManager()
     sharedMgr.requestSerializationMIMEType = RKMIMETypeJSON
-    sharedMgr.HTTPClient.setDefaultHeader("Authorization", value: NSString.stringWithFormat("Bearer \(_delegate.getAccessToken())"))
+    sharedMgr.HTTPClient.setDefaultHeader("Authorization", value: NSString(format: "Bearer \(delegate!.getAccessToken())") as String)
     sharedMgr.getObject(nil, path: "post/", parameters: nil, success: success, failure: failure)
   }
diff --git a/tests/generators/ios/swift/files/DataModel.swift b/tests/generators/ios/swift/files/DataModel.swift
@@ -33,18 +33,19 @@ class DataModel: NSObject {
 
   func setup(delegate: DataModelDelegate) {
     // Initialize RestKit
-    let _delegate = delegate;
+    let _delegate = delegate
+    self.delegate = delegate
     let baseURL = NSURL(string: _delegate.getBaseURLString())
     let objectManager = RKObjectManager(baseURL: baseURL)
 
     // Enable Activity Indicator Spinner
-    AFNetworkActivityIndicatorManager.sharedManager().enabled = true;
+    AFNetworkActivityIndicatorManager.sharedManager().enabled = true
 
     // Initialize managed object store
     let managedObjectModel = NSManagedObjectModel.mergedModelFromBundles(nil)
     let managedObjectStore = RKManagedObjectStore(managedObjectModel: managedObjectModel)
 
-    objectManager.managedObjectStore = managedObjectStore;
+    objectManager.managedObjectStore = managedObjectStore
 
     // MARK: RestKit Entity Mappings
     let loginResponseMapping = RKEntityMapping(forEntityForName: "LoginResponse", inManagedObjectStore: managedObjectStore)

diff --git a/tests/generators/ios/swift/files/EntityMapping.swift b/tests/generators/ios/swift/files/EntityMapping.swift
@@ -1,3 +1,3 @@
     let postResponseMapping = RKEntityMapping(forEntityForName: "PostResponse", inManagedObjectStore: managedObjectStore)
-    postResponseMapping.identificationAttributes = ["\(theID)"]
+    postResponseMapping.identificationAttributes = ["theID"]
     postResponseMapping.addAttributeMappingsFromDictionary([ "body": "body", "id": "theID", "title": "title" ])