Merge pull request #1 from wearezeta/feature/binary-cas

Classy caching

Classy/Classy.h

@@ -22,3 +22,5 @@
 #import "UINavigationBar+CASAdditions.h"
 #import "UITabBar+CASAdditions.h"
 #import "UIToolbar+CASAdditions.h"
+#import "UIViewController+CASAdditions.h"
+#import "UINavigationItem+CASAdditions.h"

Classy/Parser/CASDeviceOSVersionItem.m

@@ -34,4 +34,20 @@ - (NSString *)stringValue {
     return [NSString stringWithFormat:@"(version:%@%@)", [CASDeviceSelector stringFromRelation:self.relation], self.version];
 }
 
+#pragma mark - NSCoding
+
+- (id)initWithCoder:(NSCoder *)aDecoder {
+    self = [self init];
+    if (nil != self) {
+        self.relation = [aDecoder decodeIntegerForKey:NSStringFromSelector(@selector(relation))];
+        self.version = [aDecoder decodeObjectForKey:NSStringFromSelector(@selector(version))];
+    }
+    return self;
+}
+
+- (void)encodeWithCoder:(NSCoder *)aCoder {
+    [aCoder encodeInteger:self.relation forKey:NSStringFromSelector(@selector(relation))];
+    [aCoder encodeObject:self.version forKey:NSStringFromSelector(@selector(version))];
+}
+
 @end

Classy/Parser/CASDeviceScreenSizeItem.h

@@ -14,4 +14,4 @@
 @property (nonatomic, assign) CASRelation relation;
 @property(nonatomic, assign) CASDeviceSelectorScreenDimension dimension;
 
-@end
+@end

Classy/Parser/CASDeviceScreenSizeItem.m

@@ -5,9 +5,7 @@
 
 #import "CASDeviceScreenSizeItem.h"
 
-@implementation CASDeviceScreenSizeItem {
-
-}
+@implementation CASDeviceScreenSizeItem
 
 - (BOOL)isValid {
     CGSize screenSize = [[UIScreen mainScreen] bounds].size;
@@ -41,5 +39,22 @@ - (NSString *)stringValue {
     return [NSString stringWithFormat:@"(screen-%@:%@%.0f)", dimensionString, [CASDeviceSelector stringFromRelation:self.relation], self.value];
 }
 
+#pragma mark - NSCoding
+
+- (id)initWithCoder:(NSCoder *)aDecoder {
+    self = [self init];
+    if (nil != self) {
+        self.relation = [aDecoder decodeIntegerForKey:NSStringFromSelector(@selector(relation))];
+        self.value = [aDecoder decodeFloatForKey:NSStringFromSelector(@selector(value))];
+        self.dimension = [aDecoder decodeIntegerForKey:NSStringFromSelector(@selector(dimension))];
+    }
+    return self;
+}
+
+- (void)encodeWithCoder:(NSCoder *)aCoder {
+    [aCoder encodeInteger:self.relation forKey:NSStringFromSelector(@selector(relation))];
+    [aCoder encodeFloat:self.value forKey:NSStringFromSelector(@selector(value))];
+    [aCoder encodeInteger:self.dimension forKey:NSStringFromSelector(@selector(dimension))];
+}
 
-@end
+@end

Classy/Parser/CASDeviceSelector.h

@@ -15,7 +15,7 @@ typedef NS_ENUM(NSUInteger, CASDeviceSelectorScreenDimension) {
     CASDeviceSelectorScreenDimensionHeight,
 };
 
-@interface CASDeviceSelector : NSObject
+@interface CASDeviceSelector : NSObject <NSCoding>
 
 @property (nonatomic, strong, readonly) NSArray *items;
 

Classy/Parser/CASDeviceSelector.m

@@ -135,4 +135,18 @@ + (NSString *)stringFromRelation:(CASRelation)relation {
     }
 }
 
+#pragma mark - NSCoding
+
+- (id)initWithCoder:(NSCoder *)aDecoder {
+    self = [self init];
+    if (nil != self) {
+        _items = [aDecoder decodeObjectForKey:NSStringFromSelector(@selector(items))];
+    }
+    return self;
+}
+
+- (void)encodeWithCoder:(NSCoder *)aCoder {
+    [aCoder encodeObject:self.items forKey:NSStringFromSelector(@selector(items))];
+}
+
 @end

Classy/Parser/CASDeviceSelectorItem.h

