Code formatting.

Author: jszumski

KVC Validation Pattern/KVC Validation Pattern/CTCAppDelegate.h

@@ -12,8 +12,7 @@
 
 @interface CTCAppDelegate : UIResponder <UIApplicationDelegate>
 
-@property (strong, nonatomic) UIWindow *window;
-
+@property (strong, nonatomic) UIWindow			*window;
 @property (strong, nonatomic) CTCViewController *viewController;
 
 @end

KVC Validation Pattern/KVC Validation Pattern/CTCAppDelegate.m

@@ -7,46 +7,19 @@
 //
 
 #import "CTCAppDelegate.h"
-
 #import "CTCViewController.h"
 
 @implementation CTCAppDelegate
 
-- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
-{
+- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
     self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
-    // Override point for customization after application launch.
+
 	self.viewController = [[CTCViewController alloc] initWithNibName:@"CTCViewController" bundle:nil];
+	
 	self.window.rootViewController = self.viewController;
     [self.window makeKeyAndVisible];
+	
     return YES;
 }
 
-- (void)applicationWillResignActive:(UIApplication *)application
-{
-	// Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
-	// Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
-}
-
-- (void)applicationDidEnterBackground:(UIApplication *)application
-{
-	// Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later. 
-	// If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
-}
-
-- (void)applicationWillEnterForeground:(UIApplication *)application
-{
-	// Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background.
-}
-
-- (void)applicationDidBecomeActive:(UIApplication *)application
-{
-	// Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
-}
-
-- (void)applicationWillTerminate:(UIApplication *)application
-{
-	// Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
-}
-
-@end
+@end

KVC Validation Pattern/KVC Validation Pattern/CTCViewController.m

@@ -44,6 +44,35 @@ - (void)displayInfoForStation:(CTCStation*)station {
 	[self.tableView reloadData];
 }
 
+- (NSString*)jsonStringForResponse:(NSUInteger)responseIndex {
+	NSString *filename = nil;
+	
+	switch (responseIndex) {
+		case 0:
+		default:
+			filename = @"ResponseA";
+			break;
+			
+		case 1:
+			filename = @"ResponseB";
+			break;
+			
+		case 2:
+			filename = @"ResponseC";
+			break;
+			
+		case 3:
+			filename = @"ResponseD";
+			break;
+			
+		case 4:
+			filename = @"ResponseE";
+			break;
+	}
+	
+	return [NSString stringWithContentsOfFile:[[NSBundle mainBundle] pathForResource:filename ofType:@"json"] encoding:NSUTF8StringEncoding error:nil];
+}
+
 
 #pragma mark - UI response
 
@@ -187,38 +216,6 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
 }
 
 
