Merge pull request #111 from wearezeta/master

Caching, styling per window, load on demand, system font support + tests

Carthage/Build

@@ -0,0 +1 @@
+../../../../Carthage/Build

Classy.xcodeproj/project.pbxproj

@@ -383,7 +383,7 @@
 		1EC7193A1B67AE9D00700A14 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0640;
+				LastUpgradeCheck = 0710;
 				ORGANIZATIONNAME = "Zeta Project Berlin Gmbh";
 				TargetAttributes = {
 					1EC719421B67AE9D00700A14 = {
@@ -504,6 +504,7 @@
 				CURRENT_PROJECT_VERSION = 1;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -573,30 +574,34 @@
 		1EC7195A1B67AE9D00700A14 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				APPLICATION_EXTENSION_API_ONLY = YES;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = "Classy/Supporting Files/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "wearezeta.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = Classy;
-				SKIP_INSTALL = YES;
+				SKIP_INSTALL = NO;
 			};
 			name = Debug;
 		};
 		1EC7195B1B67AE9D00700A14 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				APPLICATION_EXTENSION_API_ONLY = YES;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = "Classy/Supporting Files/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "wearezeta.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = Classy;
-				SKIP_INSTALL = YES;
+				SKIP_INSTALL = NO;
 			};
 			name = Release;
 		};

Classy.xcodeproj/xcshareddata/xcschemes/Classy.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0640"
+   LastUpgradeVersion = "0710"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -23,21 +23,24 @@
       </BuildActionEntries>
    </BuildAction>
    <TestAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
+      <AdditionalOptions>
+      </AdditionalOptions>
    </TestAction>
    <LaunchAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
       <MacroExpansion>
          <BuildableReference
@@ -52,10 +55,10 @@
       </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
+      buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
       debugDocumentVersioning = "YES">
       <MacroExpansion>
          <BuildableReference

Classy/Additions/UIBarItem+CASAdditions.h

@@ -10,7 +10,7 @@
 #import "CASStyleableItem.h"
 
 @interface UIBarItem (CASAdditions) <CASStyleableItem>
-
++ (void)bootstrapClassy;
 @property (nonatomic, weak, readwrite) id<CASStyleableItem> cas_parent;
 
 @end

Classy/Additions/UIBarItem+CASAdditions.m

@@ -19,7 +19,7 @@ @implementation UIBarItem (CASAdditions)
 CASSynthesize(weak, id<CASStyleableItem>, cas_parent, setCas_parent);
 
 
-+ (void)load {
++ (void)bootstrapClassy {
     [self cas_swizzleInstanceSelector:@selector(init)
                       withNewSelector:@selector(cas_init)];
 }

Classy/Additions/UINavigationItem+CASAdditions.h

@@ -9,5 +9,5 @@
 #import <UIKit/UIKit.h>
 
 @interface UINavigationItem (CASAdditions)
-
++ (void)bootstrapClassy;
 @end

Classy/Additions/UINavigationItem+CASAdditions.m

@@ -13,7 +13,7 @@
 
 @implementation UINavigationItem (CASAdditions)
 
-+ (void)load {
++ (void)bootstrapClassy {
     [self cas_swizzleInstanceSelector:@selector(setRightBarButtonItem:animated:) withNewSelector:@selector(cas_setRightBarButtonItem:animated:)];
     [self cas_swizzleInstanceSelector:@selector(setLeftBarButtonItem:animated:) withNewSelector:@selector(cas_setLeftBarButtonItem:animated:)];
 
@@ -45,4 +45,4 @@ - (void)cas_setLeftBarButtonItems:(NSArray *)items animated:(BOOL)animated {
     [self cas_setLeftBarButtonItems:items animated:animated];
 }
 
-@end
+@end

Classy/Additions/UITextField+CASAdditions.h

@@ -9,7 +9,7 @@
 #import <UIKit/UIKit.h>
 
 @interface UITextField (CASAdditions)
-
++ (void)bootstrapClassy;
 @property (nonatomic, assign) UIEdgeInsets cas_textEdgeInsets;
 
 @end

Classy/Additions/UITextField+CASAdditions.m

@@ -12,7 +12,7 @@
 
 @implementation UITextField (CASAdditions)
 
-+ (void)load {
++ (void)bootstrapClassy {
     [self cas_swizzleInstanceSelector:@selector(textRectForBounds:)
                       withNewSelector:@selector(cas_textRectForBounds:)];
 

Classy/Additions/UIView+CASAdditions.h

@@ -10,6 +10,7 @@
 #import "CASStyleableItem.h"
 
 @interface UIView (CASAdditions) <CASStyleableItem>
++ (void)bootstrapClassy;
 
 @property (nonatomic, weak, readwrite) id<CASStyleableItem> cas_alternativeParent;
 @property (nonatomic, copy) IBInspectable NSString *cas_styleClass;

Classy/Additions/UIView+CASAdditions.m

@@ -21,7 +21,7 @@ @implementation UIView (CASAdditions)
 
 CASSynthesize(weak, id<CASStyleableItem>, cas_alternativeParent, setCas_alternativeParent);
 
-+ (void)load {
++ (void)bootstrapClassy {
     [self cas_swizzleInstanceSelector:@selector(didMoveToWindow)
                       withNewSelector:@selector(cas_didMoveToWindow)];
 }

Classy/Additions/UIViewController+CASAdditions.h

@@ -10,5 +10,5 @@
 #import "CASStyleableItem.h"
 
 @interface UIViewController (CASAdditions) <CASStyleableItem>
-
++ (void)bootstrapClassy;
 @end

Classy/Additions/UIViewController+CASAdditions.m

@@ -19,7 +19,7 @@
 
 @implementation UIViewController (CASAdditions)
 
-+ (void)load {
++ (void)bootstrapClassy {
     [self cas_swizzleInstanceSelector:@selector(setView:)
                       withNewSelector:@selector(cas_setView:)];
 }

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;