@@ -17,9 +17,9 @@ typedef NS_ENUM(NSInteger, CASRelation) {
     CASRelationUndefined = NSNotFound,
 };
 
-@protocol CASDeviceSelectorItem <NSObject>
+@protocol CASDeviceSelectorItem <NSObject, NSCoding>
 
 - (BOOL)isValid;
 - (NSString *)stringValue;
 
-@end
+@end

Classy/Parser/CASDeviceTypeItem.m

@@ -25,4 +25,18 @@ - (NSString *)stringValue {
     return @"pad";
 }
 
+#pragma mark - NSCoding
+
+- (id)initWithCoder:(NSCoder *)aDecoder {
+    self = [self init];
+    if (nil != self) {
+        self.deviceType = [aDecoder decodeIntegerForKey:NSStringFromSelector(@selector(deviceType))];
+    }
+    return self;
+}
+
+- (void)encodeWithCoder:(NSCoder *)aCoder {
+    [aCoder encodeInteger:self.deviceType forKey:NSStringFromSelector(@selector(deviceType))];
+}
+
 @end

Classy/Parser/CASStyleNode.h

@@ -11,7 +11,7 @@
 #import "CASStyleSelector.h"
 #import "CASDeviceSelector.h"
 
-@interface CASStyleNode : NSObject
+@interface CASStyleNode : NSObject <NSCoding>
 
 /**
  *  NSInvocations to apply to appropriate view

Classy/Parser/CASStyleNode.m

@@ -27,4 +27,23 @@ - (void)addStyleProperty:(CASStyleProperty *)styleProperty {
     [_styleProperties addObject:styleProperty];
 }
 
+#pragma mark - NSCoding
+
+- (id)initWithCoder:(NSCoder *)aDecoder {
+    self = [self init];
+    if (nil != self) {
+        self.invocations = nil;
+        _styleProperties = [aDecoder decodeObjectForKey:NSStringFromSelector(@selector(styleProperties))];
+        self.styleSelector = [aDecoder decodeObjectForKey:NSStringFromSelector(@selector(styleSelector))];
+        self.deviceSelector = [aDecoder decodeObjectForKey:NSStringFromSelector(@selector(deviceSelector))];
+    }
+    return self;
+}
+
+- (void)encodeWithCoder:(NSCoder *)aCoder {
+    [aCoder encodeObject:self.styleProperties forKey:NSStringFromSelector(@selector(styleProperties))];
+    [aCoder encodeObject:self.styleSelector forKey:NSStringFromSelector(@selector(styleSelector))];
+    [aCoder encodeObject:self.deviceSelector forKey:NSStringFromSelector(@selector(deviceSelector))];
+}
+
 @end

Classy/Parser/CASStyleProperty.h

@@ -10,7 +10,7 @@
 #import <UIKit/UIKit.h>
 #import "CASToken.h"
 
-@interface CASStyleProperty : NSObject
+@interface CASStyleProperty : NSObject <NSCoding>
 
 /**
  *  Name of the receiver
@@ -44,7 +44,7 @@
 @property (nonatomic, strong) NSDictionary *arguments;
 
 /**
- *  Creates property with raw data in the form of CATokens
+ *  Creates property with raw data in the form of CASTokens
  */
 - (id)initWithNameToken:(CASToken *)nameToken valueTokens:(NSArray *)valueTokens;
 

Classy/Parser/CASStyleProperty.m

@@ -350,4 +350,28 @@ - (void)addChildStyleProperty:(CASStyleProperty *)styleProperty {
     [_childStyleProperties addObject:styleProperty];
 }
 
+#pragma mark - NSCoding
+
+- (id)initWithCoder:(NSCoder *)aDecoder {
+    self = [self init];
+    if (nil != self) {
+        self.name = [aDecoder decodeObjectForKey:NSStringFromSelector(@selector(name))];
+        self.values = [aDecoder decodeObjectForKey:NSStringFromSelector(@selector(values))];
+        self.nameToken = [aDecoder decodeObjectForKey:NSStringFromSelector(@selector(nameToken))];
+        self.valueTokens = [aDecoder decodeObjectForKey:NSStringFromSelector(@selector(valueTokens))];
+        _childStyleProperties = [aDecoder decodeObjectForKey:NSStringFromSelector(@selector(childStyleProperties))];
+        self.arguments = [aDecoder decodeObjectForKey:NSStringFromSelector(@selector(arguments))];
+    }
+    return self;
+}
+
+- (void)encodeWithCoder:(NSCoder *)aCoder {
+    [aCoder encodeObject:self.name forKey:NSStringFromSelector(@selector(name))];
+    [aCoder encodeObject:self.values forKey:NSStringFromSelector(@selector(values))];
+    [aCoder encodeObject:self.nameToken forKey:NSStringFromSelector(@selector(nameToken))];
+    [aCoder encodeObject:self.valueTokens forKey:NSStringFromSelector(@selector(valueTokens))];
+    [aCoder encodeObject:_childStyleProperties forKey:NSStringFromSelector(@selector(childStyleProperties))];
+    [aCoder encodeObject:self.arguments forKey:NSStringFromSelector(@selector(arguments))];
+}
+
 @end