-#pragma mark - JSON responses
-
-- (NSString*)jsonStringForResponse:(NSUInteger)responseIndex {
-	NSString *filename = nil;
-	
-	switch (responseIndex) {
-		case 0:
-		default:
-			filename = @"ResponseA";
-			break;
-			
-		case 1:
-			filename = @"ResponseB";
-			break;
-			
-		case 2:
-			filename = @"ResponseC";
-			break;
-			
-		case 3:
-			filename = @"ResponseD";
-			break;
-			
-		case 4:
-			filename = @"ResponseE";
-			break;
-	}
-	
-	return [NSString stringWithContentsOfFile:[[NSBundle mainBundle] pathForResource:filename ofType:@"json"] encoding:NSUTF8StringEncoding error:nil];
-}
-
-
 #pragma mark - Formatting
 
 - (NSString*)stringForPrice:(CGFloat)price {

KVC Validation Pattern/KVC Validation Pattern/Model/CTCBaseModel.m

@@ -27,19 +27,25 @@ typedef NS_ENUM(NSUInteger, CTCPropertyType){
 	CTCPropertyTypeDouble				// Property is a double
 };
 
+
 @interface CTCBaseModel ()
 
 @property (nonatomic, readwrite, strong) NSString *dictionaryKey;
 
 @end
 
+
 @implementation CTCBaseModel {
     dispatch_once_t keyToken;
 }
+
 static NSMutableDictionary *modelProperties; // Dictionary used to convert json key's into classes proper-cased keys
 static  dispatch_once_t onceToken;
 static NSArray *propertyTypesArray;
 
+
+#pragma mark - Class methods
+
 + (void)initialize {
     [super initialize];
 
@@ -72,79 +78,6 @@ + (void)initialize {
     [modelProperties setObject:translateNameDict forKey:[self calculateClassName]];
 }
 
-- (id)initWithDictionary:(NSDictionary *)dictionary {
-    self = [self init];
-    if (self){
-        // This is where all the KVC magic begins.  This method can be called on an object that has already been
-        // created.  This is just a convenience initializer.  The same thing could be accomplished in the following manner:
-        //
-        //   MySubClass *subClass = [MySubClass new];
-        //  [subClass setValuesForKeysWithDictionary:dictionary];
-        [self setValuesForKeysWithDictionary:dictionary];
-    }
-    return self;
-}
-
-- (NSString *)dictionaryKey {
-    // This will cause this key to be generated once, on a per-class/per-instance basis.  This is done
-    // because the logic in calculateClassName can be rather expensive when called repeatedly on
-    // every property, for every class.
-    dispatch_once(&keyToken, ^{
-        _dictionaryKey = [[self class] calculateClassName];
-    });
-    return _dictionaryKey;
-}
-
-#pragma mark - KVC methods
-
-- (void)setValue:(id)value forKey:(NSString *)key {
-    // We can assume at this point, the key is not in proper case.  We will call the set value method
-    // with proper casing NO and it will figure out the proper casing for the key (if it can)
-    [self setValue:value forKey:key properCase:NO];
-}
-
-- (void)setValue:(id)value forUndefinedKey:(NSString *)key {
-    // We will look in the undefinedKeys Dictionary (should be defined in the subclass), and look for
-    // this undefined key to see if the class maps the key to a know key.  This method is called automatically
-    // by KVC if setValue:forKey: cannot find a property to match the key.  Also, we wanted to implement
-    // this method in the base class, because the default implementation of this on NSObject throws
-    // an exception.
-    NSString *newKey = self.undefinedKeys[[key lowercaseString]];
-    if (newKey){
-        // If we have found the key, we will call our set value for key with proper case set to YES because
-        // the key should be put into the dictionary in proper case.  If it is not, this will not work, and our value
-        // will never be set.
-        [self setValue:value forKey:newKey properCase:YES];
-    }
-}
-
-- (void)setValue:(id)value forKey:(NSString *)key properCase:(BOOL)properCase {
-    // We first check to see if the key is already in proper case.  If not, we'll make it proper case.  This is done
-    // because calling lowerCaseString on a string value can get expensive when called repeatedly.  That is what
-    // will happen when setting a classes values from a dictionary as it will iteratively call setValue:forKey: on every
-    // key it finds in the dictionary.
-    if (!properCase) {
-        NSString *lowerCaseKey = [key lowercaseString];
-        // We do the lookup in the modelProperties dictionary for the proper cased key.  If we find it, we change
-        // the key to be that value.
-        NSString *properKey = modelProperties[self.dictionaryKey][lowerCaseKey];
-        if (properKey){
-            key = properKey;
-        }
-    }
-
-    NSError *error = nil;
-    // Here we call the validation logic.  Calling validateValue:forKey:error: will cause validate<key>:error: to be called
-    // so all the validation methods we added dynamically to this class in initialize will no be utilised.
-    BOOL isValid = [self validateValue:&value forKey:key error:&error];
-
-    // We only want to set the value if the value is valid.
-    if (isValid) {
-        [super setValue:value forKey:key];
-    }
-}
-
-
 + (NSString *)calculateClassName {
     // This method is here because sometimes NSStringFromClass will return the class name with a - and some characters
     // after the class name.
@@ -163,7 +96,7 @@ + (void)hydrateModelProperties:(Class)class translateDictionary:(NSMutableDictio
     if (!class || class == [NSObject class]){
         return;
     }
-
+	
     unsigned int outCount, i;
     // Get the class property list.
     objc_property_t *properties = class_copyPropertyList(class, &outCount);
@@ -207,7 +140,7 @@ + (NSString *)getPropertyType:(objc_property_t)property {
             propertyType = (const char *)[[NSData dataWithBytes:(attribute + 3) length:strlen(attribute) - 4] bytes];
         }
     }
-
+	
     return [[NSString alloc] initWithCString:propertyType encoding:NSUTF8StringEncoding];
 }
 
@@ -217,13 +150,13 @@ + (void)addValidatorForProperty:(NSString *)propertyName type:(NSString *)proper
 
     // Look up the string property type in the propertyTypes array
     NSUInteger n = [propertyTypesArray indexOfObject:propertyType];
-
+	
     if (n == NSNotFound){
         type = CTCPropertyUnknown;
     } else {
         type = (CTCPropertyType)n;
     }
-
+	
     switch (type){
         case CTCPropertyTypeString:
             implementation = (IMP)validateStringProperty;
@@ -273,4 +206,80 @@ +(NSString *)generateValidationMethodName:(NSString *)key{
     return [NSString stringWithFormat:@"validate%@:error:", [NSString capitalizeFirstCharacter:key]];
 }
 
+
+#pragma mark - Life cycle
+
+- (id)initWithDictionary:(NSDictionary *)dictionary {
+    self = [self init];
+    if (self){
+        // This is where all the KVC magic begins.  This method can be called on an object that has already been
+        // created.  This is just a convenience initializer.  The same thing could be accomplished in the following manner:
+        //
+        //   MySubClass *subClass = [MySubClass new];
+        //  [subClass setValuesForKeysWithDictionary:dictionary];
+        [self setValuesForKeysWithDictionary:dictionary];
+    }
+    return self;
+}
+
+- (NSString *)dictionaryKey {
+    // This will cause this key to be generated once, on a per-class/per-instance basis.  This is done
+    // because the logic in calculateClassName can be rather expensive when called repeatedly on
+    // every property, for every class.
+    dispatch_once(&keyToken, ^{
+        _dictionaryKey = [[self class] calculateClassName];
+    });
+    return _dictionaryKey;
+}
+
+
+#pragma mark - KVC methods
+
+- (void)setValue:(id)value forKey:(NSString *)key {
+    // We can assume at this point, the key is not in proper case.  We will call the set value method
+    // with proper casing NO and it will figure out the proper casing for the key (if it can)
+    [self setValue:value forKey:key properCase:NO];
+}
+
+- (void)setValue:(id)value forUndefinedKey:(NSString *)key {
+    // We will look in the undefinedKeys Dictionary (should be defined in the subclass), and look for
+    // this undefined key to see if the class maps the key to a know key.  This method is called automatically
+    // by KVC if setValue:forKey: cannot find a property to match the key.  Also, we wanted to implement
+    // this method in the base class, because the default implementation of this on NSObject throws
+    // an exception.
+    NSString *newKey = self.undefinedKeys[[key lowercaseString]];
+    if (newKey){
+        // If we have found the key, we will call our set value for key with proper case set to YES because
+        // the key should be put into the dictionary in proper case.  If it is not, this will not work, and our value
+        // will never be set.
+        [self setValue:value forKey:newKey properCase:YES];
+    }
+}
+
+- (void)setValue:(id)value forKey:(NSString *)key properCase:(BOOL)properCase {
+    // We first check to see if the key is already in proper case.  If not, we'll make it proper case.  This is done
+    // because calling lowerCaseString on a string value can get expensive when called repeatedly.  That is what
+    // will happen when setting a classes values from a dictionary as it will iteratively call setValue:forKey: on every
+    // key it finds in the dictionary.
+    if (!properCase) {
+        NSString *lowerCaseKey = [key lowercaseString];
+        // We do the lookup in the modelProperties dictionary for the proper cased key.  If we find it, we change
+        // the key to be that value.
+        NSString *properKey = modelProperties[self.dictionaryKey][lowerCaseKey];
+        if (properKey){
+            key = properKey;
+        }
+    }
+	
+    NSError *error = nil;
+    // Here we call the validation logic.  Calling validateValue:forKey:error: will cause validate<key>:error: to be called
+    // so all the validation methods we added dynamically to this class in initialize will no be utilised.
+    BOOL isValid = [self validateValue:&value forKey:key error:&error];
+	
+    // We only want to set the value if the value is valid.
+    if (isValid) {
+        [super setValue:value forKey:key];
+    }
+}
+
 @end

KVC Validation Pattern/KVC Validation Pattern/Model/NSString+Utilities.h

@@ -12,9 +12,7 @@
 @interface NSString (Utilities)
 
 + (NSString *)capitalizeFirstCharacter:(NSString *)string;
-
 + (NSString *)stripNonNumericCharacters:(NSString *)string;
-
 + (NSString *)leftPadString:(NSString *)string length:(NSUInteger)length padCharacter:(NSString *)padCharacter;
 
 @end

KVC Validation Pattern/KVC Validation Pattern/Model/NSString+Utilities.m

@@ -42,5 +42,4 @@ + (NSString *)leftPadString:(NSString *)string length:(NSUInteger)length padChar
     return string;
 }
 
-
 @end

KVC Validation Pattern/KVC Validation Pattern/Model/Validation/CTCArrayTypeValidator.h

@@ -12,4 +12,5 @@
 
 
 @interface CTCArrayTypeValidator : CTCBaseValidator
+
 @end