Classy/Parser/CASStyleSelector.h

@@ -9,7 +9,7 @@
 #import <UIKit/UIKit.h>
 #import "CASStyleableItem.h"
 
-@interface CASStyleSelector : NSObject <NSCopying>
+@interface CASStyleSelector : NSObject <NSCopying, NSCoding>
 
 /**
  *  Class of View to match

Classy/Parser/CASStyleSelector.m

@@ -150,4 +150,34 @@ - (BOOL)matchesItem:(id<CASStyleableItem>)item {
     return YES;
 }
 
+#pragma mark - NSCoding
+
+- (id)initWithCoder:(NSCoder *)aDecoder {
+    self = [self init];
+
+    if (nil != self) {
+        self.objectClass = NSClassFromString([aDecoder decodeObjectForKey:NSStringFromSelector(@selector(objectClass))]);
+        self.styleClass = [aDecoder decodeObjectForKey:NSStringFromSelector(@selector(styleClass))];
+        self.shouldSelectSubclasses = [aDecoder decodeBoolForKey:NSStringFromSelector(@selector(shouldSelectSubclasses))];
+        self.shouldSelectIndirectSuperview = [aDecoder decodeBoolForKey:NSStringFromSelector(@selector(shouldSelectIndirectSuperview))];
+        self.parent = [aDecoder decodeBoolForKey:NSStringFromSelector(@selector(isParent))];
+        self.shouldConcatToParent = [aDecoder decodeBoolForKey:NSStringFromSelector(@selector(shouldConcatToParent))];
+        self.arguments = [aDecoder decodeObjectForKey:NSStringFromSelector(@selector(arguments))];
+        self.parentSelector = [aDecoder decodeObjectForKey:NSStringFromSelector(@selector(parentSelector))];
+    }
+
+    return self;
+}
+
+- (void)encodeWithCoder:(NSCoder *)aCoder {
+    [aCoder encodeObject:NSStringFromClass(self.objectClass) forKey:NSStringFromSelector(@selector(objectClass))];
+    [aCoder encodeObject:self.styleClass forKey:NSStringFromSelector(@selector(styleClass))];
+    [aCoder encodeBool:self.shouldSelectSubclasses forKey:NSStringFromSelector(@selector(shouldSelectSubclasses))];
+    [aCoder encodeBool:self.shouldSelectIndirectSuperview forKey:NSStringFromSelector(@selector(shouldSelectIndirectSuperview))];
+    [aCoder encodeBool:self.parent forKey:NSStringFromSelector(@selector(isParent))];
+    [aCoder encodeBool:self.shouldConcatToParent forKey:NSStringFromSelector(@selector(shouldConcatToParent))];
+    [aCoder encodeObject:self.arguments forKey:NSStringFromSelector(@selector(arguments))];
+    [aCoder encodeObject:self.parentSelector forKey:NSStringFromSelector(@selector(parentSelector))];
+}
+
 @end

Classy/Parser/CASStyler.h

@@ -10,6 +10,26 @@
 #import "CASObjectClassDescriptor.h"
 #import "CASStyleableItem.h"
 
+@class CASStyleNode;
+
+/**
+ * Protocol caching the @c CASStyleNode's. Adds the possibility to cache the in-memory representation of Classy's CAS 
+ * file, since parsing the file is slower than loading cached version.
+ */
+@protocol CASCacheProtocol <NSObject>
+@optional
+/**
+ *  Loads cached version of stylesheet located at @c path with @c variables
+ */
+- (NSArray <CASStyleNode *> *)cachedStyleNodesFromCASPath:(NSString *)path withVariables:(NSDictionary *)variables;
+
+/**
+ * Stores the stylesheet in-memory representation loaded from @c path with @c variables
+ */
+- (void)cacheStyleNodes:(NSArray <CASStyleNode *> *)styleNodes fromPath:(NSString *)path variables:(NSDictionary *)variables;
+@end
+
+
 @interface CASStyler : NSObject
 
 + (void)bootstrapClassyWithTargetWindows:(NSArray *)targetWindows;
@@ -19,6 +39,8 @@
  */
 + (instancetype)defaultStyler;
 
+@property (nonatomic, weak) id<CASCacheProtocol> cache;
+
 @property (nonatomic, copy) NSDictionary *variables;
 
 /**

Classy/Parser/CASStyler.m

@@ -49,6 +49,7 @@
     return result;
 }
 
+
 @interface CASStyler ()
 
 @property (nonatomic, strong) NSMutableArray *styleNodes;
@@ -156,41 +157,58 @@ - (void)setFilePath:(NSString *)filePath error:(NSError **)error {
     self.styleClassIndex = [NSMutableDictionary new];
     self.objectClassIndex = [NSMutableDictionary new];
 
-    CASParser *parser = [CASParser parserFromFilePath:filePath variables:self.variables error:error];
-    NSArray *styleNodes = parser.styleNodes;
+    NSArray *styleNodes = nil;
+    NSSet *importedFileNames = nil;
+
+    if ([self.cache respondsToSelector:@selector(cachedStyleNodesFromCASPath:withVariables:)]) {
+        styleNodes = [self.cache cachedStyleNodesFromCASPath:filePath withVariables:self.variables];
+    }
 
+    if (styleNodes != nil) {
+        importedFileNames = [NSSet set];
+        self.styleNodes = [NSMutableArray arrayWithArray:styleNodes];
+    }
+    else {
+        CASParser *parser = [CASParser parserFromFilePath:filePath variables:self.variables error:error];
+        styleNodes = parser.styleNodes;
+        importedFileNames = parser.importedFileNames;
+
+        self.styleNodes = [self validNodes:styleNodes];
+
+        // order ascending by precedence
+        [self.styleNodes sortWithOptions:NSSortStable usingComparator:^NSComparisonResult(CASStyleNode *n1, CASStyleNode *n2) {
+            NSInteger precedence1 = [n1.styleSelector precedence];
+            NSInteger precedence2 = [n2.styleSelector precedence];
+            if (precedence2 > precedence1) {
+                return NSOrderedAscending;
+            } else if (precedence2 < precedence1) {
+                return NSOrderedDescending;
+            }
+            return NSOrderedSame;
+        }];
+
+        if ([self.cache respondsToSelector:@selector(cacheStyleNodes:fromPath:variables:)]) {
+            [self.cache cacheStyleNodes:styleNodes fromPath:filePath variables:self.variables];
+        }
+    }
+
     if (self.watchFilePath) {
         for (dispatch_source_t source in self.fileWatchers) {
             dispatch_source_cancel(source);
         }
         [self.fileWatchers removeAllObjects];
         [self reloadOnChangesToFilePath:self.watchFilePath];
         NSString *directoryPath = [self.watchFilePath stringByDeletingLastPathComponent];
-        for (NSString *fileName in parser.importedFileNames) {
+        for (NSString *fileName in importedFileNames) {
             NSString *resolvedPath = [directoryPath stringByAppendingPathComponent:fileName];
             [self reloadOnChangesToFilePath:resolvedPath];
         }
     }
 
-
     if (!styleNodes.count) {
         return;
     }
 
-    self.styleNodes = [self validNodes:styleNodes];
-
-    // order ascending by precedence
-    [self.styleNodes sortWithOptions:NSSortStable usingComparator:^NSComparisonResult(CASStyleNode *n1, CASStyleNode *n2) {
-        NSInteger precedence1 = [n1.styleSelector precedence];
-        NSInteger precedence2 = [n2.styleSelector precedence];
-        if (precedence2 > precedence1) {
-            return NSOrderedAscending;
-        } else if (precedence2 < precedence1) {
-            return NSOrderedDescending;
-        }
-        return NSOrderedSame;
-    }];
-
     [self populateStyleLookupTables:self.styleNodes];
 
     self.invocationObjectArguments = NSMutableArray.new;

Classy/Parser/CASToken.h

@@ -32,7 +32,7 @@ typedef NS_ENUM(NSInteger, CASTokenType) {
     CASTokenTypeSelector,
 };
 
-@interface CASToken : NSObject
+@interface CASToken : NSObject <NSCoding>
 
 /**
  *  The type of the token, may not represent the true type which is determined in context of other tokens